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

This project is archived. Its data is read-only.

Commit 51bd6075 authored May 07, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server May 07, 2014

Merge "ARM: dts: msm: add headset micbias type checking"

parents c270dd77 3bcfae61

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -514,6 +514,8 @@ Required properties:
		- qcom,msm-snd-card-id : This id is used to recognize the sound card number
		- qcom,msm-codec-type : This property is used to recognize the codec type
		internal or external.
		- qcom,msm-hs-micbias-type : This property is used to recognize the headset
		micbias type, internal or external.
		- qcom,msm-mbhc-hphl-swh: This property is used to distinguish headset HPHL
		switch type on target typically the switch type will be normally open or
		normally close, value for this property 0 for normally close and 1 for
		@@ -543,6 +545,7 @@ Example:
		qcom,msm-codec-type = "internal";
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-hs-micbias-type = "internal";
		qcom,cdc-us-euro-gpios = <&msmgpio 120 0>;
		qcom,audio-routing =
		"RX_BIAS", "MCLK",

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@
		qcom,msm-codec-type = "internal";
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-hs-micbias-type = "internal";
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"SPK_RX_BIAS", "MCLK",

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@
		qcom,msm-codec-type = "internal";
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-hs-micbias-type = "internal";
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"SPK_RX_BIAS", "MCLK",

arch/arm/boot/dts/qcom/msm8916-qrd-skuh.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -238,6 +238,7 @@
		qcom,msm-codec-type = "internal";
		qcom,msm-mbhc-hphl-swh = <1>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-hs-micbias-type = "external";
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"SPK_RX_BIAS", "MCLK",

arch/arm/boot/dts/qcom/msm8916-qrd-skui.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@
		qcom,msm-codec-type = "internal";
		qcom,msm-mbhc-hphl-swh = <1>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-hs-micbias-type = "internal";
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"SPK_RX_BIAS", "MCLK",