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

Commit 16604147 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: fix for incorrect dt entries for holi"

parents e9462460 75977393

qcom/holi-audio-overlay.dtsi

+28 −4
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 


			wcd938x_tx_slave: wcd938x-tx-slave {

				status = "disabled";

				compatible = "qcom,wcd937x-slave";

				compatible = "qcom,wcd938x-slave";

				reg = <0x0D 0x01170223>;

			};
@@ -109,7 +109,7 @@ 
				<5 DSD_R 0x2>, <6 PCM_OUT1 0x01>;

			qcom,swr-num-dev = <1>;

			qcom,swr-clock-stop-mode0 = <1>;

			wcd937x_rx_slave: wcd937x-tx-slave {

			wcd937x_rx_slave: wcd937x-rx-slave {

				compatible = "qcom,wcd937x-slave";

				reg = <0x0A 0x01170224>;

			};
@@ -278,9 +278,11 @@ 
	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;

	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;

	asoc-codec  = <&stub_codec>, <&bolero>,

		      <&wcd937x_codec>, <&wsa881x_i2c_e>;

		      <&wcd937x_codec>, <&wsa881x_i2c_e>,

		      <&wsa881x_i2c_f>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec",

			   "wcd937x_codec", "wsa-codec1";

			   "wcd937x_codec", "wsa-codec0",

			   "wsa-codec1";

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,

				  <&bolero>;

};
@@ -297,12 +299,34 @@ 
		qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;

		qcom,cdc-vdd-1p8-current = <10000>;

		qcom,cdc-static-supplies = "cdc-vdd-1p8";

		qcom,wsa-prefix = "SpkrMono";

	};



	wsa881x_i2c_44: wsa881x-i2c-codec@44 {

		compatible = "qcom,wsa881x-i2c-codec";

		reg = <0x044>;

	};



	wsa881x_i2c_f: wsa881x-i2c-codec@f {

		status = "disabled";

		compatible = "qcom,wsa881x-i2c-codec";

		reg = <0x0f>;

		clock-names = "wsa_mclk";

		clocks = <&wsa881x_analog_clk 0>;

		qcom,wsa-analog-clk-gpio = <&wsa881x_analog_clk_gpio>;

		qcom,wsa-analog-reset-gpio = <&wsa881x_analog_reset_gpio>;

		cdc-vdd-1p8-supply = <&L11A>;

		qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;

		qcom,cdc-vdd-1p8-current = <10000>;

		qcom,cdc-static-supplies = "cdc-vdd-1p8";

		qcom,wsa-prefix = "SpkrMono";

	};



	wsa881x_i2c_45: wsa881x-i2c-codec@45 {

		status = "disabled";

		compatible = "qcom,wsa881x-i2c-codec";

		reg = <0x045>;

	};

};



&va_cdc_dma_0_tx {

qcom/holi-cdp-overlay.dts

+16 −0
Original line number Diff line number Diff line
@@ -10,6 +10,22 @@ 
	qcom,board-id = <1 0>;

};



&wsa881x_i2c_e {

	status = "disabled";

};



&wsa881x_i2c_44 {

	status = "disabled";

};



&wsa881x_i2c_f {

	status = "ok";

};



&wsa881x_i2c_45 {

	status = "ok";

};



&wsa881x_analog_reset_gpio {

	pinctrl-0 = <&spkr_1_sd_n_active>;

	pinctrl-1 = <&spkr_1_sd_n_sleep>;