[4/4] arm64: dts: qcom: sm8350-nagara: Unify status property placement

Message ID 20230321-topic-sagami_dp-v1-4-340c8bce4276@linaro.org
State New
Headers
Series Enable DisplayPort over USB-C on SONY Sagami |

Commit Message

Konrad Dybcio March 21, 2023, 10:12 p.m. UTC
  As we're heading towards getting the status property last everywhere,
take care of it for SM8350 SONY Sagami.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi   | 30 ++++++++++------------
 1 file changed, 14 insertions(+), 16 deletions(-)
  

Comments

Neil Armstrong March 30, 2023, 4:32 p.m. UTC | #1
Le 21/03/2023 à 23:12, Konrad Dybcio a écrit :
> As we're heading towards getting the status property last everywhere,
> take care of it for SM8350 SONY Sagami.
> 
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---
>   .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi   | 30 ++++++++++------------
>   1 file changed, 14 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
> index b2baa81baf5e..95b1ba4ce470 100644
> --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
> @@ -189,8 +189,8 @@ vph_pwr: vph-pwr-regulator {
>   };
>   
>   &adsp {
> -	status = "okay";
>   	firmware-name = "qcom/sm8350/Sony/sagami/adsp.mbn";
> +	status = "okay";
>   };
>   
>   &apps_rsc {
> @@ -542,27 +542,27 @@ pmr735a_l7: ldo7 {
>   };
>   
>   &cdsp {
> -	status = "okay";
>   	firmware-name = "qcom/sm8350/Sony/sagami/cdsp.mbn";
> +	status = "okay";
>   };
>   
>   &i2c1 {
> -	status = "okay";
>   	clock-frequency = <1000000>;
> +	status = "okay";
>   
>   	/* Some subset of SONY IMX663 camera sensor @ 38 */
>   };
>   
>   &i2c4 {
> -	status = "okay";
>   	clock-frequency = <400000>;
> +	status = "okay";
>   
>   	/* Samsung Touchscreen (needs I2C GPI DMA) @ 48 */
>   };
>   
>   &i2c11 {
> -	status = "okay";
>   	clock-frequency = <1000000>;
> +	status = "okay";
>   
>   	cs35l41_l: speaker-amp@40 {
>   		compatible = "cirrus,cs35l41";
> @@ -596,31 +596,31 @@ cs35l41_r: speaker-amp@41 {
>   };
>   
>   &i2c12 {
> -	status = "okay";
>   	/* Clock frequency was not specified downstream, let's park it to 100 KHz */
>   	clock-frequency = <100000>;
> +	status = "okay";
>   
>   	/* AMS TCS3490 RGB+IR color sensor @ 72 */
>   };
>   
>   &i2c13 {
> -	status = "okay";
>   	/* Clock frequency was not specified downstream, let's park it to 100 KHz */
>   	clock-frequency = <100000>;
> +	status = "okay";
>   
>   	/* Qualcomm PM8008i/PM8008j (?) @ 8, 9, c, d */
>   };
>   
>   &i2c15 {
> -	status = "okay";
>   	clock-frequency = <400000>;
> +	status = "okay";
>   
>   	/* NXP SN1X0 NFC @ 28 */
>   };
>   
>   &i2c17 {
> -	status = "okay";
>   	clock-frequency = <1000000>;
> +	status = "okay";
>   
>   	/* Cirrus Logic CS40L25A boosted haptics driver @ 40 */
>   };
> @@ -652,8 +652,8 @@ mdss_dp_altmode: endpoint {
>   };
>   
>   &mpss {
> -	status = "okay";
>   	firmware-name = "qcom/sm8350/Sony/sagami/modem.mbn";
> +	status = "okay";
>   };
>   
>   &pm8350_gpios {
> @@ -719,8 +719,8 @@ &pon_pwrkey {
>   };
>   
>   &pon_resin {
> -	status = "okay";
>   	linux,code = <KEY_VOLUMEUP>;
> +	status = "okay";
>   };
>   
>   &qupv3_id_0 {
> @@ -748,8 +748,8 @@ &sdhc_2 {
>   };
>   
>   &slpi {
> -	status = "okay";
>   	firmware-name = "qcom/sm8350/Sony/sagami/slpi.mbn";
> +	status = "okay";
>   };
>   
>   &spi14 {
> @@ -1038,16 +1038,14 @@ usb_1_dwc3_ss: endpoint {
>   };
>   
>   &usb_1_hsphy {
> -	status = "okay";
> -
>   	vdda-pll-supply = <&pm8350_l5>;
>   	vdda18-supply = <&pm8350c_l1>;
>   	vdda33-supply = <&pm8350_l2>;
> +	status = "okay";
>   };
>   
>   &usb_1_qmpphy {
> -	status = "okay";
> -
>   	vdda-phy-supply = <&pm8350_l6>;
>   	vdda-pll-supply = <&pm8350_l1>;
> +	status = "okay";
>   };
> 

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
  
Marijn Suijten April 2, 2023, 3:19 p.m. UTC | #2
On 2023-03-21 23:12:31, Konrad Dybcio wrote:

When you get to resending this, change sm8350-nagara in the title to
sm8350-sagami :)

- Marijn

> As we're heading towards getting the status property last everywhere,
> take care of it for SM8350 SONY Sagami.
> 
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---
>  .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi   | 30 ++++++++++------------
>  1 file changed, 14 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
> index b2baa81baf5e..95b1ba4ce470 100644
> --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
> @@ -189,8 +189,8 @@ vph_pwr: vph-pwr-regulator {
>  };
>  
>  &adsp {
> -	status = "okay";
>  	firmware-name = "qcom/sm8350/Sony/sagami/adsp.mbn";
> +	status = "okay";
>  };
>  
>  &apps_rsc {
> @@ -542,27 +542,27 @@ pmr735a_l7: ldo7 {
>  };
>  
>  &cdsp {
> -	status = "okay";
>  	firmware-name = "qcom/sm8350/Sony/sagami/cdsp.mbn";
> +	status = "okay";
>  };
>  
>  &i2c1 {
> -	status = "okay";
>  	clock-frequency = <1000000>;
> +	status = "okay";
>  
>  	/* Some subset of SONY IMX663 camera sensor @ 38 */
>  };
>  
>  &i2c4 {
> -	status = "okay";
>  	clock-frequency = <400000>;
> +	status = "okay";
>  
>  	/* Samsung Touchscreen (needs I2C GPI DMA) @ 48 */
>  };
>  
>  &i2c11 {
> -	status = "okay";
>  	clock-frequency = <1000000>;
> +	status = "okay";
>  
>  	cs35l41_l: speaker-amp@40 {
>  		compatible = "cirrus,cs35l41";
> @@ -596,31 +596,31 @@ cs35l41_r: speaker-amp@41 {
>  };
>  
>  &i2c12 {
> -	status = "okay";
>  	/* Clock frequency was not specified downstream, let's park it to 100 KHz */
>  	clock-frequency = <100000>;
> +	status = "okay";
>  
>  	/* AMS TCS3490 RGB+IR color sensor @ 72 */
>  };
>  
>  &i2c13 {
> -	status = "okay";
>  	/* Clock frequency was not specified downstream, let's park it to 100 KHz */
>  	clock-frequency = <100000>;
> +	status = "okay";
>  
>  	/* Qualcomm PM8008i/PM8008j (?) @ 8, 9, c, d */
>  };
>  
>  &i2c15 {
> -	status = "okay";
>  	clock-frequency = <400000>;
> +	status = "okay";
>  
>  	/* NXP SN1X0 NFC @ 28 */
>  };
>  
>  &i2c17 {
> -	status = "okay";
>  	clock-frequency = <1000000>;
> +	status = "okay";
>  
>  	/* Cirrus Logic CS40L25A boosted haptics driver @ 40 */
>  };
> @@ -652,8 +652,8 @@ mdss_dp_altmode: endpoint {
>  };
>  
>  &mpss {
> -	status = "okay";
>  	firmware-name = "qcom/sm8350/Sony/sagami/modem.mbn";
> +	status = "okay";
>  };
>  
>  &pm8350_gpios {
> @@ -719,8 +719,8 @@ &pon_pwrkey {
>  };
>  
>  &pon_resin {
> -	status = "okay";
>  	linux,code = <KEY_VOLUMEUP>;
> +	status = "okay";
>  };
>  
>  &qupv3_id_0 {
> @@ -748,8 +748,8 @@ &sdhc_2 {
>  };
>  
>  &slpi {
> -	status = "okay";
>  	firmware-name = "qcom/sm8350/Sony/sagami/slpi.mbn";
> +	status = "okay";
>  };
>  
>  &spi14 {
> @@ -1038,16 +1038,14 @@ usb_1_dwc3_ss: endpoint {
>  };
>  
>  &usb_1_hsphy {
> -	status = "okay";
> -
>  	vdda-pll-supply = <&pm8350_l5>;
>  	vdda18-supply = <&pm8350c_l1>;
>  	vdda33-supply = <&pm8350_l2>;
> +	status = "okay";
>  };
>  
>  &usb_1_qmpphy {
> -	status = "okay";
> -
>  	vdda-phy-supply = <&pm8350_l6>;
>  	vdda-pll-supply = <&pm8350_l1>;
> +	status = "okay";
>  };
> 
> -- 
> 2.40.0
>
  
Konrad Dybcio April 3, 2023, 10:17 a.m. UTC | #3
On 2.04.2023 17:19, Marijn Suijten wrote:
> On 2023-03-21 23:12:31, Konrad Dybcio wrote:
> 
> When you get to resending this, change sm8350-nagara in the title to
> sm8350-sagami :)
Even I confuse them, they just look too alike! ;)

Konrad
> 
> - Marijn
> 
>> As we're heading towards getting the status property last everywhere,
>> take care of it for SM8350 SONY Sagami.
>>
>> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
>> ---
>>  .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi   | 30 ++++++++++------------
>>  1 file changed, 14 insertions(+), 16 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
>> index b2baa81baf5e..95b1ba4ce470 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
>> @@ -189,8 +189,8 @@ vph_pwr: vph-pwr-regulator {
>>  };
>>  
>>  &adsp {
>> -	status = "okay";
>>  	firmware-name = "qcom/sm8350/Sony/sagami/adsp.mbn";
>> +	status = "okay";
>>  };
>>  
>>  &apps_rsc {
>> @@ -542,27 +542,27 @@ pmr735a_l7: ldo7 {
>>  };
>>  
>>  &cdsp {
>> -	status = "okay";
>>  	firmware-name = "qcom/sm8350/Sony/sagami/cdsp.mbn";
>> +	status = "okay";
>>  };
>>  
>>  &i2c1 {
>> -	status = "okay";
>>  	clock-frequency = <1000000>;
>> +	status = "okay";
>>  
>>  	/* Some subset of SONY IMX663 camera sensor @ 38 */
>>  };
>>  
>>  &i2c4 {
>> -	status = "okay";
>>  	clock-frequency = <400000>;
>> +	status = "okay";
>>  
>>  	/* Samsung Touchscreen (needs I2C GPI DMA) @ 48 */
>>  };
>>  
>>  &i2c11 {
>> -	status = "okay";
>>  	clock-frequency = <1000000>;
>> +	status = "okay";
>>  
>>  	cs35l41_l: speaker-amp@40 {
>>  		compatible = "cirrus,cs35l41";
>> @@ -596,31 +596,31 @@ cs35l41_r: speaker-amp@41 {
>>  };
>>  
>>  &i2c12 {
>> -	status = "okay";
>>  	/* Clock frequency was not specified downstream, let's park it to 100 KHz */
>>  	clock-frequency = <100000>;
>> +	status = "okay";
>>  
>>  	/* AMS TCS3490 RGB+IR color sensor @ 72 */
>>  };
>>  
>>  &i2c13 {
>> -	status = "okay";
>>  	/* Clock frequency was not specified downstream, let's park it to 100 KHz */
>>  	clock-frequency = <100000>;
>> +	status = "okay";
>>  
>>  	/* Qualcomm PM8008i/PM8008j (?) @ 8, 9, c, d */
>>  };
>>  
>>  &i2c15 {
>> -	status = "okay";
>>  	clock-frequency = <400000>;
>> +	status = "okay";
>>  
>>  	/* NXP SN1X0 NFC @ 28 */
>>  };
>>  
>>  &i2c17 {
>> -	status = "okay";
>>  	clock-frequency = <1000000>;
>> +	status = "okay";
>>  
>>  	/* Cirrus Logic CS40L25A boosted haptics driver @ 40 */
>>  };
>> @@ -652,8 +652,8 @@ mdss_dp_altmode: endpoint {
>>  };
>>  
>>  &mpss {
>> -	status = "okay";
>>  	firmware-name = "qcom/sm8350/Sony/sagami/modem.mbn";
>> +	status = "okay";
>>  };
>>  
>>  &pm8350_gpios {
>> @@ -719,8 +719,8 @@ &pon_pwrkey {
>>  };
>>  
>>  &pon_resin {
>> -	status = "okay";
>>  	linux,code = <KEY_VOLUMEUP>;
>> +	status = "okay";
>>  };
>>  
>>  &qupv3_id_0 {
>> @@ -748,8 +748,8 @@ &sdhc_2 {
>>  };
>>  
>>  &slpi {
>> -	status = "okay";
>>  	firmware-name = "qcom/sm8350/Sony/sagami/slpi.mbn";
>> +	status = "okay";
>>  };
>>  
>>  &spi14 {
>> @@ -1038,16 +1038,14 @@ usb_1_dwc3_ss: endpoint {
>>  };
>>  
>>  &usb_1_hsphy {
>> -	status = "okay";
>> -
>>  	vdda-pll-supply = <&pm8350_l5>;
>>  	vdda18-supply = <&pm8350c_l1>;
>>  	vdda33-supply = <&pm8350_l2>;
>> +	status = "okay";
>>  };
>>  
>>  &usb_1_qmpphy {
>> -	status = "okay";
>> -
>>  	vdda-phy-supply = <&pm8350_l6>;
>>  	vdda-pll-supply = <&pm8350_l1>;
>> +	status = "okay";
>>  };
>>
>> -- 
>> 2.40.0
>>
  

Patch

diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
index b2baa81baf5e..95b1ba4ce470 100644
--- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
@@ -189,8 +189,8 @@  vph_pwr: vph-pwr-regulator {
 };
 
 &adsp {
-	status = "okay";
 	firmware-name = "qcom/sm8350/Sony/sagami/adsp.mbn";
+	status = "okay";
 };
 
 &apps_rsc {
@@ -542,27 +542,27 @@  pmr735a_l7: ldo7 {
 };
 
 &cdsp {
-	status = "okay";
 	firmware-name = "qcom/sm8350/Sony/sagami/cdsp.mbn";
+	status = "okay";
 };
 
 &i2c1 {
-	status = "okay";
 	clock-frequency = <1000000>;
+	status = "okay";
 
 	/* Some subset of SONY IMX663 camera sensor @ 38 */
 };
 
 &i2c4 {
-	status = "okay";
 	clock-frequency = <400000>;
+	status = "okay";
 
 	/* Samsung Touchscreen (needs I2C GPI DMA) @ 48 */
 };
 
 &i2c11 {
-	status = "okay";
 	clock-frequency = <1000000>;
+	status = "okay";
 
 	cs35l41_l: speaker-amp@40 {
 		compatible = "cirrus,cs35l41";
@@ -596,31 +596,31 @@  cs35l41_r: speaker-amp@41 {
 };
 
 &i2c12 {
-	status = "okay";
 	/* Clock frequency was not specified downstream, let's park it to 100 KHz */
 	clock-frequency = <100000>;
+	status = "okay";
 
 	/* AMS TCS3490 RGB+IR color sensor @ 72 */
 };
 
 &i2c13 {
-	status = "okay";
 	/* Clock frequency was not specified downstream, let's park it to 100 KHz */
 	clock-frequency = <100000>;
+	status = "okay";
 
 	/* Qualcomm PM8008i/PM8008j (?) @ 8, 9, c, d */
 };
 
 &i2c15 {
-	status = "okay";
 	clock-frequency = <400000>;
+	status = "okay";
 
 	/* NXP SN1X0 NFC @ 28 */
 };
 
 &i2c17 {
-	status = "okay";
 	clock-frequency = <1000000>;
+	status = "okay";
 
 	/* Cirrus Logic CS40L25A boosted haptics driver @ 40 */
 };
@@ -652,8 +652,8 @@  mdss_dp_altmode: endpoint {
 };
 
 &mpss {
-	status = "okay";
 	firmware-name = "qcom/sm8350/Sony/sagami/modem.mbn";
+	status = "okay";
 };
 
 &pm8350_gpios {
@@ -719,8 +719,8 @@  &pon_pwrkey {
 };
 
 &pon_resin {
-	status = "okay";
 	linux,code = <KEY_VOLUMEUP>;
+	status = "okay";
 };
 
 &qupv3_id_0 {
@@ -748,8 +748,8 @@  &sdhc_2 {
 };
 
 &slpi {
-	status = "okay";
 	firmware-name = "qcom/sm8350/Sony/sagami/slpi.mbn";
+	status = "okay";
 };
 
 &spi14 {
@@ -1038,16 +1038,14 @@  usb_1_dwc3_ss: endpoint {
 };
 
 &usb_1_hsphy {
-	status = "okay";
-
 	vdda-pll-supply = <&pm8350_l5>;
 	vdda18-supply = <&pm8350c_l1>;
 	vdda33-supply = <&pm8350_l2>;
+	status = "okay";
 };
 
 &usb_1_qmpphy {
-	status = "okay";
-
 	vdda-phy-supply = <&pm8350_l6>;
 	vdda-pll-supply = <&pm8350_l1>;
+	status = "okay";
 };