Merge "ARM: dts: msm: Update sound card settings in 8916 qrd skuhf dts" (04ee9125) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/msm8916-qrd-skuh.dts

+17 −0

Original line number	Diff line number	Diff line
		@@ -20,3 +20,20 @@
		compatible = "qcom,msm8916-qrd-skuh", "qcom,msm8916-qrd", "qcom,msm8916", "qcom,qrd";
		qcom,board-id = <0x1000b 0> , <0x1000b 4> , <0x1010b 0> , <0x1010b 4>;
		};

		&soc {

		sound {
		qcom,msm-hs-micbias-type = "external";
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"SPK_RX_BIAS", "MCLK",
		"INT_LDO_H", "MCLK",
		"MIC BIAS External", "Handset Mic",
		"MIC BIAS External2", "Headset Mic",
		"MIC BIAS External", "Secondary Mic",
		"AMIC1", "MIC BIAS External",
		"AMIC2", "MIC BIAS External2",
		"AMIC3", "MIC BIAS External";
		};
		};

+0 −11

Original line number	Diff line number	Diff line
		@@ -236,17 +236,6 @@
		qcom,msm-codec-type = "internal";
		qcom,msm-mbhc-hphl-swh = <1>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-hs-micbias-type = "external";
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"SPK_RX_BIAS", "MCLK",
		"INT_LDO_H", "MCLK",
		"MIC BIAS External", "Handset Mic",
		"MIC BIAS External2", "Headset Mic",
		"MIC BIAS External", "Secondary Mic",
		"AMIC1", "MIC BIAS External",
		"AMIC2", "MIC BIAS External2",
		"AMIC3", "MIC BIAS External";
		pinctrl-names = "cdc_lines_act",
		"cdc_lines_sus";
		pinctrl-0 = <&cdc_pdm_lines_act>;

+15 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,21 @@
		vcc_i2c-supply = <&pm8916_l6>;
		};
		};

		sound {
		qcom,model = "msm8x16-skuhf-snd-card";
		qcom,msm-hs-micbias-type = "internal";
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"SPK_RX_BIAS", "MCLK",
		"INT_LDO_H", "MCLK",
		"MIC BIAS Internal1", "Handset Mic",
		"MIC BIAS Internal2", "Headset Mic",
		"MIC BIAS Internal1", "Secondary Mic",
		"AMIC1", "MIC BIAS Internal1",
		"AMIC2", "MIC BIAS Internal2",
		"AMIC3", "MIC BIAS Internal1";
		};
		};

		#include "dsi-panel-otm1283a-720p-video.dtsi"