Unverified Commit 44d52206 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/20210901091852.479202-40-maxime@cerno.tech
parent 9112dab2

arch/arm/boot/dts/axp209.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ &axp209 { 
	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 @@ axp_gpio: gpio { 
		#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 @@ reg_ldo5: ldo5 { 
		};

	};



	usb_power_supply: usb-power-supply {

	usb_power_supply: usb-power {

		compatible = "x-powers,axp202-usb-power-supply";

		status = "disabled";

	};

arch/arm/boot/dts/axp22x.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ &axp22x { 
	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 @@ axp_adc: adc { 
		#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 @@ reg_drivevbus: drivevbus { 
		};

	};



	usb_power_supply: usb_power_supply {

	usb_power_supply: usb-power {

		compatible = "x-powers,axp221-usb-power-supply";

		status = "disabled";

	};

arch/arm/boot/dts/axp81x.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ &axp81x { 
	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 @@ gpio1_ldo: gpio1-ldo { 
		};

	};



	battery_power_supply: battery-power-supply {

	battery_power_supply: battery-power {

		compatible = "x-powers,axp813-battery-power-supply";

		status = "disabled";

	};
@@ -172,7 +172,7 @@ reg_drivevbus: drivevbus { 
		};

	};



	usb_power_supply: usb-power-supply {

	usb_power_supply: usb-power {

		compatible = "x-powers,axp813-usb-power-supply";

	};

};

arch/arm64/boot/dts/allwinner/axp803.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ &axp803 { 
	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 @@ gpio1_ldo: gpio1-ldo { 
		};

	};



	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 @@ reg_drivevbus: drivevbus { 
		};

	};



	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";