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

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>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221203161443.97656-1-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
index 70e52fd..d3cf64c 100644 (file)
--- 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 5e56365..ed12ee3 100644 (file)
--- 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 @@
                vin-supply = <&pp5000_a>;
        };
 
-       avee_lcd: avee-lcd {
+       avee_lcd: avee-lcd-regulator {
                compatible = "regulator-fixed";
                regulator-name = "avee_lcd";
 
@@ -37,7 +37,7 @@
                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 070b3ac..ebd6765 100644 (file)
--- 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 c136799..cb41ccd 100644 (file)
--- 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 @@
                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 123989b..9832e75 100644 (file)
--- 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 @@
                vin-supply = <&pp5000_a>;
        };
 
-       avee_lcd: avee-lcd {
+       avee_lcd: avee-lcd-regulator {
                compatible = "regulator-fixed";
                regulator-name = "avee_lcd";
 
@@ -35,7 +35,7 @@
        };
 
        pp1800_ts:
-       v1p8_mipi: v1p8-mipi {
+       v1p8_mipi: v1p8-mipi-regulator {
                compatible = "regulator-fixed";
                regulator-name = "v1p8_mipi";