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

Commit 03de82e2 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: audio support for MSM8909 with pm8916"

parents 92b69a17 eeac5edb

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

+1 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ 
		};

	};



	sound {

	audio_codec: sound {

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

		qcom,model = "msm8909-snd-card";

		qcom,msm-snd-card-id = <0>;
@@ -225,7 +225,6 @@ 
		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,msm-hs-micbias-type = "internal";

		qcom,msm-micbias1-ext-cap;

		qcom,msm-micbias2-ext-cap;

		qcom,audio-routing =

			"RX_BIAS", "MCLK",

			"SPK_RX_BIAS", "MCLK",

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

+1 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
		};

	};



	sound {

	audio_codec_mtp: sound {

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

		qcom,model = "msm8909-snd-card";

		qcom,msm-snd-card-id = <0>;
@@ -111,7 +111,6 @@ 
		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,msm-hs-micbias-type = "internal";

		qcom,msm-micbias1-ext-cap;

		qcom,msm-micbias2-ext-cap;

		qcom,audio-routing =

			"RX_BIAS", "MCLK",

			"SPK_RX_BIAS", "MCLK",

arch/arm/boot/dts/qcom/msm8909-pm8909-cdp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -101,3 +101,7 @@ 
		status = "disabled";

	};

};



&audio_codec {

	qcom,msm-micbias2-ext-cap;

};

arch/arm/boot/dts/qcom/msm8909-pm8909-mtp.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -101,3 +101,6 @@ 
	};

};



&audio_codec_mtp {

	qcom,msm-micbias2-ext-cap;

};

arch/arm/boot/dts/qcom/msm8909-pm8916-cdp.dtsi

+6 −4
Original line number Diff line number Diff line
@@ -29,11 +29,13 @@ 
			qcom,clk-gpio = <&pm8916_gpios 2 0>;

		};

	};



	sound {

		status = "disabled";

		asoc-codec = <&stub_codec>;

};



&audio_codec {

	status = "ok";

	qcom,model = "msm8909-pm8916-snd-card";

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

	asoc-codec-names = "msm-stub-codec.1", "tombak_codec";

};



&dsi_hx8394d_720_vid {