Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2491273d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: DTS: enable MIC BIAS as on demand supply on all targets"

parents 7e83d722 3ffff1fe

arch/arm/boot/dts/qcom/msm-audio.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -665,6 +665,8 @@ 
			"cdc-vdd-rx-h",

			"cdc-vdd-px";



		qcom,cdc-on-demand-supplies = "cdc-vdd-mic-bias";



		qcom,cdc-micbias1-mv = <1800>;

		qcom,cdc-micbias2-mv = <1800>;

		qcom,cdc-micbias3-mv = <1800>;

arch/arm/boot/dts/qcom/msm8952-ext-codec-cdp.dts

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -383,6 +383,8 @@ 
			"cdc-vdd-rx-h",

			"cdc-vdd-px";



		qcom,cdc-on-demand-supplies = "cdc-vdd-mic-bias";



		qcom,cdc-micbias1-mv = <1800>;

		qcom,cdc-micbias2-mv = <1800>;

		qcom,cdc-micbias3-mv = <1800>;

arch/arm/boot/dts/qcom/msmtitanium-audio.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -172,6 +172,4 @@ 
	cdc-vdd-mic-bias-supply = <&pmtitanium_l13>;

	qcom,cdc-vdd-mic-bias-voltage = <3125000 3125000>;

	qcom,cdc-vdd-mic-bias-current = <15000>;



	qcom,cdc-on-demand-supplies = "cdc-vdd-mic-bias";

};