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

Commit a4067bbd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: msm: dts: add external PA property to sound node."

parents 142ec5a4 731e20de

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

+4 −0
Original line number Diff line number Diff line
@@ -523,6 +523,9 @@ Required properties: 
  internal or external.

- qcom,msm-hs-micbias-type : This property is used to recognize the headset

  micbias type, internal or external.

- qcom,msm-ext-pa : This property is used to inform machine driver about

  the connection of external PA over secondary MI2S interface, val 0 external

  PA is not there, Val 1 external PA is connected.

- 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
@@ -559,6 +562,7 @@ Example: 
		qcom,model = "msm8x16-snd-card";

		qcom,msm-snd-card-id = <0>;

		qcom,msm-codec-type = "internal";

		qcom,msm-ext-pa = <0>;

		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

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

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

+6 −1
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ 
		qcom,model = "msm8x16-snd-card";

		qcom,msm-snd-card-id = <0>;

		qcom,msm-codec-type = "internal";

		qcom,msm-ext-pa = <0>;

		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,msm-hs-micbias-type = "internal";
@@ -214,9 +215,13 @@ 
			"AMIC2", "MIC BIAS Internal2",

			"AMIC3", "MIC BIAS Internal3";

		pinctrl-names = "cdc_pdm_lines_act",

				"cdc_pdm_lines_sus";

				"cdc_pdm_lines_sus",

				"cdc_ext_pa_act",

				"cdc_ext_pa_sus";

		pinctrl-0 = <&cdc_pdm_lines_act>;

		pinctrl-1 = <&cdc_pdm_lines_sus>;

		pinctrl-2 = <&cdc_ext_pa_act &cdc_ext_pa_ws_act>;

		pinctrl-3 = <&cdc_ext_pa_sus &cdc_ext_pa_ws_sus>;

	};



	sound-9306 {

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

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
		qcom,model = "msm8x16-snd-card-mtp";

		qcom,msm-snd-card-id = <0>;

		qcom,msm-codec-type = "internal";

		qcom,msm-ext-pa = <0>;

		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

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

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

+32 −0
Original line number Diff line number Diff line
@@ -77,6 +77,38 @@ 
				bias-disable;

			};

		};



		cdc-ext-pa-lines {

			qcom,pins = <&gp 113>, <&gp 114>,

					<&gp 115>, <&gp 116>;

			qcom,num-grp-pins = <4>;

			qcom,pin-func = <1>;

			label = "cdc-ext-pa-lines";

			cdc_ext_pa_act: ext_pa_on {

				drive-strength = <8>;

				bias-pull-none;

			};

			cdc_ext_pa_sus: ext_pa_off {

				drive-strength = <2>;

				bias-disable;

			};

		};



		cdc-ext-pa-ws-line {

			qcom,pins = <&gp 110>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <2>;

			label = "cdc-ext-pa-ws-line";

			cdc_ext_pa_ws_act: ext_pa_on {

				drive-strength = <8>;

				bias-pull-none;

			};

			cdc_ext_pa_ws_sus: ext_pa_off {

				drive-strength = <2>;

				bias-disable;

			};

		};



		cross-conn-det {

			qcom,pins = <&gp 120>;

			qcom,num-grp-pins = <1>;

sound/soc/codecs/msm8x16-wcd.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ struct msm8x16_wcd_regulator { 


struct msm8916_asoc_mach_data {

	int codec_type;

	int ext_pa;

	int us_euro_gpio;

	atomic_t mclk_rsc_ref;

	atomic_t dis_work_mclk;