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

Commit f7c2470e 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: update 8937 QRD audio DT files"

parents bbe243f4 67379f87

arch/arm/boot/dts/qcom/msm8937-pmi8937-qrd-sku2.dts

+2 −15
Original line number Diff line number Diff line
@@ -23,21 +23,8 @@ 
	qcom,board-id= <0x12000b 0>;

};



&soc {

	sound {

&int_codec {

	qcom,model = "msm8952-sku2-snd-card";

		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";

	};

};



&i2c_2 {

arch/arm/boot/dts/qcom/msm8937-pmi8950-qrd-sku1.dts

+2 −15
Original line number Diff line number Diff line
@@ -48,21 +48,8 @@ 
	qcom,hold-soc-while-full;

};



&soc {

	sound {

&int_codec {

	qcom,model = "msm8952-sku1-snd-card";

		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";

	};

};



&i2c_2 {

arch/arm/boot/dts/qcom/msm8937-qrd.dtsi

+35 −14
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ 
			debounce-interval = <15>;

		};

	};

};



	sound {

&int_codec {

	status = "okay";

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

	qcom,msm-gpios =

		"pri_i2s";
@@ -44,7 +46,26 @@ 
	pinctrl-0 = <&cdc_pdm_lines_sus &cdc_pdm_lines_2_sus>;

	pinctrl-1 = <&cdc_pdm_lines_act &cdc_pdm_lines_2_act>;

	qcom,cdc-us-euro-gpios;

	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";

};





&pm8937_cajon_dig {

	status = "okay";

};



&pm8937_cajon_analog {

	status = "okay";

};



&blsp1_uart2 {