Merge "ARM: dts: msm: update audio gpio settings for sdm855" into msm-4.14 (f5991223) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/sdm855-audio-overlay.dtsi

+8 −13

Original line number	Diff line number	Diff line
		@@ -120,10 +120,14 @@
		compatible = "qcom,audio-ref-clk";
		qcom,codec-ext-clk-src = <2>;
		qcom,codec-lpass-ext-clk-freq = <19200000>;
		qcom,codec-lpass-clk-id = <1>;
		qcom,codec-lpass-clk-id = <278>;
		pinctrl-names = "active", "sleep";
		pinctrl-0 = <&quin_mi2s_mclk_active>;
		pinctrl-1 = <&quin_mi2s_mclk_sleep>;
		#clock-cells = <1>;
		};

		wcd_rst_gpio: msm_cdc_pinctrl@64 {
		wcd_rst_gpio: msm_cdc_pinctrl@143 {
		compatible = "qcom,msm-cdc-pinctrl";
		qcom,cdc-rst-n-gpio = <&tlmm 143 0>;
		pinctrl-names = "aud_active", "aud_sleep";
		@@ -155,13 +159,6 @@
		qcom,img-filename = "cpe_9340";
		};

		aqt_rst_gpio: msm_cdc_pinctrl@80 {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&cdc_reset_active>;
		pinctrl-1 = <&cdc_reset_sleep>;
		};

		clock_audio_lnbb: audio_ext_clk_lnbb {
		status = "ok";
		compatible = "qcom,audio-ref-clk";
		@@ -185,7 +182,7 @@
		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;

		clock-names = "wcd_clk";
		clocks = <&clock_audio>;
		clocks = <&clock_audio 0>;

		cdc-vdd-ldo-rxtx-supply = <&pm855_s5>;
		qcom,cdc-vdd-ldo-rxtx-voltage = <2040000 2040000>;
		@@ -248,7 +245,7 @@
		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;

		clock-names = "wcd_clk";
		clocks = <&clock_audio_lnbb>;
		clocks = <&clock_audio_lnbb 0>;

		cdc-vdd-buck-supply = <&pm855_s4>;
		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;
		@@ -310,8 +307,6 @@
		compatible = "qcom,aqt1000-i2c-codec";
		reg = <0x0d>;

		qcom,aqt-rst-gpio-node = <&aqt_rst_gpio>;

		clock-names = "aqt_clk";
		clocks = <&clock_audio_lnbb>;