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 3bcfae61 authored Apr 25, 2014 by Walter Yang

ARM: dts: msm: add headset micbias type checking



Add the headset micbias type property and check it in MBHC driver.
If the external micbias is used for headset mic, don't enable the
internal micbias during headset type detection, otherwise the type
detection will be unreliable.

Change-Id: Id29bb61c581f8ecf845e84e4a3d2f3df53b1435b
Signed-off-by: Walter Yang <yandongy@codeaurora.org>

parent c98bd52e

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
		@@ -87,6 +87,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
		@@ -80,6 +80,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",