ARM: dts: sun6i: 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/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index d7a19664bae95cd1132f9355e6f80efda54a4035..99f25b2d5189c0dd598b8348b9defa41f2c9add2 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -122,7 +122,7 @@
 };
 
 &pio {
-       i2c_lcd_pins: i2c_lcd_pin@0 {
+       i2c_lcd_pins: i2c-lcd-pins {
                pins = "PA23", "PA24";
                function = "gpio_out";
                bias-pull-up;

diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index 645d405fcfccabec603fcd69e4c9f9eb08ab21a1..ba378affd49747e9a9a203bcfc9689066bf393e5 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -154,7 +154,7 @@
 };
 
 &pio {
-       mma8452_int_primo81: mma8452_int_pin@0 {
+       mma8452_int_primo81: mma8452-int-pin {
                pins = "PA9";
                function = "gpio_in";
                bias-pull-up;

diff --git a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
index a506d740dee3071a4a9bf6bd1f651b40ae08591a..86143de21c2215a289bd201b752da978bc21840d 100644 (file)
--- a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
@@ -74,7 +74,7 @@
 };
 
 &pio {
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
+       usb0_id_detect_pin: usb0-id-detect-pin {
                pins = "PA15";
                function = "gpio_in";
                bias-pull-up;