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

Commit de6c83ce 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: add sound node for 8939"

parents a3639d31 ec2dbd80

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

+27 −0
Original line number Diff line number Diff line
@@ -48,6 +48,33 @@ 
			debounce-interval = <15>;

		};

	};

	sound {

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

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

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

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

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

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

		qcom,audio-routing =

			"RX_BIAS", "MCLK",

			"SPK_RX_BIAS", "MCLK",

			"INT_LDO_H", "MCLK",

			"MIC BIAS External", "Handset Mic",

			"MIC BIAS Internal2", "Headset Mic",

			"MIC BIAS External", "Secondary Mic",

			"AMIC1", "MIC BIAS External",

			"AMIC2", "MIC BIAS Internal2",

			"AMIC3", "MIC BIAS External";

		pinctrl-names = "cdc_pdm_lines_act",

				"cdc_pdm_lines_sus",

				"cross_conn_det_act",

				"cross_conn_det_sus";

		pinctrl-0 = <&cdc_pdm_lines_act>;

		pinctrl-1 = <&cdc_pdm_lines_sus>;

		pinctrl-2 = <&cross_conn_det_act>;

		pinctrl-3 = <&cross_conn_det_sus>;

		qcom,cdc-us-euro-gpios = <&msm_gpio 120 0>;

	};

};



&blsp1_uart2 {

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

+27 −0
Original line number Diff line number Diff line
@@ -48,6 +48,33 @@ 
			debounce-interval = <15>;

		};

	};

       sound {

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

		qcom,model = "msm8939-snd-card-mtp";

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

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

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

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

		qcom,audio-routing =

			"RX_BIAS", "MCLK",

			"SPK_RX_BIAS", "MCLK",

			"INT_LDO_H", "MCLK",

			"MIC BIAS External", "Handset Mic",

			"MIC BIAS Internal2", "Headset Mic",

			"MIC BIAS External", "Secondary Mic",

			"AMIC1", "MIC BIAS External",

			"AMIC2", "MIC BIAS Internal2",

			"AMIC3", "MIC BIAS External";

		pinctrl-names = "cdc_pdm_lines_act",

				"cdc_pdm_lines_sus",

				"cross_conn_det_act",

				"cross_conn_det_sus";

		pinctrl-0 = <&cdc_pdm_lines_act>;

		pinctrl-1 = <&cdc_pdm_lines_sus>;

		pinctrl-2 = <&cross_conn_det_act>;

		pinctrl-3 = <&cross_conn_det_sus>;

		qcom,cdc-us-euro-gpios = <&msm_gpio 120 0>;

       };

};



&blsp1_uart2 {

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

+30 −0
Original line number Diff line number Diff line
@@ -398,5 +398,35 @@ 
				drive-strength = <2>;

			};

		};



		cdc-pdm-lines {

			qcom,pins = <&gp 63>, <&gp 64>, <&gp 65>,

					<&gp 66>, <&gp 67>, <&gp 68>;

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

			qcom,pin-func = <1>;

			label = "cdc-pdm-lines";

			cdc_pdm_lines_act: pdm_lines_on {

				drive-strength = <8>;

				bias-pull-none;

			};

			cdc_pdm_lines_sus: pdm_lines_off {

				drive-strength = <2>;

				bias-disable;

			};

		};

		cross-conn-det {

			qcom,pins = <&gp 120>;

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

			qcom,pin-func = <0>;

			label = "cross-conn-det-sw";

			cross_conn_det_act: lines_on {

				drive-strength = <8>;

				bias-pull-none;

			};

			cross_conn_det_sus: lines_off {

				drive-strength = <2>;

				bias-disable;

			};

		};

	};

};

arch/arm/boot/dts/qcom/msm8939.dtsi

