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

Commit 610be619 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 Audio configuration for APQ8017"

parents 31f584e6 d72fb6b9

arch/arm/boot/dts/qcom/apq8017-pmi8937-cdp-wcd-rome.dts

+134 −0
Original line number Original line Diff line number Diff line
@@ -65,3 +65,137 @@ 
	status = "ok";

	status = "ok";





};

};



&wsa881x_211 {

	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;

};



&wsa881x_212 {

	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;

};



&wsa881x_213 {

	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;

};



&wsa881x_214 {

	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;

};



&pm8937_gpios {

	gpio@c000 {

		status = "ok";

		qcom,mode = <1>;

		qcom,pull = <5>;

		qcom,vin-sel = <0>;

		qcom,src-sel = <2>;

		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};



	gpio@c600 {

		status = "ok";

		qcom,mode = <1>;

		qcom,pull = <5>;

		qcom,vin-sel = <0>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};

};



&slim_msm {

	status = "okay";

};



&dai_slim {

	status = "okay";

};



&wcd9xxx_intc {

	status = "okay";

};



&clock_audio {

	status = "okay";

};



&wcd9335 {

	status = "okay";

	cdc-vdd-mic-bias-supply = <&pm8917_l9>;

	qcom,cdc-vdd-mic-bias-voltage = <3300000 3300000>;

	qcom,cdc-vdd-mic-bias-current = <15000>;

};



&wcd_rst_gpio {

	status = "okay";

};



&ext_codec {

	status = "okay";

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

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

	qcom,audio-routing =

		"AIF4 VI", "MCLK",

		"AIF4 VI", "MICBIAS_REGULATOR",

		"RX_BIAS", "MCLK",

		"MADINPUT", "MCLK",

		"AIF4 MAD", "MICBIAS_REGULATOR",

		"AMIC1", "MIC BIAS3",

		"MIC BIAS3", "Handset Mic",

		"AMIC2", "MIC BIAS2",

		"MIC BIAS2", "Headset Mic",

		"AMIC3", "MIC BIAS3",

		"MIC BIAS3", "Secondary Mic",

		"AMIC4", "MIC BIAS3",

		"MIC BIAS3", "Analog Mic4",

		"AMIC5", "MIC BIAS4",

		"MIC BIAS4", "Analog Mic7",

		"AMIC6", "MIC BIAS4",

		"MIC BIAS4", "Analog Mic6",

		"DMIC0", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic0",

		"DMIC1", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic1",

		"DMIC2", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic2",

		"DMIC3", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic3",

		"DMIC4", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic4",

		"DMIC5", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic5",

		"MIC BIAS3", "MICBIAS_REGULATOR",

		"MIC BIAS4", "MICBIAS_REGULATOR",

		"SpkrLeft IN", "SPK1 OUT",

		"SpkrRight IN", "SPK2 OUT";



};



&int_codec {

	status = "disabled";

};



&pm8937_cajon_dig {

	status = "disabled";

};



&pm8937_cajon_analog {

	status = "disabled";

};



&wsa881x_i2c_e {

	status = "disabled";

};



&wsa881x_i2c_44 {

	status = "disabled";

};



&wsa881x_i2c_f {

	status = "disabled";

};



&wsa881x_i2c_45 {

	status = "disabled";

};

arch/arm/boot/dts/qcom/apq8017-pmi8950-cdp-wcd-rome.dts

+134 −0
Original line number Original line Diff line number Diff line
@@ -65,3 +65,137 @@ 
	status = "ok";

	status = "ok";





};

};



&wsa881x_211 {

	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;

};



&wsa881x_212 {

	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;

};



&wsa881x_213 {

	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;

};



&wsa881x_214 {

	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;

};



&pm8937_gpios {

	gpio@c000 {

		status = "ok";

		qcom,mode = <1>;

		qcom,pull = <5>;

		qcom,vin-sel = <0>;

		qcom,src-sel = <2>;

		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};



	gpio@c600 {

		status = "ok";

		qcom,mode = <1>;

		qcom,pull = <5>;

		qcom,vin-sel = <0>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};

};



&slim_msm {

	status = "okay";

};



&dai_slim {

	status = "okay";

};



&wcd9xxx_intc {

	status = "okay";

};



&clock_audio {

	status = "okay";

};



&wcd9335 {

	status = "okay";

	cdc-vdd-mic-bias-supply = <&pm8917_l9>;

	qcom,cdc-vdd-mic-bias-voltage = <3300000 3300000>;

	qcom,cdc-vdd-mic-bias-current = <15000>;

};



&wcd_rst_gpio {

	status = "okay";

};



&ext_codec {

	status = "okay";

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

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

	qcom,audio-routing =

		"AIF4 VI", "MCLK",

		"AIF4 VI", "MICBIAS_REGULATOR",

		"RX_BIAS", "MCLK",

		"MADINPUT", "MCLK",

		"AIF4 MAD", "MICBIAS_REGULATOR",

		"AMIC1", "MIC BIAS3",

		"MIC BIAS3", "Handset Mic",

		"AMIC2", "MIC BIAS2",

		"MIC BIAS2", "Headset Mic",

		"AMIC3", "MIC BIAS3",

		"MIC BIAS3", "Secondary Mic",

		"AMIC4", "MIC BIAS3",

		"MIC BIAS3", "Analog Mic4",

		"AMIC5", "MIC BIAS4",

		"MIC BIAS4", "Analog Mic7",

		"AMIC6", "MIC BIAS4",

		"MIC BIAS4", "Analog Mic6",

		"DMIC0", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic0",

		"DMIC1", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic1",

		"DMIC2", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic2",

		"DMIC3", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic3",

		"DMIC4", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic4",

		"DMIC5", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic5",

		"MIC BIAS3", "MICBIAS_REGULATOR",

		"MIC BIAS4", "MICBIAS_REGULATOR",

		"SpkrLeft IN", "SPK1 OUT",

		"SpkrRight IN", "SPK2 OUT";



};



&int_codec {

	status = "disabled";

};



&pm8937_cajon_dig {

	status = "disabled";

};



&pm8937_cajon_analog {

	status = "disabled";

};



&wsa881x_i2c_e {

	status = "disabled";

};



&wsa881x_i2c_44 {

	status = "disabled";

};



&wsa881x_i2c_f {

	status = "disabled";

};



&wsa881x_i2c_45 {

	status = "disabled";

};