From: Maxime Ripard <maxime@cerno.tech>
To: devicetree@vger.kernel.org, "Rob Herring" <robh+dt@kernel.org>,
"Frank Rowand" <frowand.list@gmail.com>,
"Chen-Yu Tsai" <wens@csie.org>,
"Maxime Ripard" <maxime@cerno.tech>,
"Jernej Škrabec" <jernej.skrabec@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com
Subject: [PATCH v2 39/52] ARM: dts: sunxi: Rename power-supply names
Date: Wed, 1 Sep 2021 11:18:39 +0200 [thread overview]
Message-ID: <20210901091852.479202-40-maxime@cerno.tech> (raw)
In-Reply-To: <20210901091852.479202-1-maxime@cerno.tech>
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>
---
arch/arm/boot/dts/axp209.dtsi | 6 +++---
arch/arm/boot/dts/axp22x.dtsi | 6 +++---
arch/arm/boot/dts/axp81x.dtsi | 6 +++---
arch/arm64/boot/dts/allwinner/axp803.dtsi | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/axp209.dtsi b/arch/arm/boot/dts/axp209.dtsi
index 0d9ff12bdf28..ca240cd6f6c3 100644
--- a/arch/arm/boot/dts/axp209.dtsi
+++ b/arch/arm/boot/dts/axp209.dtsi
@@ -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";
};
diff --git a/arch/arm/boot/dts/axp22x.dtsi b/arch/arm/boot/dts/axp22x.dtsi
index 65a07a67aca9..a020c12b2884 100644
--- a/arch/arm/boot/dts/axp22x.dtsi
+++ b/arch/arm/boot/dts/axp22x.dtsi
@@ -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";
};
diff --git a/arch/arm/boot/dts/axp81x.dtsi b/arch/arm/boot/dts/axp81x.dtsi
index 1dfeeceabf4c..63fb9811b453 100644
--- a/arch/arm/boot/dts/axp81x.dtsi
+++ b/arch/arm/boot/dts/axp81x.dtsi
@@ -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";
};
};
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 @@ &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";
--
2.31.1
next prev parent reply other threads:[~2021-09-01 9:20 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 9:18 [PATCH v2 00/52] ARM: dts: Last round of DT schema fixes Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 01/52] ASoC: dt-bindings: Add WM8978 Binding Maxime Ripard
2021-09-01 10:11 ` Charles Keepax
2021-09-01 14:39 ` Mark Brown
2021-09-03 10:37 ` Maxime Ripard
2021-09-03 11:36 ` Mark Brown
2021-09-01 9:18 ` [PATCH v2 02/52] ASoC: dt-bindings: Convert Bluetooth SCO Link binding to a schema Maxime Ripard
2021-09-03 17:52 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 03/52] ASoC: dt-bindings: Convert SPDIF Transmitter " Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 04/52] ASoC: dt-bindings: Convert Simple Amplifier " Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 05/52] dt-bindings: Convert Reserved Memory " Maxime Ripard
2021-09-01 12:10 ` Tom Rini
2021-09-03 18:08 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 06/52] dt-bindings: arm: Convert ARM CCI-400 " Maxime Ripard
2021-09-03 18:12 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 07/52] dt-bindings: bluetooth: broadcom: Fix clocks check Maxime Ripard
2021-09-16 22:53 ` Linus Walleij
2021-09-01 9:18 ` [PATCH v2 08/52] dt-bindings: bluetooth: realtek: Add missing max-speed Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 09/52] dt-bindings: clocks: Fix typo in the H6 compatible Maxime Ripard
2021-09-05 20:50 ` Jernej Škrabec
2021-09-06 13:34 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 10/52] dt-bindings: display: Move idk-1110wr to panel-lvds Maxime Ripard
2021-09-03 18:30 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 11/52] dt-bindings: display: Move idk-2121wr " Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 12/52] dt-bindings: display: Move ee101ia-01d " Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 13/52] dt-bindings: display: aa104xd12: Remove unused vcc-supply Maxime Ripard
2021-09-03 18:30 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 14/52] dt-bindings: display: aa104xd12: Fix data-mapping Maxime Ripard
2021-09-03 18:31 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 15/52] dt-bindings: display: Move aa104xd12 to panel-lvds Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 16/52] dt-bindings: display: aa121td01: Remove unused vcc-supply Maxime Ripard
2021-09-03 18:31 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 17/52] dt-bindings: display: aa121td01: Fix data-mapping Maxime Ripard
2021-09-03 18:31 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 18/52] dt-bindings: display: Move aa121td01 to panel-lvds Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 19/52] dt-bindings: display: Move gktw70sdae4se " Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 20/52] dt-bindings: display: panel-lvds: Document missing panel compatibles Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 21/52] dt-bindings: gnss: Convert UBlox Neo-6M binding to a schema Maxime Ripard
2021-09-03 19:27 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 22/52] dt-bindings: gpio: Convert X-Powers AXP209 GPIO " Maxime Ripard
2021-09-03 19:32 ` Rob Herring
2021-09-19 7:56 ` Bartosz Golaszewski
2021-09-01 9:18 ` [PATCH v2 23/52] dt-bindings: hwmon: Add IIO HWMON binding Maxime Ripard
2021-09-03 19:33 ` Rob Herring
2021-09-04 15:03 ` Guenter Roeck
2021-09-01 9:18 ` [PATCH v2 24/52] dt-bindings: input: Convert Silead GSL1680 binding to a schema Maxime Ripard
2021-09-03 19:35 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 25/52] dt-bindings: interconnect: sunxi: Add R40 MBUS compatible Maxime Ripard
2021-09-05 20:53 ` Jernej Škrabec
2021-10-15 8:08 ` (subset) " Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 26/52] dt-bindings: media: ti,cal: Fix example Maxime Ripard
2021-09-03 19:36 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 27/52] dt-bindings: media: Convert OV5640 binding to a schema Maxime Ripard
2021-09-03 19:39 ` Rob Herring
2021-10-14 13:48 ` Geert Uytterhoeven
2021-09-01 9:18 ` [PATCH v2 28/52] dt-bindings: mfd: Convert X-Powers AC100 " Maxime Ripard
2021-09-03 19:40 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 29/52] dt-bindings: mfd: Convert X-Powers AXP " Maxime Ripard
2021-09-03 19:44 ` Rob Herring
2021-09-06 9:02 ` Lee Jones
2021-09-14 7:12 ` Maxime Ripard
2021-09-14 12:57 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 30/52] dt-bindings: mmc: Convert MMC Card " Maxime Ripard
2021-09-03 19:45 ` Rob Herring
2021-09-06 17:10 ` Ulf Hansson
2021-09-01 9:18 ` [PATCH v2 31/52] dt-bindings: net: dwmac: Fix typo in the R40 compatible Maxime Ripard
2021-09-05 20:56 ` Jernej Škrabec
2021-09-01 9:18 ` [PATCH v2 32/52] dt-bindings: net: wireless: Convert ESP ESP8089 binding to a schema Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 33/52] dt-bindings: regulator: Convert SY8106A " Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 34/52] dt-bindings: sunxi: Add CPU Configuration Controller Binding Maxime Ripard
2021-09-05 21:00 ` Jernej Škrabec
2021-09-06 13:35 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 35/52] dt-bindings: sunxi: Add Allwinner A80 PRCM Binding Maxime Ripard
2021-09-05 21:01 ` Jernej Škrabec
2021-09-06 13:36 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 36/52] dt-bindings: usb: Convert SMSC USB3503 binding to a schema Maxime Ripard
2021-09-03 19:47 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 37/52] dt-bindings: usb: dwc3: Fix usb-phy check Maxime Ripard
2021-09-01 12:36 ` Felipe Balbi
2021-09-03 19:49 ` Rob Herring
2021-09-03 19:50 ` Rob Herring
2021-09-01 9:18 ` [PATCH v2 38/52] dt-bindings: w1: Convert 1-Wire GPIO binding to a schema Maxime Ripard
2021-09-03 19:50 ` Rob Herring
2021-09-01 9:18 ` Maxime Ripard [this message]
2021-09-05 21:02 ` [PATCH v2 39/52] ARM: dts: sunxi: Rename power-supply names Jernej Škrabec
2021-09-06 13:36 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 40/52] ARM: dts: sunxi: Rename gpio pinctrl names Maxime Ripard
2021-09-05 21:03 ` Jernej Škrabec
2021-09-06 13:37 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 41/52] ARM: dts: sunxi: Fix OPP arrays Maxime Ripard
2021-09-05 21:04 ` Jernej Škrabec
2021-09-06 13:37 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 42/52] ARM: dts: sunxi: Fix OPPs node name Maxime Ripard
2021-09-05 21:05 ` Jernej Škrabec
2021-09-06 13:38 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 43/52] ARM: dts: sunxi: Fix the SPI NOR node names Maxime Ripard
2021-09-05 21:06 ` Jernej Škrabec
2021-09-06 13:38 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 44/52] ARM: dts: v3s: Remove useless DMA properties Maxime Ripard
2021-09-05 21:08 ` Jernej Škrabec
2021-09-01 9:18 ` [PATCH v2 45/52] ARM: dts: tbs711: Fix touchscreen compatible Maxime Ripard
2021-09-05 21:11 ` Jernej Škrabec
2021-09-06 13:38 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 46/52] ARM: dts: cubieboard4: Remove the dumb-vga-dac compatible Maxime Ripard
2021-09-05 21:12 ` Jernej Škrabec
2021-09-06 13:39 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 47/52] arm64: dts: allwinner: h5: Fix GPU thermal zone node name Maxime Ripard
2021-09-05 21:12 ` Jernej Škrabec
2021-09-06 13:39 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 48/52] arm64: dts: allwinner: h6: Fix de3 parent clocks ordering Maxime Ripard
2021-09-05 21:13 ` Jernej Škrabec
2021-09-06 13:40 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 49/52] arm64: dts: allwinner: a100: Fix thermal zone node name Maxime Ripard
2021-09-05 21:13 ` Jernej Škrabec
2021-09-06 13:40 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 50/52] arm64: dts: allwinner: pinetab: Change regulator node name to avoid warning Maxime Ripard
2021-09-05 21:14 ` Jernej Škrabec
2021-09-06 13:41 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 51/52] arm64: dts: allwinner: teres-i: Add missing reg Maxime Ripard
2021-09-05 21:14 ` Jernej Škrabec
2021-09-06 13:41 ` Maxime Ripard
2021-09-01 9:18 ` [PATCH v2 52/52] arm64: dts: allwinner: teres-i: Remove wakekup-source from the PMIC Maxime Ripard
2021-09-05 21:24 ` Jernej Škrabec
2021-09-06 13:41 ` Maxime Ripard
2021-09-13 10:53 ` (subset) [PATCH v2 00/52] ARM: dts: Last round of DT schema fixes Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210901091852.479202-40-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-sunxi@googlegroups.com \
--cc=robh+dt@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).