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

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

Merge "ARM: dts: msm: update audio device tree on lahaina"

parents e9996bd4 5189b07f

qcom/lahaina-audio-overlay.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
			clocks = <&lpass_core_hw_vote 0>,

					<&lpass_audio_hw_vote 0>;

			qcom,swr_master_id = <3>;

			qcom,swrm-hctl-reg = <0x032a90a8>;

			qcom,mipi-sdw-block-packing-mode = <1>;

			swrm-io-base = <0x3230000 0x0>;

			interrupts-extended =
@@ -135,6 +136,7 @@ 
			clocks = <&lpass_core_hw_vote 0>,

					<&lpass_audio_hw_vote 0>;

			qcom,swr_master_id = <2>;

			qcom,swrm-hctl-reg = <0x032a90a0>;

			qcom,mipi-sdw-block-packing-mode = <1>;

			swrm-io-base = <0x3210000 0x0>;

			interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
@@ -145,7 +147,7 @@ 
				<3 COMP_L 0x1>, <3 COMP_R 0x2>,

				<4 LO 0x1>, <5 DSD_L 0x1>,

				<5 DSD_R 0x2>, <6 PCM_OUT1 0x0F>;

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

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

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

			wcd938x_rx_slave: wcd938x-rx-slave {

				compatible = "qcom,wcd938x-slave";
@@ -172,11 +174,13 @@ 
			clocks = <&lpass_core_hw_vote 0>,

					<&lpass_audio_hw_vote 0>;

			qcom,swr_master_id = <1>;

			qcom,swrm-hctl-reg = <0x032a90b0>;

			qcom,mipi-sdw-block-packing-mode = <0>;

			swrm-io-base = <0x3250000 0x0>;

			interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "swr_master_irq";

			qcom,swr-num-ports = <8>;

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

			qcom,swr-port-mapping = <1 SPKR_L 0x1>,

				<2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>,

				<4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>,
@@ -315,7 +319,7 @@ 
		"SpkrLeft IN", "WSA_SPK1 OUT",

		"SpkrRight IN", "WSA_SPK2 OUT",

		"TX SWR_INPUT", "WCD_TX_OUTPUT",

		"VA SWR_INPUT", "VA_TX_SWR_CLK",

		"VA SWR_INPUT", "VA_SWR_CLK",

		"VA SWR_INPUT", "WCD_TX_OUTPUT",

		"VA_AIF1 CAP", "VA_SWR_CLK",

		"VA_AIF2 CAP", "VA_SWR_CLK",