ARM: dts: sun8i: a23/a33: Remove underscores from nodes names

Some GPIO pinctrl nodes cannot be easily removed, because they would also
change the pin configuration, for example to add a pull resistor or change
the current delivered by the pin.

Those nodes still have underscores and unit-addresses in their node names
in our DTs, so adjust their name to remove the warnings. Use that occasion
to also fix some poorly chosen node-names.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
index 42726576a6a943cec5acd71441419c9c07a8b651..317763069c0a7aeb30ace8e794355a72792ae870 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
+++ b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
@@ -84,7 +84,7 @@
 };
 
 &r_pio {
-       led_pin_d978: led_pin_d978@0 {
+       led_pin_d978: led-pin {
                pins = "PL5";
                function = "gpio_out";
                drive-strength = <20>;

diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi
index e3ca8a94d690809cfdced2fdafe67da6203fd53e..719ad769b83713f003bfe48706e962a49ab97c31 100644 (file)
--- a/arch/arm/boot/dts/sun8i-q8-common.dtsi
+++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi
@@ -83,7 +83,7 @@
 };
 
 &r_pio {
-       wifi_pwrseq_pin_q8: wifi_pwrseq_pin@0 {
+       wifi_pwrseq_pin_q8: wifi-pwrseq-pins {
                pins = "PL6", "PL7", "PL11";
                function = "gpio_in";
                bias-pull-up;

diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 3897a91cca47ead89cf594b75dab88d493202c79..85a0d03fa0943ce5fcbca3a54dc5ac7f24819fee 100644 (file)
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -163,7 +163,7 @@
 };
 
 &pio {
-       usb0_id_det: usb0_id_detect_pin@0 {
+       usb0_id_det: usb0-id-detect-pin {
                pins = "PD10";
                function = "gpio_in";
                bias-pull-up;

diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index 12a2ad67844e038829f0b38e10f78e428ccd93b0..787a3121e179567e3320f088bcdee20fab8b23ef 100644 (file)
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -94,7 +94,7 @@
 };
 
 &pio {
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
+       usb0_id_detect_pin: usb0-id-detect-pin {
                pins = "PH8";
                function = "gpio_in";
                bias-pull-up;