mirror of
https://github.com/torvalds/linux.git
synced 2026-06-04 12:35:52 +02:00
arm64: dts: qcom: x1-asus-zenbook: support sound
Works: * Both speakers * Both MICs * Headphones jack, L/R channels * Headphones jack, MIC Now working/untested: * Sound over DisplayPort * Sound over HDMI Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Signed-off-by: Aleksandrs Vinarskis <alex.vinarskis@gmail.com> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20250623113709.21184-3-alex.vinarskis@gmail.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
parent
49918a1c42
commit
38d0b804b9
|
|
@ -22,6 +22,32 @@ aliases {
|
|||
serial1 = &uart14;
|
||||
};
|
||||
|
||||
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";
|
||||
|
||||
|
|
@ -149,6 +175,88 @@ linux,cma {
|
|||
};
|
||||
};
|
||||
|
||||
sound {
|
||||
compatible = "qcom,x1e80100-sndcard";
|
||||
model = "X1E80100-ASUS-Zenbook-A14";
|
||||
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";
|
||||
|
||||
va-dai-link {
|
||||
link-name = "VA Capture";
|
||||
|
||||
codec {
|
||||
sound-dai = <&lpass_vamacro 0>;
|
||||
};
|
||||
|
||||
cpu {
|
||||
sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>;
|
||||
};
|
||||
|
||||
platform {
|
||||
sound-dai = <&q6apm>;
|
||||
};
|
||||
};
|
||||
|
||||
wcd-capture-dai-link {
|
||||
link-name = "WCD Capture";
|
||||
|
||||
codec {
|
||||
sound-dai = <&wcd938x 1>, <&swr2 1>,
|
||||
<&lpass_txmacro 0>;
|
||||
};
|
||||
|
||||
cpu {
|
||||
sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>;
|
||||
};
|
||||
|
||||
platform {
|
||||
sound-dai = <&q6apm>;
|
||||
};
|
||||
};
|
||||
|
||||
wcd-playback-dai-link {
|
||||
link-name = "WCD Playback";
|
||||
|
||||
codec {
|
||||
sound-dai = <&wcd938x 0>, <&swr1 0>,
|
||||
<&lpass_rxmacro 0>;
|
||||
};
|
||||
|
||||
cpu {
|
||||
sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>;
|
||||
};
|
||||
|
||||
platform {
|
||||
sound-dai = <&q6apm>;
|
||||
};
|
||||
};
|
||||
|
||||
wsa-dai-link {
|
||||
link-name = "WSA Playback";
|
||||
|
||||
codec {
|
||||
sound-dai = <&left_spkr>, <&right_spkr>,
|
||||
<&swr0 0>, <&lpass_wsamacro 0>;
|
||||
};
|
||||
|
||||
cpu {
|
||||
sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>;
|
||||
};
|
||||
|
||||
platform {
|
||||
sound-dai = <&q6apm>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
vreg_edp_3p3: regulator-edp-3p3 {
|
||||
compatible = "regulator-fixed";
|
||||
|
||||
|
|
@ -372,6 +480,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>;
|
||||
|
|
@ -843,6 +958,24 @@ keyboard@15 {
|
|||
};
|
||||
};
|
||||
|
||||
&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";
|
||||
};
|
||||
|
|
@ -1045,6 +1178,59 @@ &spi10 {
|
|||
/* Unknown device */
|
||||
};
|
||||
|
||||
&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 = <44 4>, /* SPI11, TZ Protected */
|
||||
<90 1>; /* Unknown, TZ Protected */
|
||||
|
|
@ -1175,6 +1361,14 @@ usb1_pwr_3p3_reg_en: usb1-pwr-3p3-reg-en-state {
|
|||
bias-disable;
|
||||
};
|
||||
|
||||
wcd_default: wcd-reset-n-active-state {
|
||||
pins = "gpio191";
|
||||
function = "gpio";
|
||||
drive-strength = <16>;
|
||||
bias-disable;
|
||||
output-low;
|
||||
};
|
||||
|
||||
wcn_bt_en: wcn-bt-en-state {
|
||||
pins = "gpio116";
|
||||
function = "gpio";
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user