Merge "ARM: dts: msm: add 8939 audio configurations" (66521c39) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/msm8939-cdp.dtsi

+6 −4

Original line number	Diff line number	Diff line
		@@ -157,18 +157,20 @@
		qcom,model = "msm8939-snd-card";
		qcom,msm-snd-card-id = <0>;
		qcom,msm-codec-type = "internal";
		qcom,msm-ext-pa = <0>;
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-hs-micbias-type = "internal";
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"SPK_RX_BIAS", "MCLK",
		"INT_LDO_H", "MCLK",
		"MIC BIAS External", "Handset Mic",
		"MIC BIAS Internal1", "Handset Mic",
		"MIC BIAS Internal2", "Headset Mic",
		"MIC BIAS External", "Secondary Mic",
		"AMIC1", "MIC BIAS External",
		"MIC BIAS Internal3", "Secondary Mic",
		"AMIC1", "MIC BIAS Internal1",
		"AMIC2", "MIC BIAS Internal2",
		"AMIC3", "MIC BIAS External";
		"AMIC3", "MIC BIAS Internal3";
		pinctrl-names = "cdc_pdm_lines_act",
		"cdc_pdm_lines_sus",
		"cross_conn_det_act",

+2 −0

Original line number	Diff line number	Diff line
		@@ -157,8 +157,10 @@
		qcom,model = "msm8939-snd-card-mtp";
		qcom,msm-snd-card-id = <0>;
		qcom,msm-codec-type = "internal";
		qcom,msm-ext-pa = <0>;
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-hs-micbias-type = "internal";
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"SPK_RX_BIAS", "MCLK",

+4 −0

Original line number	Diff line number	Diff line
		@@ -1500,6 +1500,10 @@
		qcom,msm-dai-q6-dev-id = <8>;
		};

		qcom,msm-lsm-client {
		compatible = "qcom,msm-lsm-client";
		};

		qcom,msm-dai-q6 {
		compatible = "qcom,msm-dai-q6";
		qcom,msm-dai-q6-sb-0-rx {