ARM: dts: sunxi: Rename power-supply names

The name of our PMIC power supply names conflict with the generic
regulator supply check that matches anything called *-supply, including
the nodes, and then makes sure it's a phandle.

A node is obviously not a phandle, so let's change our power supplies
names to avoid any conflict.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/20210901091852.479202-40-maxime@cerno.tech

diff --git a/arch/arm/boot/dts/axp209.dtsi b/arch/arm/boot/dts/axp209.dtsi
index 0d9ff12..ca240cd 100644 (file)
--- a/arch/arm/boot/dts/axp209.dtsi
+++ b/arch/arm/boot/dts/axp209.dtsi
@@ -53,7 +53,7 @@
        interrupt-controller;
        #interrupt-cells = <1>;
 
-       ac_power_supply: ac-power-supply {
+       ac_power_supply: ac-power {
                compatible = "x-powers,axp202-ac-power-supply";
                status = "disabled";
        };
@@ -69,7 +69,7 @@
                #gpio-cells = <2>;
        };
 
-       battery_power_supply: battery-power-supply {
+       battery_power_supply: battery-power {
                compatible = "x-powers,axp209-battery-power-supply";
                status = "disabled";
        };
@@ -112,7 +112,7 @@
                };
        };
 
-       usb_power_supply: usb-power-supply {
+       usb_power_supply: usb-power {
                compatible = "x-powers,axp202-usb-power-supply";
                status = "disabled";
        };

diff --git a/arch/arm/boot/dts/axp22x.dtsi b/arch/arm/boot/dts/axp22x.dtsi
index 65a07a6..a020c12 100644 (file)
--- a/arch/arm/boot/dts/axp22x.dtsi
+++ b/arch/arm/boot/dts/axp22x.dtsi
@@ -52,7 +52,7 @@
        interrupt-controller;
        #interrupt-cells = <1>;
 
-       ac_power_supply: ac-power-supply {
+       ac_power_supply: ac-power {
                compatible = "x-powers,axp221-ac-power-supply";
                status = "disabled";
        };
@@ -62,7 +62,7 @@
                #io-channel-cells = <1>;
        };
 
-       battery_power_supply: battery-power-supply {
+       battery_power_supply: battery-power {
                compatible = "x-powers,axp221-battery-power-supply";
                status = "disabled";
        };
@@ -163,7 +163,7 @@
                };
        };
 
-       usb_power_supply: usb_power_supply {
+       usb_power_supply: usb-power {
                compatible = "x-powers,axp221-usb-power-supply";
                status = "disabled";
        };

diff --git a/arch/arm/boot/dts/axp81x.dtsi b/arch/arm/boot/dts/axp81x.dtsi
index 1dfeece..63fb981 100644 (file)
--- a/arch/arm/boot/dts/axp81x.dtsi
+++ b/arch/arm/boot/dts/axp81x.dtsi
@@ -48,7 +48,7 @@
        interrupt-controller;
        #interrupt-cells = <1>;
 
-       ac_power_supply: ac-power-supply {
+       ac_power_supply: ac-power {
                compatible = "x-powers,axp813-ac-power-supply";
                status = "disabled";
        };
@@ -74,7 +74,7 @@
                };
        };
 
-       battery_power_supply: battery-power-supply {
+       battery_power_supply: battery-power {
                compatible = "x-powers,axp813-battery-power-supply";
                status = "disabled";
        };
@@ -172,7 +172,7 @@
                };
        };
 
-       usb_power_supply: usb-power-supply {
+       usb_power_supply: usb-power {
                compatible = "x-powers,axp813-usb-power-supply";
        };
 };

diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi
index 10e9186..6140205 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/axp803.dtsi
+++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi
@@ -10,7 +10,7 @@
        interrupt-controller;
        #interrupt-cells = <1>;
 
-       ac_power_supply: ac-power-supply {
+       ac_power_supply: ac-power {
                compatible = "x-powers,axp803-ac-power-supply",
                             "x-powers,axp813-ac-power-supply";
                status = "disabled";
@@ -37,7 +37,7 @@
                };
        };
 
-       battery_power_supply: battery-power-supply {
+       battery_power_supply: battery-power {
                compatible = "x-powers,axp803-battery-power-supply",
                             "x-powers,axp813-battery-power-supply";
                status = "disabled";
@@ -147,7 +147,7 @@
                };
        };
 
-       usb_power_supply: usb-power-supply {
+       usb_power_supply: usb-power {
                compatible = "x-powers,axp803-usb-power-supply",
                             "x-powers,axp813-usb-power-supply";
                status = "disabled";