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

Commit ac0e82f4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add sound node for SKUK"

parents a4bebb07 1e918611

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

+3 −3
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ 
		qcom,model = "msm8939-snd-card";

		qcom,msm-snd-card-id = <0>;

		qcom,msm-codec-type = "internal";

		qcom,msm-ext-pa = <0>;

		qcom,msm-ext-pa = "primary";

		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,msm-hs-micbias-type = "internal";
@@ -171,8 +171,8 @@ 
			"AMIC1", "MIC BIAS Internal1",

			"AMIC2", "MIC BIAS Internal2",

			"AMIC3", "MIC BIAS Internal3";

		pinctrl-names = "cdc_pdm_lines_act",

				"cdc_pdm_lines_sus",

		pinctrl-names = "cdc_lines_act",

				"cdc_lines_sus",

				"cross_conn_det_act",

				"cross_conn_det_sus";

		pinctrl-0 = <&cdc_pdm_lines_act>;

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

+3 −3
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ 
		qcom,model = "msm8939-snd-card-mtp";

		qcom,msm-snd-card-id = <0>;

		qcom,msm-codec-type = "internal";

		qcom,msm-ext-pa = <0>;

		qcom,msm-ext-pa = "primary";

		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,msm-hs-micbias-type = "internal";
@@ -171,8 +171,8 @@ 
			"AMIC1", "MIC BIAS External",

			"AMIC2", "MIC BIAS Internal2",

			"AMIC3", "MIC BIAS External";

		pinctrl-names = "cdc_pdm_lines_act",

				"cdc_pdm_lines_sus",

		pinctrl-names = "cdc_lines_act",

				"cdc_lines_sus",

				"cross_conn_det_act",

				"cross_conn_det_sus";

		pinctrl-0 = <&cdc_pdm_lines_act>;

arch/arm/boot/dts/qcom/msm8939-qrd-skuk.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -65,6 +65,31 @@ 
		qcom,key-codes = <139 172 158>;

		qcom,y-offset = <0>;

	};



	sound {

		compatible = "qcom,msm8x16-audio-codec";

		qcom,model = "msm8939-snd-card-skuk";

		qcom,msm-snd-card-id = <0>;

		qcom,msm-codec-type = "internal";

		qcom,msm-ext-pa = "primary";

		qcom,msm-mbhc-hphl-swh = <1>;

		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 Internal2", "Headset Mic",

			"MIC BIAS External", "Secondary Mic",

			"AMIC1", "MIC BIAS External",

			"AMIC2", "MIC BIAS Internal2",

			"AMIC3", "MIC BIAS External";

		pinctrl-names = "cdc_lines_act",

				"cdc_lines_sus";

		pinctrl-0 = <&cdc_pdm_lines_act>;

		pinctrl-1 = <&cdc_pdm_lines_sus>;

	};

};