Commit 12805b0f authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: x1e78100-t14s: add sound support 



Add support for audio on Lenovo T14s laptop, coming with two speakers,
audio jack and two digital microphones.

This is very early work, not yet complete:
1. 2x speakers: work OK.
2. 2x digital microphones: work OK.
3. Headset (audio jack) recording: does not work.
4. Headphones playback (audio jack): channels are intermixed.

[krzysztof: correct DMIC routing and vamacro pinctrl, re-order nodes,
 add commit msg]

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Co-developed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20241203111229.48967-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent cc47b123

arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts

+183 −0
Original line number Diff line number Diff line
@@ -19,6 +19,32 @@ / { 
	compatible = "lenovo,thinkpad-t14s", "qcom,x1e78100", "qcom,x1e80100";

	chassis-type = "laptop";



	wcd938x: audio-codec {

		compatible = "qcom,wcd9385-codec";



		pinctrl-0 = <&wcd_default>;

		pinctrl-names = "default";



		qcom,micbias1-microvolt = <1800000>;

		qcom,micbias2-microvolt = <1800000>;

		qcom,micbias3-microvolt = <1800000>;

		qcom,micbias4-microvolt = <1800000>;

		qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>;

		qcom,mbhc-headset-vthreshold-microvolt = <1700000>;

		qcom,mbhc-headphone-vthreshold-microvolt = <50000>;

		qcom,rx-device = <&wcd_rx>;

		qcom,tx-device = <&wcd_tx>;



		reset-gpios = <&tlmm 191 GPIO_ACTIVE_LOW>;



		vdd-buck-supply = <&vreg_l15b_1p8>;

		vdd-rxtx-supply = <&vreg_l15b_1p8>;

		vdd-io-supply = <&vreg_l15b_1p8>;

		vdd-mic-bias-supply = <&vreg_bob1>;



		#sound-dai-cells = <1>;

	};



	gpio-keys {

		compatible = "gpio-keys";
@@ -153,6 +179,85 @@ vph_pwr: regulator-vph-pwr { 
		regulator-always-on;

		regulator-boot-on;

	};



	sound {

		compatible = "qcom,x1e80100-sndcard";

		model = "X1E80100-LENOVO-Thinkpad-T14s";

		audio-routing = "SpkrLeft IN", "WSA WSA_SPK1 OUT",

				"SpkrRight IN", "WSA WSA_SPK2 OUT",

				"IN1_HPHL", "HPHL_OUT",

				"IN2_HPHR", "HPHR_OUT",

				"AMIC2", "MIC BIAS2",

				"VA DMIC0", "MIC BIAS1",

				"VA DMIC1", "MIC BIAS1",

				"VA DMIC0", "VA MIC BIAS1",

				"VA DMIC1", "VA MIC BIAS1",

				"TX SWR_INPUT1", "ADC2_OUTPUT";



		wcd-playback-dai-link {

			link-name = "WCD Playback";



			cpu {

				sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>;

			};



			codec {

				sound-dai = <&wcd938x 0>, <&swr1 0>, <&lpass_rxmacro 0>;

			};



			platform {

				sound-dai = <&q6apm>;

			};

		};



		wcd-capture-dai-link {

			link-name = "WCD Capture";



			cpu {

				sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>;

			};



			codec {

				sound-dai = <&wcd938x 1>, <&swr2 1>, <&lpass_txmacro 0>;

			};



			platform {

				sound-dai = <&q6apm>;

			};

		};



		wsa-dai-link {

			link-name = "WSA Playback";



			cpu {

				sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>;

			};



			codec {

				sound-dai = <&left_spkr>, <&right_spkr>, <&swr0 0>, <&lpass_wsamacro 0>;

			};



			platform {

				sound-dai = <&q6apm>;

			};

		};



		va-dai-link {

			link-name = "VA Capture";



			cpu {

				sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>;

			};



			codec {

				sound-dai = <&lpass_vamacro 0>;

			};



			platform {

				sound-dai = <&q6apm>;

			};

		};

	};

};



&apps_rsc {
@@ -185,6 +290,13 @@ vreg_bob2: bob2 { 
			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l1b_1p8: ldo1 {

			regulator-name = "vreg_l1b_1p8";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l2b_3p0: ldo2 {

			regulator-name = "vreg_l2b_3p0";

			regulator-min-microvolt = <3072000>;
@@ -515,6 +627,24 @@ touchscreen@10 { 
	/* TODO: second-sourced touchscreen @ 0x41 */

};



&lpass_tlmm {

	spkr_01_sd_n_active: spkr-01-sd-n-active-state {

		pins = "gpio12";

		function = "gpio";

		drive-strength = <16>;

		bias-disable;

		output-low;

	};

};



&lpass_vamacro {

	pinctrl-0 = <&dmic01_default>;

	pinctrl-names = "default";



	vdd-micb-supply = <&vreg_l1b_1p8>;

	qcom,dmic-sample-rate = <4800000>;

};



&mdss {

	status = "okay";

};
@@ -653,6 +783,59 @@ &smb2360_1_eusb2_repeater { 
	vdd3-supply = <&vreg_l14b_3p0>;

};



&swr0 {

	status = "okay";



	pinctrl-0 = <&wsa_swr_active>, <&spkr_01_sd_n_active>;

	pinctrl-names = "default";



	/* WSA8845, Left Speaker */

	left_spkr: speaker@0,0 {

		compatible = "sdw20217020400";

		reg = <0 0>;

		reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;

		#sound-dai-cells = <0>;

		sound-name-prefix = "SpkrLeft";

		vdd-1p8-supply = <&vreg_l15b_1p8>;

		vdd-io-supply = <&vreg_l12b_1p2>;

		qcom,port-mapping = <1 2 3 7 10 13>;

	};



	/* WSA8845, Right Speaker */

	right_spkr: speaker@0,1 {

		compatible = "sdw20217020400";

		reg = <0 1>;

		reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;

		#sound-dai-cells = <0>;

		sound-name-prefix = "SpkrRight";

		vdd-1p8-supply = <&vreg_l15b_1p8>;

		vdd-io-supply = <&vreg_l12b_1p2>;

		qcom,port-mapping = <4 5 6 7 11 13>;

	};

};



&swr1 {

	status = "okay";



	/* WCD9385 RX */

	wcd_rx: codec@0,4 {

		compatible = "sdw20217010d00";

		reg = <0 4>;

		qcom,rx-port-mapping = <1 2 3 4 5>;

	};

};



&swr2 {

	status = "okay";



	/* WCD9385 TX */

	wcd_tx: codec@0,3 {

		compatible = "sdw20217010d00";

		reg = <0 3>;

		qcom,tx-port-mapping = <2 2 3 4>;

	};

};



&tlmm {

	gpio-reserved-ranges = <34 2>, /* Unused */

			       <44 4>, /* SPI (TPM) */