Commit 6ded5ed6 authored by Johan Hovold's avatar Johan Hovold Committed by Bjorn Andersson

arm64: dts: qcom: sc8280xp: disable sound nodes

The sound nodes in the SoC dtsi should be disabled by default.

Note that the lpass-tlmm and macro blocks depend on having the board dts
enable the adsp and specifying an appropriate firmware to enable the
q6prm clock controller.
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230103103141.15807-2-johan+linaro@kernel.org
parent 91238d52
...@@ -692,6 +692,10 @@ &remoteproc_nsp0 { ...@@ -692,6 +692,10 @@ &remoteproc_nsp0 {
status = "okay"; status = "okay";
}; };
&rxmacro {
status = "okay";
};
&soc { &soc {
wcd938x: codec { wcd938x: codec {
compatible = "qcom,wcd9380-codec"; compatible = "qcom,wcd9380-codec";
...@@ -795,6 +799,8 @@ codec { ...@@ -795,6 +799,8 @@ codec {
}; };
&swr0 { &swr0 {
status = "okay";
left_spkr: wsa8830-left@0,1 { left_spkr: wsa8830-left@0,1 {
compatible = "sdw10217020200"; compatible = "sdw10217020200";
reg = <0 1>; reg = <0 1>;
...@@ -840,11 +846,17 @@ wcd_tx: wcd9380-tx@0,3 { ...@@ -840,11 +846,17 @@ wcd_tx: wcd9380-tx@0,3 {
}; };
}; };
&txmacro {
status = "okay";
};
&vamacro { &vamacro {
pinctrl-0 = <&dmic01_default>, <&dmic02_default>; pinctrl-0 = <&dmic01_default>, <&dmic02_default>;
pinctrl-names = "default"; pinctrl-names = "default";
vdd-micb-supply = <&vreg_s10b>; vdd-micb-supply = <&vreg_s10b>;
qcom,dmic-sample-rate = <600000>; qcom,dmic-sample-rate = <600000>;
status = "okay";
}; };
&usb_0 { &usb_0 {
...@@ -895,12 +907,20 @@ &usb_1_qmpphy { ...@@ -895,12 +907,20 @@ &usb_1_qmpphy {
status = "okay"; status = "okay";
}; };
&wsamacro {
status = "okay";
};
&xo_board_clk { &xo_board_clk {
clock-frequency = <38400000>; clock-frequency = <38400000>;
}; };
/* PINCTRL */ /* PINCTRL */
&lpass_tlmm {
status = "okay";
};
&pmc8280_1_gpios { &pmc8280_1_gpios {
edp_bl_en: edp-bl-en-state { edp_bl_en: edp-bl-en-state {
pins = "gpio8"; pins = "gpio8";
......
...@@ -1741,6 +1741,8 @@ rxmacro: rxmacro@3200000 { ...@@ -1741,6 +1741,8 @@ rxmacro: rxmacro@3200000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rx_swr_default>; pinctrl-0 = <&rx_swr_default>;
status = "disabled";
}; };
/* RX */ /* RX */
...@@ -1768,6 +1770,8 @@ swr1: soundwire-controller@3210000 { ...@@ -1768,6 +1770,8 @@ swr1: soundwire-controller@3210000 {
#sound-dai-cells = <1>; #sound-dai-cells = <1>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled";
}; };
txmacro: txmacro@3220000 { txmacro: txmacro@3220000 {
...@@ -1789,6 +1793,8 @@ txmacro: txmacro@3220000 { ...@@ -1789,6 +1793,8 @@ txmacro: txmacro@3220000 {
#clock-cells = <0>; #clock-cells = <0>;
#sound-dai-cells = <1>; #sound-dai-cells = <1>;
status = "disabled";
}; };
wsamacro: codec@3240000 { wsamacro: codec@3240000 {
...@@ -1810,6 +1816,8 @@ wsamacro: codec@3240000 { ...@@ -1810,6 +1816,8 @@ wsamacro: codec@3240000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&wsa_swr_default>; pinctrl-0 = <&wsa_swr_default>;
status = "disabled";
}; };
/* WSA */ /* WSA */
...@@ -1836,6 +1844,8 @@ swr0: soundwire-controller@3250000 { ...@@ -1836,6 +1844,8 @@ swr0: soundwire-controller@3250000 {
#sound-dai-cells = <1>; #sound-dai-cells = <1>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled";
}; };
/* TX */ /* TX */
...@@ -1864,6 +1874,8 @@ swr2: soundwire-controller@3330000 { ...@@ -1864,6 +1874,8 @@ swr2: soundwire-controller@3330000 {
qcom,ports-word-length = /bits/ 8 <0xff 0x00 0xff 0xff>; qcom,ports-word-length = /bits/ 8 <0xff 0x00 0xff 0xff>;
qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff>; qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff>;
qcom,ports-lane-control = /bits/ 8 <0x00 0x01 0x00 0x00>; qcom,ports-lane-control = /bits/ 8 <0x00 0x01 0x00 0x00>;
status = "disabled";
}; };
vamacro: codec@3370000 { vamacro: codec@3370000 {
...@@ -1880,6 +1892,8 @@ vamacro: codec@3370000 { ...@@ -1880,6 +1892,8 @@ vamacro: codec@3370000 {
#clock-cells = <0>; #clock-cells = <0>;
clock-output-names = "fsgen"; clock-output-names = "fsgen";
#sound-dai-cells = <1>; #sound-dai-cells = <1>;
status = "disabled";
}; };
lpass_tlmm: pinctrl@33c0000 { lpass_tlmm: pinctrl@33c0000 {
...@@ -1894,6 +1908,8 @@ lpass_tlmm: pinctrl@33c0000 { ...@@ -1894,6 +1908,8 @@ lpass_tlmm: pinctrl@33c0000 {
<&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
clock-names = "core", "audio"; clock-names = "core", "audio";
status = "disabled";
tx_swr_default: tx-swr-default-state { tx_swr_default: tx-swr-default-state {
clk-pins { clk-pins {
pins = "gpio0"; pins = "gpio0";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment