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

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

Merge "ARM: dts: msm: Change swr port mapping for DMICs"

parents ab434f5a 694eb3db

qcom/shima-audio-overlay.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ 
			<0 ADC2 0x2 0 SWRM_TX1_CH2>,

			<1 ADC3 0x1 0 SWRM_TX2_CH1>,

			<1 ADC4 0x2 0 SWRM_TX2_CH2>,

			<2 DMIC0 0x1 0 SWRM_TX2_CH1>,

			<2 DMIC1 0x2 0 SWRM_TX2_CH2>,

			<2 DMIC0 0x1 0 SWRM_TX1_CH3>,

			<2 DMIC1 0x2 0 SWRM_TX1_CH4>,

			<2 MBHC 0x4 0 SWRM_TX2_CH3>,

			<2 DMIC2 0x4 0 SWRM_TX2_CH3>,

			<2 DMIC3 0x8 0 SWRM_TX2_CH4>,
@@ -242,9 +242,9 @@ 
};



&shima_snd {

	qcom,model = "shima-mtp-snd-card";

	qcom,model = "shima-idp-snd-card";

	qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>;

	qcom,wcn-bt = <0>;

	qcom,wcn-btfm = <0>;

	qcom,ext-disp-audio-rx = <0>;

	qcom,audio-routing =

		"AMIC1", "Analog Mic1",
@@ -258,15 +258,15 @@ 
		"AMIC5", "Analog Mic5",

		"Analog Mic5", "MIC BIAS4",

		"TX DMIC0", "Digital Mic0",

		"TX DMIC0", "MIC BIAS3",

		"TX DMIC0", "MIC BIAS1",

		"TX DMIC1", "Digital Mic1",

		"TX DMIC1", "MIC BIAS3",

		"TX DMIC2", "Digital Mic2",

		"TX DMIC2", "MIC BIAS1",

		"TX DMIC2", "MIC BIAS4",

		"TX DMIC3", "Digital Mic3",

		"TX DMIC3", "MIC BIAS1",

		"TX DMIC4", "Digital Mic4",

		"TX DMIC4", "MIC BIAS4",

		"TX DMIC4", "MIC BIAS3",

		"TX DMIC5", "Digital Mic5",

		"TX DMIC5", "MIC BIAS4",

		"IN1_HPHL", "HPHL_OUT",

qcom/shima-audio.dtsi

+11 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
				<&afe_proxy_tx_1>,

				<&proxy_rx>, <&proxy_tx>,

				<&usb_audio_rx>, <&usb_audio_tx>,

				<&sb_7_rx>, <&sb_7_tx>,

				<&sb_7_rx>, <&sb_7_tx>, <&sb_8_tx>,

				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,
@@ -222,6 +222,7 @@ 
				"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195",

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",

				"msm-dai-q6-dev.16398", "msm-dai-q6-dev.16399",

				"msm-dai-q6-dev.16401",

				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",
@@ -251,6 +252,15 @@ 
				"msm-dai-cdc-dma-dev.45116",

				"msm-dai-cdc-dma-dev.45118",

				"msm-dai-q6-dev.24577";

				fsa4480-i2c-handle = <&fsa4480>;

	};

};



&qupv3_se5_i2c {

	status = "ok";

	fsa4480: fsa4480@42 {

		compatible = "qcom,fsa4480-i2c";

		reg = <0x42>;

	};

};