ARM: dts: sun8i: h3: Fix node with unit name and no reg property

This patch fixes the warning "xxx has a unit name, but no reg property"
by removing "@0" from such node. 6 board files are fixed. Each has the
same aforementioned issue in pinmux nodes. These include the Nano Pi
family base dtsi file, the Orange Pi 2, Orange Pi Lite, Orange Pi One,
Orange Pi PC, and Orange Pi Plus.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
[wens@csie.org: Squashed 6 patches together; boards named in commit log]
Signed-off-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
index c6decee41a275e4970cf0c538386314f449f914f..7646e331bd2934f56dfb79e358cc9692cdfb2cbb 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
@@ -81,7 +81,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&sw_r_npi>;
 
-               k1@0 {
+               k1 {
                        label = "k1";
                        linux,code = <KEY_POWER>;
                        gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
@@ -108,19 +108,19 @@
 };
 
 &pio {
-       leds_npi: led_pins@0 {
+       leds_npi: led_pins {
                pins = "PA10";
                function = "gpio_out";
        };
 };
 
 &r_pio {
-       leds_r_npi: led_pins@0 {
+       leds_r_npi: led_pins {
                pins = "PL10";
                function = "gpio_out";
        };
 
-       sw_r_npi: key_pins@0 {
+       sw_r_npi: key_pins {
                pins = "PL3";
                function = "gpio_in";
        };

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
index 8ff71b1bb45b1c918d71e686ef4da4de7250306a..1bf51802f5aa28d23a8e3c69ccef92373b904d5f 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
@@ -152,24 +152,24 @@
 };
 
 &pio {
-       leds_opc: led_pins@0 {
+       leds_opc: led_pins {
                pins = "PA15";
                function = "gpio_out";
        };
 };
 
 &r_pio {
-       leds_r_opc: led_pins@0 {
+       leds_r_opc: led_pins {
                pins = "PL10";
                function = "gpio_out";
        };
 
-       sw_r_opc: key_pins@0 {
+       sw_r_opc: key_pins {
                pins = "PL3", "PL4";
                function = "gpio_in";
        };
 
-       wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin@0 {
+       wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin {
                pins = "PL7";
                function = "gpio_out";
        };

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
index 9b47a0def740c5ca43af9fd17503c3b2a28eb6c3..a70a1daf4e2c3e949a555eac59b00f9ec7a0d933 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
@@ -141,19 +141,19 @@
 };
 
 &pio {
-       leds_opc: led_pins@0 {
+       leds_opc: led_pins {
                pins = "PA15";
                function = "gpio_out";
        };
 };
 
 &r_pio {
-       leds_r_opc: led_pins@0 {
+       leds_r_opc: led_pins {
                pins = "PL10";
                function = "gpio_out";
        };
 
-       sw_r_opc: key_pins@0 {
+       sw_r_opc: key_pins {
                pins = "PL3";
                function = "gpio_in";
        };

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
index 5fea430e0eb1006120dd9b98dd904cdd7af14b67..a1c6ff6fd05d38e767a5819006f61203c5a5451e 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
@@ -116,19 +116,19 @@
 };
 
 &pio {
-       leds_opc: led_pins@0 {
+       leds_opc: led_pins {
                pins = "PA15";
                function = "gpio_out";
        };
 };
 
 &r_pio {
-       leds_r_opc: led_pins@0 {
+       leds_r_opc: led_pins {
                pins = "PL10";
                function = "gpio_out";
        };
 
-       sw_r_opc: key_pins@0 {
+       sw_r_opc: key_pins {
                pins = "PL3";
                function = "gpio_in";
        };

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
index 1a044b17d6c61e5cc391782c5e06aa3df7322548..ea4e0029c0d4e055be1a1326a743e7e69dba53a5 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
@@ -146,19 +146,19 @@
 };
 
 &pio {
-       leds_opc: led_pins@0 {
+       leds_opc: led_pins {
                pins = "PA15";
                function = "gpio_out";
        };
 };
 
 &r_pio {
-       leds_r_opc: led_pins@0 {
+       leds_r_opc: led_pins {
                pins = "PL10";
                function = "gpio_out";
        };
 
-       sw_r_opc: key_pins@0 {
+       sw_r_opc: key_pins {
                pins = "PL3";
                function = "gpio_in";
        };

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
index 828ae7a526d924955e666a4ad110f565aa931bf5..72ca01b93f1b7e4a4943060e08c731f876321454 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
@@ -92,7 +92,7 @@
 };
 
 &pio {
-       usb3_vbus_pin_a: usb3_vbus_pin@0 {
+       usb3_vbus_pin_a: usb3_vbus_pin {
                pins = "PG11";
                function = "gpio_out";
        };