2023-01-24 16:46:28

by Konrad Dybcio

Subject: [PATCH] arm64: dts: qcom: sm8250: Disable wsamacro and swr0 by default

They are not used on all boards, so disable them by default.
Enable them back on MTP/RB5, which were the only current users.

Signed-off-by: Konrad Dybcio <[email protected]>
---
arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 6 ++++++
arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 6 ++++++
arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 ++++
3 files changed, 16 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index 8c64cb060e21..6802d36fb20c 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -1007,6 +1007,8 @@ can@0 {
};

&swr0 {
+ status = "okay";
+
left_spkr: speaker@0,3 {
compatible = "sdw10217211000";
reg = <0 3>;
@@ -1322,6 +1324,10 @@ &venus {
status = "okay";
};

+&wsamacro {
+ status = "okay";
+};
+
/* PINCTRL - additions to nodes defined in sm8250.dtsi */
&qup_spi0_cs_gpio {
drive-strength = <6>;
diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index 0991b34a8e49..c0d83fa9a73b 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -759,6 +759,8 @@ codec {
};

&swr0 {
+ status = "okay";
+
left_spkr: speaker@0,3 {
compatible = "sdw10217211000";
reg = <0 3>;
@@ -892,3 +894,7 @@ &usb_2_qmpphy {
&venus {
status = "okay";
};
+
+&wsamacro {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index 95f1a6afcd43..a0ba166f89d8 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2277,6 +2277,8 @@ wsamacro: codec@3240000 {

pinctrl-names = "default";
pinctrl-0 = <&wsa_swr_active>;
+
+ status = "disabled";
};

swr0: soundwire-controller@3250000 {
@@ -2297,6 +2299,8 @@ swr0: soundwire-controller@3250000 {
#sound-dai-cells = <1>;
#address-cells = <2>;
#size-cells = <0>;
+
+ status = "disabled";
};

audiocc: clock-controller@3300000 {
--
2.39.1

2023-01-25 09:15:43

by Neil Armstrong

Subject: Re: [PATCH] arm64: dts: qcom: sm8250: Disable wsamacro and swr0 by default

On 24/01/2023 17:46, Konrad Dybcio wrote:
> They are not used on all boards, so disable them by default.
> Enable them back on MTP/RB5, which were the only current users.
>
> Signed-off-by: Konrad Dybcio <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 6 ++++++
> arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 6 ++++++
> arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 ++++
> 3 files changed, 16 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> index 8c64cb060e21..6802d36fb20c 100644
> --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> @@ -1007,6 +1007,8 @@ can@0 {
> };
>
> &swr0 {
> + status = "okay";
> +
> left_spkr: speaker@0,3 {
> compatible = "sdw10217211000";
> reg = <0 3>;
> @@ -1322,6 +1324,10 @@ &venus {
> status = "okay";
> };
>
> +&wsamacro {
> + status = "okay";
> +};
> +
> /* PINCTRL - additions to nodes defined in sm8250.dtsi */
> &qup_spi0_cs_gpio {
> drive-strength = <6>;
> diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
> index 0991b34a8e49..c0d83fa9a73b 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
> @@ -759,6 +759,8 @@ codec {
> };
>
> &swr0 {
> + status = "okay";
> +
> left_spkr: speaker@0,3 {
> compatible = "sdw10217211000";
> reg = <0 3>;
> @@ -892,3 +894,7 @@ &usb_2_qmpphy {
> &venus {
> status = "okay";
> };
> +
> +&wsamacro {
> + status = "okay";
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> index 95f1a6afcd43..a0ba166f89d8 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> @@ -2277,6 +2277,8 @@ wsamacro: codec@3240000 {
>
> pinctrl-names = "default";
> pinctrl-0 = <&wsa_swr_active>;
> +
> + status = "disabled";
> };
>
> swr0: soundwire-controller@3250000 {
> @@ -2297,6 +2299,8 @@ swr0: soundwire-controller@3250000 {
> #sound-dai-cells = <1>;
> #address-cells = <2>;
> #size-cells = <0>;
> +
> + status = "disabled";
> };
>
> audiocc: clock-controller@3300000 {

Reviewed-by: Neil Armstrong <[email protected]>

2023-02-09 04:27:12

by Bjorn Andersson

Subject: Re: [PATCH] arm64: dts: qcom: sm8250: Disable wsamacro and swr0 by default

On Tue, 24 Jan 2023 17:46:16 +0100, Konrad Dybcio wrote:
> They are not used on all boards, so disable them by default.
> Enable them back on MTP/RB5, which were the only current users.
>
>

Applied, thanks!

[1/1] arm64: dts: qcom: sm8250: Disable wsamacro and swr0 by default
commit: ba23455e5b53013347537682441098bf83b0aa18

Best regards,
--
Bjorn Andersson <[email protected]>