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

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

Merge "ASoC: msm: add dailinks for hdmi support on 8937"

parents ea346465 e3fdedaa

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

+15 −0
Original line number Diff line number Diff line
@@ -79,6 +79,14 @@ Required properties: 


 - compatible : "qcom,msm-stub-codec"



* msm-hdmi-dba-codec-rx



Required properties:



 - compatible : "qcom,msm-hdmi-dba-codec-rx"

 - qcom,dba-bridge-chip: String info to indicate which bridge-chip

                         is used for HDMI using DBA.



* msm-dai-fe



Required properties:
@@ -381,6 +389,11 @@ Example: 
                compatible = "qcom,msm-stub-codec";

        };



        qcom,msm-hdmi-dba-codec-rx {

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

                qcom,dba-bridge-chip = "adv7533";

        };



        qcom,msm-dai-fe {

                compatible = "qcom,msm-dai-fe";

        };
@@ -1370,6 +1383,7 @@ the flavor. 
- pinctrl-# : Pinctrl states as mentioned in pinctrl-names.



Optional properties:

- qcom,hdmi-dba-codec-rx: Boolean. specifies if HDMI DBA audio support is enabled or not.

- qcom,prim-auxpcm-gpio-clk  : GPIO on which Primary AUXPCM clk signal is coming.

- qcom,prim-auxpcm-gpio-sync : GPIO on which Primary AUXPCM SYNC signal is coming.

- qcom,prim-auxpcm-gpio-din  : GPIO on which Primary AUXPCM DIN signal is coming.
@@ -1433,6 +1447,7 @@ Example: 
			    "csr_gp_io_mux_spkr_ctl",

			    "csr_gp_io_lpaif_pri_pcm_pri_mode_muxsel";

		qcom,msm-ext-pa = "primary";

		qcom,hdmi-dba-codec-rx;

		qcom,msm-mclk-freq = <9600000>;

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

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

arch/arm/boot/dts/qcom/msm-audio.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -271,6 +271,11 @@ 
		qcom,msm-auxpcm-interface = "primary";

	};



	hdmi_dba: qcom,msm-hdmi-dba-codec-rx {

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

		qcom,dba-bridge-chip = "adv7533";

	};



	qcom,msm-audio-ion {

		compatible = "qcom,msm-audio-ion";

		qcom,smmu-version = <1>;

arch/arm/boot/dts/qcom/msm8937-audio.dtsi

+79 −2
Original line number Diff line number Diff line
@@ -22,8 +22,58 @@ 
	qcom,msm-hs-micbias-type = "external";

	qcom,msm-micbias1-ext-cap;



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

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

	qcom,hdmi-dba-codec-rx;



	qcom,msm-gpios =

		"pri_i2s",

		"us_eu_gpio",

		"quin_i2s";

	qcom,pinctrl-names =

		"all_off",

		"pri_i2s_act",

		"us_eu_gpio_act",

		"pri_i2s_us_eu_gpio_act",

		"quin_act",

		"quin_pri_i2s_act",

		"quin_us_eu_gpio_act",

		"quin_us_eu_gpio_pri_i2s_act";

	pinctrl-names =

		"all_off",

		"pri_i2s_act",

		"us_eu_gpio_act",

		"pri_i2s_us_eu_gpio_act",

		"quin_act",

		"quin_pri_i2s_act",

		"quin_us_eu_gpio_act",

		"quin_us_eu_gpio_pri_i2s_act";

	pinctrl-0 = <&cdc_pdm_lines_sus

			&cdc_pdm_lines_2_sus &cross_conn_det_sus

			&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-1 = <&cdc_pdm_lines_act

			&cdc_pdm_lines_2_act &cross_conn_det_sus

			&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-2 = <&cdc_pdm_lines_sus

			&cdc_pdm_lines_2_sus &cross_conn_det_act

			&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-3 = <&cdc_pdm_lines_act

			&cdc_pdm_lines_2_act &cross_conn_det_act

			&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-4 = <&cdc_pdm_lines_sus

			&cdc_pdm_lines_2_sus &cross_conn_det_sus

			&pri_tlmm_lines_act &pri_tlmm_ws_act>;

	pinctrl-5 = <&cdc_pdm_lines_act

			&cdc_pdm_lines_2_act &cross_conn_det_sus

			&pri_tlmm_lines_act &pri_tlmm_ws_act>;

	pinctrl-6 = <&cdc_pdm_lines_sus

			&cdc_pdm_lines_2_sus &cross_conn_det_act

			&pri_tlmm_lines_act &pri_tlmm_ws_act>;

	pinctrl-7 = <&cdc_pdm_lines_act

			&cdc_pdm_lines_2_act &cross_conn_det_act

			&pri_tlmm_lines_act &pri_tlmm_ws_act>;



	asoc-codec = <&stub_codec>, <&pm8937_cajon_dig>, <&hdmi_dba>;

	asoc-codec-names = "msm-stub-codec.1", "cajon_codec",

						"msm-hdmi-dba-codec-rx";

};



