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

Commit 4f74cb88 authored by Fred Oh's avatar Fred Oh
Browse files

ARM: dts: msm: Add Audio DT changes for msm8992 



Add device tree changes for msm8992 target to instantiate
sound card and enable audio/voice usecases.

Change-Id: Ie144d56c59089a0e9893d5490126245ee1064e10
Signed-off-by: default avatarFred Oh <fred@codeaurora.org>
parent 04e700e7

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

+37 −0
Original line number Diff line number Diff line
@@ -303,6 +303,24 @@ 
	};

};



&slim_msm {

	tomtom_codec {

		qcom,cdc-micbias1-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;

		cdc-vdd-spkdrv-supply = <&pmi8994_boost_pin_ctrl>;

		qcom,cdc-vdd-spkdrv-voltage = <5000000 5000000>;

		qcom,cdc-vdd-spkdrv-current = <600000>;



		cdc-vdd-spkdrv-2-supply = <&pmi8994_boost_pin_ctrl>;

		qcom,cdc-vdd-spkdrv-2-voltage = <5000000 5000000>;

		qcom,cdc-vdd-spkdrv-2-current = <600000>;



		qcom,cdc-on-demand-supplies = "cdc-vdd-spkdrv",

					      "cdc-vdd-spkdrv-2";

	};

};



&i2c_5 {

	silabs4705@11 { /* SiLabs FM chip, slave id 0x11*/

		status = "ok";
@@ -331,6 +349,15 @@ 
};



&pm8994_mpps {

	mpp@a100 { /* MPP 2 */

		qcom,mode = <1>;		/* Digital output */

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

		qcom,vin-sel = <2>;		/* S4 1.8V */

		qcom,src-sel = <0>;		/* Constant */

		qcom,master-en = <1>;		/* Enable GPIO */

		status = "okay";

	};



	mpp@a300 { /* MPP 4 */

		/* HDMI_5v_vreg regulator enable */

		qcom,mode = <1>;		/* Digital output */
@@ -429,6 +456,16 @@ 
			debounce-interval = <15>;

		};

	};



	sound {

		qcom,model = "msm8994-tomtom-cdp-snd-card";

		qcom,cdc-micbias2-headset-only;

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

		qcom,mbhc-audio-jack-type = "6-pole-jack";

		qcom,hdmi-audio-rx;

		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

	};

};



&pm8994_vadc {

arch/arm/boot/dts/qcom/msm8992-mdss.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ 
		clock-names = "mdp_core_clk", "iface_clk",

				"core_clk", "alt_iface_clk", "extp_clk";

		qcom,mdss-fb-map = <&mdss_fb1>;

		qcom,msm-hdmi-audio-rx {

		hdmi_audio: qcom,msm-hdmi-audio-rx {

			compatible = "qcom,msm-hdmi-audio-codec-rx";

		};

	};

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

+71 −0
Original line number Diff line number Diff line
@@ -255,6 +255,15 @@ 
};



&pm8994_mpps {

	mpp@a100 { /* MPP 2 */

		qcom,mode = <1>;		/* Digital output */

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

		qcom,vin-sel = <2>;		/* S4 1.8V */

		qcom,src-sel = <0>;		/* Constant */

		qcom,master-en = <1>;		/* Enable GPIO */

		status = "okay";

	};



	mpp@a300 { /* MPP 4 */

		/* HDMI_5v_vreg regulator enable */

		qcom,mode = <1>;		/* Digital output */
@@ -267,6 +276,24 @@ 
	};

};



&slim_msm {

	tomtom_codec {

		qcom,cdc-micbias1-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;

		cdc-vdd-spkdrv-supply = <&pmi8994_boost_pin_ctrl>;

		qcom,cdc-vdd-spkdrv-voltage = <5000000 5000000>;

		qcom,cdc-vdd-spkdrv-current = <600000>;



		cdc-vdd-spkdrv-2-supply = <&pmi8994_boost_pin_ctrl>;

		qcom,cdc-vdd-spkdrv-2-voltage = <5000000 5000000>;

		qcom,cdc-vdd-spkdrv-2-current = <600000>;



		qcom,cdc-on-demand-supplies = "cdc-vdd-spkdrv",

					      "cdc-vdd-spkdrv-2";

	};

};



&pmi8994_gpios {

	gpio@c400 {	/* GPIO 5  OTG SWITCH EN */

		qcom,mode = <1>;	/* DIGITAL OUT */
@@ -376,6 +403,50 @@ 
			debounce-interval = <15>;

		};

	};



	sound {

		qcom,model = "msm8994-tomtom-mtp-snd-card";



		qcom,audio-routing =

			"AIF4 VI", "MCLK",

			"RX_BIAS", "MCLK",

			"LDO_H", "MCLK",

			"MADINPUT", "MCLK",

			"ultrasound amp", "LINEOUT1",

			"ultrasound amp", "LINEOUT3",

			"AMIC1", "MIC BIAS1 Internal1",

			"MIC BIAS1 Internal1", "Handset Mic",

			"AMIC2", "MIC BIAS2 External",

			"MIC BIAS2 External", "Headset Mic",

			"AMIC3", "MIC BIAS2 External",

			"MIC BIAS2 External", "ANCRight Headset Mic",

			"AMIC4", "MIC BIAS2 External",

			"MIC BIAS2 External", "ANCLeft Headset Mic",

			"AMIC5", "MIC BIAS3 External",

			"MIC BIAS3 External", "Analog Mic5",

			"AMIC6", "MIC BIAS4 External",

			"MIC BIAS4 External", "Analog Mic6",

			"DMIC1", "MIC BIAS1 External",

			"MIC BIAS1 External", "Digital Mic1",

			"DMIC2", "MIC BIAS1 External",

			"MIC BIAS1 External", "Digital Mic2",

			"DMIC3", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic3",

			"DMIC4", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic4",

			"DMIC5", "MIC BIAS4 External",

			"MIC BIAS4 External", "Digital Mic5",

			"DMIC6", "MIC BIAS4 External",

			"MIC BIAS4 External", "Digital Mic6";



		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

		qcom,cdc-micbias2-headset-only;

		qcom,mbhc-audio-jack-type = "6-pole-jack";

		qcom,ext-ult-spk-amp-gpio = <&pmi8994_gpios 1 0>;

		qcom,hdmi-audio-rx;

		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

	};

};



&pm8994_vadc {