+189 −0
Original line number Diff line number Diff line
@@ -1168,6 +1168,195 @@ 
		/* GPIO output to mss */

		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>;

	};



	qcom,msm-pcm {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <0>;

	};



	qcom,msm-pcm-routing {

		compatible = "qcom,msm-pcm-routing";

	};



	qcom,msm-pcm-low-latency {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <1>;

		qcom,msm-pcm-low-latency;

		qcom,latency-level = "ultra";

	};



	qcom,msm-pcm-lpa {

		compatible = "qcom,msm-pcm-lpa";

	};



	qcom,msm-compress-dsp {

		compatible = "qcom,msm-compress-dsp";

	};



	qcom,msm-voip-dsp {

		compatible = "qcom,msm-voip-dsp";

	};



	qcom,msm-pcm-voice {

		compatible = "qcom,msm-pcm-voice";

		qcom,destroy-cvd;

	};



	qcom,msm-stub-codec {

		compatible = "qcom,msm-stub-codec";

	};



	qcom,msm-dai-fe {

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

	};



	qcom,msm-pcm-afe {

		compatible = "qcom,msm-pcm-afe";

	};



	qcom,msm-voice-svc {

		compatible = "qcom,msm-voice-svc";

	};



	qcom,msm-pcm-loopback {

		compatible = "qcom,msm-pcm-loopback";

	};



	qcom,msm-dai-mi2s {

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

		qcom,msm-dai-q6-mi2s-prim {

			compatible = "qcom,msm-dai-q6-mi2s";

			qcom,msm-dai-q6-mi2s-dev-id = <0>;

			qcom,msm-mi2s-rx-lines = <3>;

			qcom,msm-mi2s-tx-lines = <0>;

		};



		qcom,msm-dai-q6-mi2s-sec {

			compatible = "qcom,msm-dai-q6-mi2s";

			qcom,msm-dai-q6-mi2s-dev-id = <1>;

			qcom,msm-mi2s-rx-lines = <1>;

			qcom,msm-mi2s-tx-lines = <0>;

		};



		qcom,msm-dai-q6-mi2s-tert {

			compatible = "qcom,msm-dai-q6-mi2s";

			qcom,msm-dai-q6-mi2s-dev-id = <2>;

			qcom,msm-mi2s-rx-lines = <0>;

			qcom,msm-mi2s-tx-lines = <3>;

		};

	};



	qcom,msm-dai-q6-hdmi {

		compatible = "qcom,msm-dai-q6-hdmi";

		qcom,msm-dai-q6-dev-id = <8>;

	};



	qcom,msm-dai-q6 {

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

		qcom,msm-dai-q6-sb-0-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16384>;

		};



		qcom,msm-dai-q6-sb-0-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16385>;

		};



		qcom,msm-dai-q6-sb-1-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16386>;

		};



		qcom,msm-dai-q6-sb-1-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16387>;

		};



		qcom,msm-dai-q6-sb-3-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16390>;

		};



		qcom,msm-dai-q6-sb-3-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16391>;

		};



		qcom,msm-dai-q6-sb-4-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16392>;

		};



		qcom,msm-dai-q6-sb-4-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16393>;

		};



		qcom,msm-dai-q6-bt-sco-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <12288>;

		};



		qcom,msm-dai-q6-bt-sco-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <12289>;

		};



		qcom,msm-dai-q6-int-fm-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <12292>;

		};



		qcom,msm-dai-q6-int-fm-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <12293>;

		};



		qcom,msm-dai-q6-be-afe-pcm-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <224>;

		};



		qcom,msm-dai-q6-be-afe-pcm-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <225>;

		};



		qcom,msm-dai-q6-afe-proxy-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <241>;

		};



		qcom,msm-dai-q6-afe-proxy-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <240>;

		};



		qcom,msm-dai-q6-incall-record-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32771>;

		};



		qcom,msm-dai-q6-incall-record-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32772>;

		};



		qcom,msm-dai-q6-incall-music-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32773>;

		};



		qcom,msm-dai-q6-incall-music-2-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32770>;

		};

	};



	qcom,msm-pcm-hostless {

		compatible = "qcom,msm-pcm-hostless";

	};

};



&gdsc_venus {