Message-ID: <47b12a29-1438-3930-b471-69136d41e148@linaro.org>
Date:   Wed, 25 Jan 2023 10:15:34 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.0
Reply-To: neil.armstrong@linaro.org
Subject: Re: [PATCH] arm64: dts: qcom: sm8250: Disable wsamacro and swr0 by
 default
Content-Language: en-US
To:     Konrad Dybcio <konrad.dybcio@linaro.org>,
        linux-arm-msm@vger.kernel.org, andersson@kernel.org,
        agross@kernel.org, krzysztof.kozlowski@linaro.org
Cc:     marijn.suijten@somainline.org, Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20230124164616.228619-1-konrad.dybcio@linaro.org>
From:   Neil Armstrong <neil.armstrong@linaro.org>
Organization: Linaro Developer Services
In-Reply-To: <20230124164616.228619-1-konrad.dybcio@linaro.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

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 <konrad.dybcio@linaro.org>
> ---
>   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 <neil.armstrong@linaro.org>