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

Commit 741dd003 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: Add codec reset gpio device node for all targets"

parents 853d2ae2 0b382d9b

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

+8 −5
Original line number Original line Diff line number Diff line
@@ -617,6 +617,13 @@ 
		pinctrl-0 = <&wcd_intr_default>;

		pinctrl-0 = <&wcd_intr_default>;

	};

	};





	wcd_rst_gpio: wcd_gpio_ctrl {

		compatible = "qcom,wcd-gpio-ctrl";

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_reset_active>;

		pinctrl-1 = <&cdc_reset_sleep>;

	};



	clock_audio: audio_ext_clk {

	clock_audio: audio_ext_clk {

		status = "disabled";

		status = "disabled";

		compatible = "qcom,audio-ref-clk";

		compatible = "qcom,audio-ref-clk";
@@ -649,11 +656,7 @@ 
			17 18 19 20 21 22 23 24 25 26 27 28 29

			17 18 19 20 21 22 23 24 25 26 27 28 29

			30>;

			30>;





		qcom,cdc-reset-gpio = <&tlmm 68 0>;

		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;



		pinctrl-names = "default", "idle";

		pinctrl-0 = <&cdc_reset_active>;

		pinctrl-1 = <&cdc_reset_sleep>;





		clock-names = "wcd_clk";

		clock-names = "wcd_clk";

		clocks = <&clock_audio clk_audio_pmi_clk>;

		clocks = <&clock_audio clk_audio_pmi_clk>;

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -196,9 +196,11 @@ 
	};

	};

};

};





&wcd9335 {

&wcd_rst_gpio {

	qcom,cdc-reset-gpio = <&tlmm 68 0>;

	qcom,cdc-rst-n-gpio = <&tlmm 68 0>;

};





&wcd9335 {

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

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

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

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

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

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

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -120,9 +120,11 @@ 
	};

	};

};

};





&wcd9335 {

&wcd_rst_gpio {

	qcom,cdc-reset-gpio = <&tlmm 68 0>;

	qcom,cdc-rst-n-gpio = <&tlmm 68 0>;

};





&wcd9335 {

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

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

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

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

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

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

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -142,13 +142,15 @@ 
	};

	};

};

};





&wcd_rst_gpio {

	qcom,cdc-rst-n-gpio = <&tlmm 67 0>;

};



&wcd9335 {

&wcd9335 {

	clock-names = "wcd_clk", "wcd_native_clk";

	clock-names = "wcd_clk", "wcd_native_clk";

	clocks = <&clock_audio clk_audio_pmi_clk>,

	clocks = <&clock_audio clk_audio_pmi_clk>,

		<&clock_audio clk_audio_ap_clk2>;

		<&clock_audio clk_audio_ap_clk2>;





	qcom,cdc-reset-gpio = <&tlmm 67 0>;



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

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

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

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

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

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