arm64: dts: qcom: sc7180-trogdor: use generic node names

[PATCH] arm64: dts: qcom: sc7180-trogdor: use generic node names

Posted by Krzysztof Kozlowski 2 years, 9 months ago

According to Devicetree specification, the node names should be somewhat
generic.  Use "amplifier" for max98360a and "-regulator" for fixed
regulators.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi     | 8 ++++----
 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi      | 6 +++---
 .../arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 2 +-
 .../arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi | 4 ++--
 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi  | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
index 70e52fdb606a..d3cf64c16dcd 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
@@ -10,22 +10,22 @@
 / {
 	/* BOARD-SPECIFIC TOP LEVEL NODES */
 
-	max98360a_1: max98360a_1 {
+	max98360a_1: amplifier-1 {
 		compatible = "maxim,max98360a";
 		#sound-dai-cells = <0>;
 	};
 
-	max98360a_2: max98360a_2 {
+	max98360a_2: amplifier-2 {
 		compatible = "maxim,max98360a";
 		#sound-dai-cells = <0>;
 	};
 
-	max98360a_3: max98360a_3 {
+	max98360a_3: amplifier-3 {
 		compatible = "maxim,max98360a";
 		#sound-dai-cells = <0>;
 	};
 
-	pp3300_touch: pp3300-touch {
+	pp3300_touch: pp3300-touch-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "pp3300_touch";
 
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
index 5e563655baec..ed12ee35f06b 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
@@ -13,7 +13,7 @@
 /delete-node/ &usb_c1;
 
 / {
-	avdd_lcd: avdd-lcd {
+	avdd_lcd: avdd-lcd-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "avdd_lcd";
 
@@ -25,7 +25,7 @@ avdd_lcd: avdd-lcd {
 		vin-supply = <&pp5000_a>;
 	};
 
-	avee_lcd: avee-lcd {
+	avee_lcd: avee-lcd-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "avee_lcd";
 
@@ -37,7 +37,7 @@ avee_lcd: avee-lcd {
 		vin-supply = <&pp5000_a>;
 	};
 
-	v1p8_mipi: v1p8-mipi {
+	v1p8_mipi: v1p8-mipi-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "v1p8_mipi";
 
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
index 070b3acb7baa..ebd6765e2afa 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
@@ -8,7 +8,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-	pp3300_brij_ps8640: pp3300-brij-ps8640 {
+	pp3300_brij_ps8640: pp3300-brij-ps8640-regulator {
 		compatible = "regulator-fixed";
 		status = "okay";
 		regulator-name = "pp3300_brij_ps8640";
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
index c1367999eafb..cb41ccdaccfd 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
@@ -13,7 +13,7 @@
 /delete-node/ &usb_c1;
 
 / {
-	ppvar_lcd: ppvar-lcd {
+	ppvar_lcd: ppvar-lcd-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "ppvar_lcd";
 
@@ -25,7 +25,7 @@ ppvar_lcd: ppvar-lcd {
 		vin-supply = <&pp5000_a>;
 	};
 
-	v1p8_disp: v1p8-disp {
+	v1p8_disp: v1p8-disp-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "v1p8_disp";
 
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
index 123989ba97e1..9832e752da35 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
@@ -10,7 +10,7 @@
 #include "sc7180-trogdor.dtsi"
 
 / {
-	avdd_lcd: avdd-lcd {
+	avdd_lcd: avdd-lcd-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "avdd_lcd";
 
@@ -22,7 +22,7 @@ avdd_lcd: avdd-lcd {
 		vin-supply = <&pp5000_a>;
 	};
 
-	avee_lcd: avee-lcd {
+	avee_lcd: avee-lcd-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "avee_lcd";
 
@@ -35,7 +35,7 @@ avee_lcd: avee-lcd {
 	};
 
 	pp1800_ts:
-	v1p8_mipi: v1p8-mipi {
+	v1p8_mipi: v1p8-mipi-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "v1p8_mipi";
 
-- 
2.34.1

Re: [PATCH] arm64: dts: qcom: sc7180-trogdor: use generic node names

Posted by Bjorn Andersson 2 years, 9 months ago

On Sat, 3 Dec 2022 17:14:43 +0100, Krzysztof Kozlowski wrote:
> According to Devicetree specification, the node names should be somewhat
> generic.  Use "amplifier" for max98360a and "-regulator" for fixed
> regulators.
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sc7180-trogdor: use generic node names
      commit: b62dfbf8e6b58ebac86a26ae98b68e9e96f3615c

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: [PATCH] arm64: dts: qcom: sc7180-trogdor: use generic node names

Posted by Konrad Dybcio 2 years, 9 months ago


On 3.12.2022 17:14, Krzysztof Kozlowski wrote:
> According to Devicetree specification, the node names should be somewhat
> generic.  Use "amplifier" for max98360a and "-regulator" for fixed
> regulators.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi     | 8 ++++----
>  arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi      | 6 +++---
>  .../arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 2 +-
>  .../arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi | 4 ++--
>  arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi  | 6 +++---
>  5 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
> index 70e52fdb606a..d3cf64c16dcd 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
> @@ -10,22 +10,22 @@
>  / {
>  	/* BOARD-SPECIFIC TOP LEVEL NODES */
>  
> -	max98360a_1: max98360a_1 {
> +	max98360a_1: amplifier-1 {
>  		compatible = "maxim,max98360a";
>  		#sound-dai-cells = <0>;
>  	};
>  
> -	max98360a_2: max98360a_2 {
> +	max98360a_2: amplifier-2 {
>  		compatible = "maxim,max98360a";
>  		#sound-dai-cells = <0>;
>  	};
>  
> -	max98360a_3: max98360a_3 {
> +	max98360a_3: amplifier-3 {
>  		compatible = "maxim,max98360a";
>  		#sound-dai-cells = <0>;
>  	};
>  
> -	pp3300_touch: pp3300-touch {
> +	pp3300_touch: pp3300-touch-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "pp3300_touch";
>  
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
> index 5e563655baec..ed12ee35f06b 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
> @@ -13,7 +13,7 @@
>  /delete-node/ &usb_c1;
>  
>  / {
> -	avdd_lcd: avdd-lcd {
> +	avdd_lcd: avdd-lcd-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "avdd_lcd";
>  
> @@ -25,7 +25,7 @@ avdd_lcd: avdd-lcd {
>  		vin-supply = <&pp5000_a>;
>  	};
>  
> -	avee_lcd: avee-lcd {
> +	avee_lcd: avee-lcd-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "avee_lcd";
>  
> @@ -37,7 +37,7 @@ avee_lcd: avee-lcd {
>  		vin-supply = <&pp5000_a>;
>  	};
>  
> -	v1p8_mipi: v1p8-mipi {
> +	v1p8_mipi: v1p8-mipi-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "v1p8_mipi";
>  
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
> index 070b3acb7baa..ebd6765e2afa 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
> @@ -8,7 +8,7 @@
>  #include <dt-bindings/gpio/gpio.h>
>  
>  / {
> -	pp3300_brij_ps8640: pp3300-brij-ps8640 {
> +	pp3300_brij_ps8640: pp3300-brij-ps8640-regulator {
>  		compatible = "regulator-fixed";
>  		status = "okay";
>  		regulator-name = "pp3300_brij_ps8640";
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
> index c1367999eafb..cb41ccdaccfd 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
> @@ -13,7 +13,7 @@
>  /delete-node/ &usb_c1;
>  
>  / {
> -	ppvar_lcd: ppvar-lcd {
> +	ppvar_lcd: ppvar-lcd-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "ppvar_lcd";
>  
> @@ -25,7 +25,7 @@ ppvar_lcd: ppvar-lcd {
>  		vin-supply = <&pp5000_a>;
>  	};
>  
> -	v1p8_disp: v1p8-disp {
> +	v1p8_disp: v1p8-disp-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "v1p8_disp";
>  
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
> index 123989ba97e1..9832e752da35 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
> @@ -10,7 +10,7 @@
>  #include "sc7180-trogdor.dtsi"
>  
>  / {
> -	avdd_lcd: avdd-lcd {
> +	avdd_lcd: avdd-lcd-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "avdd_lcd";
>  
> @@ -22,7 +22,7 @@ avdd_lcd: avdd-lcd {
>  		vin-supply = <&pp5000_a>;
>  	};
>  
> -	avee_lcd: avee-lcd {
> +	avee_lcd: avee-lcd-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "avee_lcd";
>  
> @@ -35,7 +35,7 @@ avee_lcd: avee-lcd {
>  	};
>  
>  	pp1800_ts:
> -	v1p8_mipi: v1p8-mipi {
> +	v1p8_mipi: v1p8-mipi-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "v1p8_mipi";
>