&ext_codec {
@@ -33,11 +83,38 @@ 
	qcom,msm-mbhc-hphl-swh = <0>;

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



	qcom,hdmi-dba-codec-rx;



	qcom,msm-gpios =

		"quin_i2s",

		"us_eu_gpio";

	qcom,pinctrl-names =

		"all_off",

		"quin_act",

		"us_eu_gpio_act",

		"quin_us_eu_gpio_act";

	pinctrl-names =

		"all_off",

		"quin_act",

		"us_eu_gpio_act",

		"quin_us_eu_gpio_act";

	pinctrl-0 = <&pri_tlmm_lines_sus &pri_tlmm_ws_sus

						&cross_conn_det_sus>;

	pinctrl-1 = <&pri_tlmm_lines_act &pri_tlmm_ws_act

						&cross_conn_det_sus>;

	pinctrl-2 = <&pri_tlmm_lines_sus &pri_tlmm_ws_sus

						&cross_conn_det_act>;

	pinctrl-3 = <&pri_tlmm_lines_act &pri_tlmm_ws_act

						&cross_conn_det_act>;



	qcom,wsa-max-devs = <2>;

	qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,

			<&wsa881x_213>, <&wsa881x_214>;

	qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",

				"SpkrLeft", "SpkrRight";



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

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

};



&wcd9xxx_intc {

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

+53 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,59 @@ 
				};

			};

		};

		pri-tlmm-lines {

			pri_tlmm_lines_act: pri_tlmm_lines_act {

				mux {

					pins = "gpio85", "gpio88";

					function = "pri_mi2s";

				};



				config {

					pins = "gpio85", "gpio88";

					drive-strength = <8>;

				};

			};



			pri_tlmm_lines_sus: pri_tlmm_lines_sus {

				mux {

					pins = "gpio85", "gpio88";

					function = "pri_mi2s";

				};



				config {

					pins = "gpio85", "gpio88";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pri-tlmm-ws-lines {

			pri_tlmm_ws_act: pri_tlmm_ws_act {

				mux {

					pins = "gpio87";

					function = "pri_mi2s_ws";

				};



				config {

					pins = "gpio87";

					drive-strength = <8>;

				};

			};



			pri_tlmm_ws_sus: pri_tlmm_ws_sus {

				mux {

					pins = "gpio87";

					function = "pri_mi2s_ws";

				};



				config {

					pins = "gpio87";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_sdc1_clk {

			sdc1_clk_on: sdc1_clk_on {

include/video/msm_dba.h

+3 −3
Original line number Diff line number Diff line
@@ -160,9 +160,9 @@ enum msm_dba_audio_sampling_rates_type { 
 * @MSM_DBA_AUDIO_WORD_32BIT: 32 bits per word

 */

enum msm_dba_audio_word_bit_depth {

	MSM_DBA_AUDIO_WORD_16BIT = BIT(0),

	MSM_DBA_AUDIO_WORD_24BIT = BIT(1),

	MSM_DBA_AUDIO_WORD_32BIT = BIT(2),

	MSM_DBA_AUDIO_WORD_16BIT = BIT(1),

	MSM_DBA_AUDIO_WORD_24BIT = BIT(2),

	MSM_DBA_AUDIO_WORD_32BIT = BIT(3),

};



/**