ARM: dts: sun5i: 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/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
index 30c8e7b5fabc2dc4affae52b1aca7ed43b5589d4..f5c50b66290ae75438647a044a11ccd8e76b4267 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
@@ -106,7 +106,7 @@
 };
 
 &pio {
-       led_pins_t003: led_pins@0 {
+       led_pins_t003: led-pin {
                pins = "PB2";
                function = "gpio_out";
                drive-strength = <20>;

diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index bae5a35b38a1b9a836d4d6ca7c9ed9181d963b65..540513686e060df0e1694018bea461eaa3a4e4b2 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -125,13 +125,13 @@
 };
 
 &pio {
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
+       usb0_id_detect_pin: usb0-id-detect-pin {
                pins = "PG12";
                function = "gpio_in";
                bias-pull-up;
        };
 
-       led_pins_t004: led_pins@0 {
+       led_pins_t004: led-pin {
                pins = "PB2";
                function = "gpio_out";
                drive-strength = <20>;

diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index b1fe1226cb1edaa7f76202e1a55cc743e1baf15f..ae6d4a0bb9c99523bfb53a221ec13ae28843cdf0 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -223,13 +223,13 @@
 };
 
 &pio {
-       led_pins_olinuxino: led_pins@0 {
+       led_pins_olinuxino: led-pin {
                pins = "PE3";
                function = "gpio_out";
                drive-strength = <20>;
        };
 
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
+       usb0_id_detect_pin: usb0-id-detect-pin {
                pins = "PG12";
                function = "gpio_in";
                bias-pull-up;

diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index a32025e57592b3e8df41b532877acb332c5d5ab4..afbda5dd773b9cc98d96a2866a1bc784d44845d4 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -98,7 +98,7 @@
 };
 
 &pio {
-       led_pins_r7: led_pins@0 {
+       led_pins_r7: led-pin {
                pins = "PB2";
                function = "gpio_out";
                drive-strength = <20>;

diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
index 34c932564dafb47ccd1486968cfa174045c2500c..49eaa1920088e830788fdfaab2c74a6e1b1e6823 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
+++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
@@ -134,13 +134,13 @@
 };
 
 &pio {
-       usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
+       usb0_vbus_detect_pin: usb0-vbus-detect-pin {
                pins = "PG1";
                function = "gpio_in";
                bias-pull-down;
        };
 
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
+       usb0_id_detect_pin: usb0-id-detect-pin {
                pins = "PG2";
                function = "gpio_in";
                bias-pull-up;

diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index 4f5b1247a427f91bfbe48c6c10bd857f8f7d09ad..082a1501eaf1ec56b1e15c5dda7d9eb72450a397 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -133,7 +133,7 @@
 };
 
 &pio {
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
+       usb0_id_detect_pin: usb0-id-detect-pin {
                pins = "PG2";
                function = "gpio_in";
                bias-pull-up;

diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index 70445d28c20ab99535f373e3dff30f000e33c89b..cf5f730d5efa250e459dd53f0734e7780bb16d94 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -112,19 +112,19 @@
 };
 
 &pio {
-       led_pins_olinuxinom: led_pins@0 {
+       led_pins_olinuxinom: led-pin {
                pins = "PG9";
                function = "gpio_out";
                drive-strength = <20>;
        };
 
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
+       usb0_id_detect_pin: usb0-id-detect-pin {
                pins = "PG2";
                function = "gpio_in";
                bias-pull-up;
        };
 
-       usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
+       usb0_vbus_detect_pin: usb0-vbus-detect-pin {
                pins = "PG1";
                function = "gpio_in";
                bias-pull-down;

diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 8855ddb78e0b083467c6b46f823bcc9cead38e5d..ae270eda1a69079f306128270e860fac247fbc6c 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -207,19 +207,19 @@
 };
 
 &pio {
-       led_pins_olinuxino: led_pins@0 {
+       led_pins_olinuxino: led-pin {
                pins = "PG9";
                function = "gpio_out";
                drive-strength = <20>;
        };
 
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
+       usb0_id_detect_pin: usb0-id-detect-pin {
                pins = "PG2";
                function = "gpio_in";
                bias-pull-up;
        };
 
-       usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
+       usb0_vbus_detect_pin: usb0-vbus-detect-pin {
                pins = "PG1";
                function = "gpio_in";
                bias-pull-down;

diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
index 31a4b61f1d753bd1d3052012dd4b8f75b3490497..732873cbeedc67fe0d04bcf6857aa7b082722d79 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
+++ b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
@@ -58,7 +58,7 @@
                /delete-property/stdout-path;
        };
 
-       i2c_lcd: i2c@0 {
+       i2c_lcd: i2c-gpio {
                /* The lcd panel i2c interface is hooked up via gpios */
                compatible = "i2c-gpio";
                pinctrl-names = "default";
@@ -95,7 +95,7 @@
 };
 
 &pio {
-       i2c_lcd_pins: i2c_lcd_pin@0 {
+       i2c_lcd_pins: i2c-lcd-pin {
                pins = "PG10", "PG12";
                function = "gpio_out";
                bias-pull-up;

diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
index a913084c8d2056b10dcb7d978094d55d06d2d1df..3c9f4f35d43b4303dc14cb77e0a7e08a4ed4c3b0 100644 (file)
--- a/arch/arm/boot/dts/sun5i-r8-chip.dts
+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
@@ -182,8 +182,7 @@
 };
 
 &pio {
-
-       chip_w1_pin: chip_w1_pin@0 {
+       chip_w1_pin: chip-w1-pin {
                pins = "PD2";
                function = "gpio_in";
                bias-pull-up;

diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
index ca7556177c1b22154697dfc86811b0083f7002c8..b046436ff773bb7d0e157c9b819e548784c6755a 100644 (file)
--- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
@@ -137,13 +137,13 @@
 };
 
 &pio {
-       usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
+       usb0_vbus_detect_pin: usb0-vbus-detect-pin {
                pins = "PG1";
                function = "gpio_in";
                bias-pull-down;
        };
 
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
+       usb0_id_detect_pin: usb0-id-detect-pin {
                pins = "PG2";
                function = "gpio_in";
                bias-pull-up;