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

Commit d07984c0 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 speaker device for APQ8084 liquid"

parents bcea36a1 4ee9313b

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+3 −0
Original line number Diff line number Diff line
@@ -457,6 +457,8 @@ Optional properties: 
			    codec.

- qcom,mbhc-bias-internal: Flag to indicate if internal micbias should be used

			   for headset detection.

- qcom,dock-plug-det-irq: Interrupt line to detect Docking/Undocking of Liquid

			  device



* APQ8074 ASoC Machine driver
@@ -512,6 +514,7 @@ sound { 
	qcom,ext-ult-lo-amp-gpio = <&pm8941_gpios 6 0>;



	qcom,ext-mclk-gpio  = <&msmgpio 47 0>;

	qcom,dock-plug-det-irq = <&pm8841_mpps 2 0>;

	qcom,prim-auxpcm-gpio-clk  = <&msmgpio 65 0>;

	qcom,prim-auxpcm-gpio-sync = <&msmgpio 66 0>;

	qcom,prim-auxpcm-gpio-din  = <&msmgpio 67 0>;

arch/arm/boot/dts/apq8084-liquid.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ 
			"MIC BIAS3 External", "Digital Mic6";



		qcom,cdc-micbias2-headset-only;

		qcom,ext-spk-amp-supply = <&hdmi_vreg>;

		qcom,ext-spk-amp-gpio = <&pma8084_mpps 6 0>;

		qcom,dock-plug-det-irq = <&msmgpio 103 0>;

	};



	qca1530_vreg: qca1530_vreg {
@@ -441,6 +444,12 @@ 
	};



	mpp@a500 { /* MPP 6 */

		/* CLASS_D_EN speakers PA */

		qcom,mode = <1>;		/* DIG_OUT */

		qcom,output-type = <0>;		/* PNP_PIN_OUT_BUF_CMOS */

		qcom,vin-sel = <2>;		/* S3A 1.8v */

		qcom,src-select = <0>;		/* CONSTANT */

		qcom,master-en = <1>;		/* ENABLE MPP */

	};



	mpp@a600 { /* MPP 7 */