diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2021-09-01 12:18:39 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-09-13 10:04:29 +0300 |
| commit | 44d52206adac0cf0bc85c9a958815d653a0910e5 (patch) | |
| tree | c66cafd96d8805b5f4637c4d7f2c0cea5d2970fb /arch/arm64/boot/dts/allwinner | |
| parent | 9112dab23354e15a37d71bec6f888f1b3e3117c6 (diff) | |
| download | linux-44d52206adac0cf0bc85c9a958815d653a0910e5.tar.xz | |
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
Diffstat (limited to 'arch/arm64/boot/dts/allwinner')
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/axp803.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi index 10e9186a76bf..61402057e107 100644 --- 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"; |