tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+12
-12
+3
-3
arch/arm/boot/dts/axp209.dtsi
+3
-3
arch/arm/boot/dts/axp209.dtsi
···
53
53
interrupt-controller;
54
54
#interrupt-cells = <1>;
55
55
56
-
ac_power_supply: ac-power-supply {
56
+
ac_power_supply: ac-power {
57
57
compatible = "x-powers,axp202-ac-power-supply";
58
58
status = "disabled";
59
59
};
···
69
69
#gpio-cells = <2>;
70
70
};
71
71
72
-
battery_power_supply: battery-power-supply {
72
+
battery_power_supply: battery-power {
73
73
compatible = "x-powers,axp209-battery-power-supply";
74
74
status = "disabled";
75
75
};
···
112
112
};
113
113
};
114
114
115
-
usb_power_supply: usb-power-supply {
115
+
usb_power_supply: usb-power {
116
116
compatible = "x-powers,axp202-usb-power-supply";
117
117
status = "disabled";
118
118
};
+3
-3
arch/arm/boot/dts/axp22x.dtsi
+3
-3
arch/arm/boot/dts/axp22x.dtsi
···
52
52
interrupt-controller;
53
53
#interrupt-cells = <1>;
54
54
55
-
ac_power_supply: ac-power-supply {
55
+
ac_power_supply: ac-power {
56
56
compatible = "x-powers,axp221-ac-power-supply";
57
57
status = "disabled";
58
58
};
···
62
62
#io-channel-cells = <1>;
63
63
};
64
64
65
-
battery_power_supply: battery-power-supply {
65
+
battery_power_supply: battery-power {
66
66
compatible = "x-powers,axp221-battery-power-supply";
67
67
status = "disabled";
68
68
};
···
163
163
};
164
164
};
165
165
166
-
usb_power_supply: usb_power_supply {
166
+
usb_power_supply: usb-power {
167
167
compatible = "x-powers,axp221-usb-power-supply";
168
168
status = "disabled";
169
169
};
+3
-3
arch/arm/boot/dts/axp81x.dtsi
+3
-3
arch/arm/boot/dts/axp81x.dtsi
···
48
48
interrupt-controller;
49
49
#interrupt-cells = <1>;
50
50
51
-
ac_power_supply: ac-power-supply {
51
+
ac_power_supply: ac-power {
52
52
compatible = "x-powers,axp813-ac-power-supply";
53
53
status = "disabled";
54
54
};
···
74
74
};
75
75
};
76
76
77
-
battery_power_supply: battery-power-supply {
77
+
battery_power_supply: battery-power {
78
78
compatible = "x-powers,axp813-battery-power-supply";
79
79
status = "disabled";
80
80
};
···
172
172
};
173
173
};
174
174
175
-
usb_power_supply: usb-power-supply {
175
+
usb_power_supply: usb-power {
176
176
compatible = "x-powers,axp813-usb-power-supply";
177
177
};
178
178
};
+3
-3
arch/arm64/boot/dts/allwinner/axp803.dtsi
+3
-3
arch/arm64/boot/dts/allwinner/axp803.dtsi
···
10
10
interrupt-controller;
11
11
#interrupt-cells = <1>;
12
12
13
-
ac_power_supply: ac-power-supply {
13
+
ac_power_supply: ac-power {
14
14
compatible = "x-powers,axp803-ac-power-supply",
15
15
"x-powers,axp813-ac-power-supply";
16
16
status = "disabled";
···
37
37
};
38
38
};
39
39
40
-
battery_power_supply: battery-power-supply {
40
+
battery_power_supply: battery-power {
41
41
compatible = "x-powers,axp803-battery-power-supply",
42
42
"x-powers,axp813-battery-power-supply";
43
43
status = "disabled";
···
147
147
};
148
148
};
149
149
150
-
usb_power_supply: usb-power-supply {
150
+
usb_power_supply: usb-power {
151
151
compatible = "x-powers,axp803-usb-power-supply",
152
152
"x-powers,axp813-usb-power-supply";
153
153
status = "disabled";