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

Commit 39b5ad9b 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: msm: update micbias regulator in msmfalcon"

parents 906c7de8 4f5ca79d

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

+4 −4
Original line number Diff line number Diff line
@@ -616,8 +616,8 @@ 
			"SpkrLeft IN", "SPK1 OUT",

			"SpkrRight IN", "SPK2 OUT";



		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,msm-mbhc-hphl-swh = <1>;

		qcom,msm-mbhc-gnd-swh = <1>;

		qcom,us-euro-gpios = <&us_euro_gpio>;

		qcom,tasha-mclk-clk-freq = <9600000>;

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
@@ -723,8 +723,8 @@ 
			"SpkrLeft IN", "SPK1 OUT",

			"SpkrRight IN", "SPK2 OUT";



		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,msm-mbhc-hphl-swh = <1>;

		qcom,msm-mbhc-gnd-swh = <1>;

		qcom,us-euro-gpios = <&tavil_us_euro_sw>;

		qcom,hph-en0-gpio = <&tavil_hph_en0>;

		qcom,hph-en1-gpio = <&tavil_hph_en1>;

arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-audio.dtsi

+0 −46
Original line number Diff line number Diff line
@@ -14,52 +14,6 @@ 
	qcom,audio-ref-clk-gpio = <&pmfalcon_gpios 3 0>;

};



&slim_aud {

	tasha_codec {

		cdc-vdd-buck-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;

		qcom,cdc-vdd-buck-current = <650000>;



		cdc-buck-sido-supply = <&pmfalcon_s4>;

		qcom,cdc-buck-sido-voltage = <1800000 1800000>;

		qcom,cdc-buck-sido-current = <250000>;



		cdc-vdd-tx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-tx-h-current = <25000>;



		cdc-vdd-rx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-rx-h-current = <25000>;



		cdc-vddpx-1-supply = <&pmfalcon_s4>;

		qcom,cdc-vddpx-1-voltage = <1800000 1800000>;

		qcom,cdc-vddpx-1-current = <10000>;

	};



	tavil_codec {

		cdc-vdd-buck-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;

		qcom,cdc-vdd-buck-current = <650000>;



		cdc-buck-sido-supply = <&pmfalcon_s4>;

		qcom,cdc-buck-sido-voltage = <1800000 1800000>;

		qcom,cdc-buck-sido-current = <250000>;



		cdc-vdd-tx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-tx-h-current = <25000>;



		cdc-vdd-rx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-rx-h-current = <25000>;



		cdc-vddpx-1-supply = <&pmfalcon_s4>;

		qcom,cdc-vddpx-1-voltage = <1800000 1800000>;

		qcom,cdc-vddpx-1-current = <10000>;

	};

};



&pmfalcon_gpios {

	gpio@c200 {

		status = "ok";

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

+8 −48
Original line number Diff line number Diff line
@@ -34,31 +34,11 @@ 
		clocks = <&clock_audio clk_audio_pmi_clk>,

			 <&clock_audio clk_audio_ap_clk2>;



		cdc-vdd-buck-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;

		qcom,cdc-vdd-buck-current = <650000>;

		cdc-vdd-mic-bias-supply = <&pm2falcon_bob>;

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

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



		cdc-buck-sido-supply = <&pmfalcon_s4>;

		qcom,cdc-buck-sido-voltage = <1800000 1800000>;

		qcom,cdc-buck-sido-current = <250000>;



		cdc-vdd-tx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-tx-h-current = <25000>;



		cdc-vdd-rx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-rx-h-current = <25000>;



		cdc-vddpx-1-supply = <&pmfalcon_s4>;

		qcom,cdc-vddpx-1-voltage = <1800000 1800000>;

		qcom,cdc-vddpx-1-current = <10000>;



		qcom,cdc-static-supplies = "cdc-vdd-buck",

					   "cdc-buck-sido",

					   "cdc-vdd-tx-h",

					   "cdc-vdd-rx-h",

					   "cdc-vddpx-1";

		qcom,cdc-static-supplies = "cdc-vdd-mic-bias";



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

		qcom,cdc-micbias2-mv = <1800>;
@@ -86,31 +66,11 @@ 
		clock-names = "wcd_clk";

		clocks = <&clock_audio_lnbb clk_audio_pmi_lnbb_clk>;



		cdc-vdd-buck-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;

		qcom,cdc-vdd-buck-current = <650000>;



		cdc-buck-sido-supply = <&pmfalcon_s4>;

		qcom,cdc-buck-sido-voltage = <1800000 1800000>;

		qcom,cdc-buck-sido-current = <250000>;



		cdc-vdd-tx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-tx-h-current = <25000>;



		cdc-vdd-rx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-rx-h-current = <25000>;



		cdc-vddpx-1-supply = <&pmfalcon_s4>;

		qcom,cdc-vddpx-1-voltage = <1800000 1800000>;

		qcom,cdc-vddpx-1-current = <10000>;

		cdc-vdd-mic-bias-supply = <&pm2falcon_bob>;

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

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



		qcom,cdc-static-supplies = "cdc-vdd-buck",

					   "cdc-buck-sido",

					   "cdc-vdd-tx-h",

					   "cdc-vdd-rx-h",

					   "cdc-vddpx-1";

		qcom,cdc-static-supplies = "cdc-vdd-mic-bias";



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

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