ARM: dts: bcm283x: Fix underscores in node names

A lot pinctrl node names, regulators and local_intc do not follow the
node name convention to avoid underscore. So fix this by using hyphen
or a proper node name.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20221110173105.6633-2-stefan.wahren@i2se.com
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index 4432412..aaad9b7 100644 (file)
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -27,7 +27,7 @@
                };
        };
 
-       sd_io_1v8_reg: sd_io_1v8_reg {
+       sd_io_1v8_reg: regulator-sd-io-1v8 {
                compatible = "regulator-gpio";
                regulator-name = "vdd-sd-io";
                regulator-min-microvolt = <1800000>;
@@ -41,7 +41,7 @@
                status = "okay";
        };
 
-       sd_vcc_reg: sd_vcc_reg {
+       sd_vcc_reg: regulator-sd-vcc {
                compatible = "regulator-fixed";
                regulator-name = "vcc-sd";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi b/arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi
index a2954d4..48e63ab 100644 (file)
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi
@@ -12,7 +12,7 @@
                stdout-path = "serial1:115200n8";
        };
 
-       sd_io_1v8_reg: sd_io_1v8_reg {
+       sd_io_1v8_reg: regulator-sd-io-1v8 {
                compatible = "regulator-gpio";
                regulator-name = "vdd-sd-io";
                regulator-min-microvolt = <1800000>;
@@ -26,7 +26,7 @@
                status = "okay";
        };
 
-       sd_vcc_reg: sd_vcc_reg {
+       sd_vcc_reg: regulator-sd-vcc {
                compatible = "regulator-fixed";
                regulator-name = "vcc-sd";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
index 941c4d1..0f65a81 100644 (file)
--- a/arch/arm/boot/dts/bcm2711.dtsi
+++ b/arch/arm/boot/dts/bcm2711.dtsi
@@ -48,7 +48,7 @@
                 * This node is the provider for the enable-method for
                 * bringing up secondary cores.
                 */
-               local_intc: local_intc@40000000 {
+               local_intc: interrupt-controller@40000000 {
                        compatible = "brcm,bcm2836-l1-intc";
                        reg = <0x40000000 0x100>;
                };
@@ -647,21 +647,21 @@
 
        gpio-ranges = <&gpio 0 0 58>;
 
-       gpclk0_gpio49: gpclk0_gpio49 {
+       gpclk0_gpio49: gpclk0-gpio49 {
                pin-gpclk {
                        pins = "gpio49";
                        function = "alt1";
                        bias-disable;
                };
        };
-       gpclk1_gpio50: gpclk1_gpio50 {
+       gpclk1_gpio50: gpclk1-gpio50 {
                pin-gpclk {
                        pins = "gpio50";
                        function = "alt1";
                        bias-disable;
                };
        };
-       gpclk2_gpio51: gpclk2_gpio51 {
+       gpclk2_gpio51: gpclk2-gpio51 {
                pin-gpclk {
                        pins = "gpio51";
                        function = "alt1";
@@ -669,7 +669,7 @@
                };
        };
 
-       i2c0_gpio46: i2c0_gpio46 {
+       i2c0_gpio46: i2c0-gpio46 {
                pin-sda {
                        function = "alt0";
                        pins = "gpio46";
@@ -681,7 +681,7 @@
                        bias-disable;
                };
        };
-       i2c1_gpio46: i2c1_gpio46 {
+       i2c1_gpio46: i2c1-gpio46 {
                pin-sda {
                        function = "alt1";
                        pins = "gpio46";
@@ -693,7 +693,7 @@
                        bias-disable;
                };
        };
-       i2c3_gpio2: i2c3_gpio2 {
+       i2c3_gpio2: i2c3-gpio2 {
                pin-sda {
                        function = "alt5";
                        pins = "gpio2";
@@ -705,7 +705,7 @@
                        bias-disable;
                };
        };
-       i2c3_gpio4: i2c3_gpio4 {
+       i2c3_gpio4: i2c3-gpio4 {
                pin-sda {
                        function = "alt5";
                        pins = "gpio4";
@@ -717,7 +717,7 @@
                        bias-disable;
                };
        };
-       i2c4_gpio6: i2c4_gpio6 {
+       i2c4_gpio6: i2c4-gpio6 {
                pin-sda {
                        function = "alt5";
                        pins = "gpio6";
@@ -729,7 +729,7 @@
                        bias-disable;
                };
        };
-       i2c4_gpio8: i2c4_gpio8 {
+       i2c4_gpio8: i2c4-gpio8 {
                pin-sda {
                        function = "alt5";
                        pins = "gpio8";
@@ -741,7 +741,7 @@
                        bias-disable;
                };
        };
-       i2c5_gpio10: i2c5_gpio10 {
+       i2c5_gpio10: i2c5-gpio10 {
                pin-sda {
                        function = "alt5";
                        pins = "gpio10";
@@ -753,7 +753,7 @@
                        bias-disable;
                };
        };
-       i2c5_gpio12: i2c5_gpio12 {
+       i2c5_gpio12: i2c5-gpio12 {
                pin-sda {
                        function = "alt5";
                        pins = "gpio12";
@@ -765,7 +765,7 @@
                        bias-disable;
                };
        };
-       i2c6_gpio0: i2c6_gpio0 {
+       i2c6_gpio0: i2c6-gpio0 {
                pin-sda {
                        function = "alt5";
                        pins = "gpio0";
@@ -777,7 +777,7 @@
                        bias-disable;
                };
        };
-       i2c6_gpio22: i2c6_gpio22 {
+       i2c6_gpio22: i2c6-gpio22 {
                pin-sda {
                        function = "alt5";
                        pins = "gpio22";
@@ -789,7 +789,7 @@
                        bias-disable;
                };
        };
-       i2c_slave_gpio8: i2c_slave_gpio8 {
+       i2c_slave_gpio8: i2c-slave-gpio8 {
                pins-i2c-slave {
                        pins = "gpio8",
                               "gpio9",
@@ -799,7 +799,7 @@
                };
        };
 
-       jtag_gpio48: jtag_gpio48 {
+       jtag_gpio48: jtag-gpio48 {
                pins-jtag {
                        pins = "gpio48",
                               "gpio49",
@@ -811,7 +811,7 @@
                };
        };
 
-       mii_gpio28: mii_gpio28 {
+       mii_gpio28: mii-gpio28 {
                pins-mii {
                        pins = "gpio28",
                               "gpio29",
@@ -820,7 +820,7 @@
                        function = "alt4";
                };
        };
-       mii_gpio36: mii_gpio36 {
+       mii_gpio36: mii-gpio36 {
                pins-mii {
                        pins = "gpio36",
                               "gpio37",
@@ -830,7 +830,7 @@
                };
        };
 
-       pcm_gpio50: pcm_gpio50 {
+       pcm_gpio50: pcm-gpio50 {
                pins-pcm {
                        pins = "gpio50",
                               "gpio51",
@@ -840,63 +840,63 @@
                };
        };
 
-       pwm0_0_gpio12: pwm0_0_gpio12 {
+       pwm0_0_gpio12: pwm0-0-gpio12 {
                pin-pwm {
                        pins = "gpio12";
                        function = "alt0";
                        bias-disable;
                };
        };
-       pwm0_0_gpio18: pwm0_0_gpio18 {
+       pwm0_0_gpio18: pwm0-0-gpio18 {
                pin-pwm {
                        pins = "gpio18";
                        function = "alt5";
                        bias-disable;
                };
        };
-       pwm1_0_gpio40: pwm1_0_gpio40 {
+       pwm1_0_gpio40: pwm1-0-gpio40 {
                pin-pwm {
                        pins = "gpio40";
                        function = "alt0";
                        bias-disable;
                };
        };
-       pwm0_1_gpio13: pwm0_1_gpio13 {
+       pwm0_1_gpio13: pwm0-1-gpio13 {
                pin-pwm {
                        pins = "gpio13";
                        function = "alt0";
                        bias-disable;
                };
        };
-       pwm0_1_gpio19: pwm0_1_gpio19 {
+       pwm0_1_gpio19: pwm0-1-gpio19 {
                pin-pwm {
                        pins = "gpio19";
                        function = "alt5";
                        bias-disable;
                };
        };
-       pwm1_1_gpio41: pwm1_1_gpio41 {
+       pwm1_1_gpio41: pwm1-1-gpio41 {
                pin-pwm {
                        pins = "gpio41";
                        function = "alt0";
                        bias-disable;
                };
        };
-       pwm0_1_gpio45: pwm0_1_gpio45 {
+       pwm0_1_gpio45: pwm0-1-gpio45 {
                pin-pwm {
                        pins = "gpio45";
                        function = "alt0";
                        bias-disable;
                };
        };
-       pwm0_0_gpio52: pwm0_0_gpio52 {
+       pwm0_0_gpio52: pwm0-0-gpio52 {
                pin-pwm {
                        pins = "gpio52";
                        function = "alt1";
                        bias-disable;
                };
        };
-       pwm0_1_gpio53: pwm0_1_gpio53 {
+       pwm0_1_gpio53: pwm0-1-gpio53 {
                pin-pwm {
                        pins = "gpio53";
                        function = "alt1";
@@ -904,7 +904,7 @@
                };
        };
 
-       rgmii_gpio35: rgmii_gpio35 {
+       rgmii_gpio35: rgmii-gpio35 {
                pin-start-stop {
                        pins = "gpio35";
                        function = "alt4";
@@ -914,26 +914,26 @@
                        function = "alt4";
                };
        };
-       rgmii_irq_gpio34: rgmii_irq_gpio34 {
+       rgmii_irq_gpio34: rgmii-irq-gpio34 {
                pin-irq {
                        pins = "gpio34";
                        function = "alt5";
                };
        };
-       rgmii_irq_gpio39: rgmii_irq_gpio39 {
+       rgmii_irq_gpio39: rgmii-irq-gpio39 {
                pin-irq {
                        pins = "gpio39";
                        function = "alt4";
                };
        };
-       rgmii_mdio_gpio28: rgmii_mdio_gpio28 {
+       rgmii_mdio_gpio28: rgmii-mdio-gpio28 {
                pins-mdio {
                        pins = "gpio28",
                               "gpio29";
                        function = "alt5";
                };
        };
-       rgmii_mdio_gpio37: rgmii_mdio_gpio37 {
+       rgmii_mdio_gpio37: rgmii-mdio-gpio37 {
                pins-mdio {
                        pins = "gpio37",
                               "gpio38";
@@ -941,7 +941,7 @@
                };
        };
 
-       spi0_gpio46: spi0_gpio46 {
+       spi0_gpio46: spi0-gpio46 {
                pins-spi {
                        pins = "gpio46",
                               "gpio47",
@@ -950,7 +950,7 @@
                        function = "alt2";
                };
        };
-       spi2_gpio46: spi2_gpio46 {
+       spi2_gpio46: spi2-gpio46 {
                pins-spi {
                        pins = "gpio46",
                               "gpio47",
@@ -960,7 +960,7 @@
                        function = "alt5";
                };
        };
-       spi3_gpio0: spi3_gpio0 {
+       spi3_gpio0: spi3-gpio0 {
                pins-spi {
                        pins = "gpio0",
                               "gpio1",
@@ -969,7 +969,7 @@
                        function = "alt3";
                };
        };
-       spi4_gpio4: spi4_gpio4 {
+       spi4_gpio4: spi4-gpio4 {
                pins-spi {
                        pins = "gpio4",
                               "gpio5",
@@ -978,7 +978,7 @@
                        function = "alt3";
                };
        };
-       spi5_gpio12: spi5_gpio12 {
+       spi5_gpio12: spi5-gpio12 {
                pins-spi {
                        pins = "gpio12",
                               "gpio13",
@@ -987,7 +987,7 @@
                        function = "alt3";
                };
        };
-       spi6_gpio18: spi6_gpio18 {
+       spi6_gpio18: spi6-gpio18 {
                pins-spi {
                        pins = "gpio18",
                               "gpio19",
@@ -997,7 +997,7 @@
                };
        };
 
-       uart2_gpio0: uart2_gpio0 {
+       uart2_gpio0: uart2-gpio0 {
                pin-tx {
                        pins = "gpio0";
                        function = "alt4";
@@ -1009,7 +1009,7 @@
                        bias-pull-up;
                };
        };
-       uart2_ctsrts_gpio2: uart2_ctsrts_gpio2 {
+       uart2_ctsrts_gpio2: uart2-ctsrts-gpio2 {
                pin-cts {
                        pins = "gpio2";
                        function = "alt4";
@@ -1021,7 +1021,7 @@
                        bias-disable;
                };
        };
-       uart3_gpio4: uart3_gpio4 {
+       uart3_gpio4: uart3-gpio4 {
                pin-tx {
                        pins = "gpio4";
                        function = "alt4";
@@ -1033,7 +1033,7 @@
                        bias-pull-up;
                };
        };
-       uart3_ctsrts_gpio6: uart3_ctsrts_gpio6 {
+       uart3_ctsrts_gpio6: uart3-ctsrts-gpio6 {
                pin-cts {
                        pins = "gpio6";
                        function = "alt4";
@@ -1045,7 +1045,7 @@
                        bias-disable;
                };
        };
-       uart4_gpio8: uart4_gpio8 {
+       uart4_gpio8: uart4-gpio8 {
                pin-tx {
                        pins = "gpio8";
                        function = "alt4";
@@ -1057,7 +1057,7 @@
                        bias-pull-up;
                };
        };
-       uart4_ctsrts_gpio10: uart4_ctsrts_gpio10 {
+       uart4_ctsrts_gpio10: uart4-ctsrts-gpio10 {
                pin-cts {
                        pins = "gpio10";
                        function = "alt4";
@@ -1069,7 +1069,7 @@
                        bias-disable;
                };
        };
-       uart5_gpio12: uart5_gpio12 {
+       uart5_gpio12: uart5-gpio12 {
                pin-tx {
                        pins = "gpio12";
                        function = "alt4";
@@ -1081,7 +1081,7 @@
                        bias-pull-up;
                };
        };
-       uart5_ctsrts_gpio14: uart5_ctsrts_gpio14 {
+       uart5_ctsrts_gpio14: uart5-ctsrts-gpio14 {
                pin-cts {
                        pins = "gpio14";
                        function = "alt4";

diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
index a037d2b..bb7e8f7 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-common.dtsi
+++ b/arch/arm/boot/dts/bcm2835-common.dtsi
@@ -152,41 +152,41 @@
 };
 
 &gpio {
-       i2c_slave_gpio18: i2c_slave_gpio18 {
+       i2c_slave_gpio18: i2c-slave-gpio18 {
                brcm,pins = <18 19 20 21>;
                brcm,function = <BCM2835_FSEL_ALT3>;
        };
 
-       jtag_gpio4: jtag_gpio4 {
+       jtag_gpio4: jtag-gpio4 {
                brcm,pins = <4 5 6 12 13>;
                brcm,function = <BCM2835_FSEL_ALT5>;
        };
 
-       pwm0_gpio12: pwm0_gpio12 {
+       pwm0_gpio12: pwm0-gpio12 {
                brcm,pins = <12>;
                brcm,function = <BCM2835_FSEL_ALT0>;
        };
-       pwm0_gpio18: pwm0_gpio18 {
+       pwm0_gpio18: pwm0-gpio18 {
                brcm,pins = <18>;
                brcm,function = <BCM2835_FSEL_ALT5>;
        };
-       pwm0_gpio40: pwm0_gpio40 {
+       pwm0_gpio40: pwm0-gpio40 {
                brcm,pins = <40>;
                brcm,function = <BCM2835_FSEL_ALT0>;
        };
-       pwm1_gpio13: pwm1_gpio13 {
+       pwm1_gpio13: pwm1-gpio13 {
                brcm,pins = <13>;
                brcm,function = <BCM2835_FSEL_ALT0>;
        };
-       pwm1_gpio19: pwm1_gpio19 {
+       pwm1_gpio19: pwm1-gpio19 {
                brcm,pins = <19>;
                brcm,function = <BCM2835_FSEL_ALT5>;
        };
-       pwm1_gpio41: pwm1_gpio41 {
+       pwm1_gpio41: pwm1-gpio41 {
                brcm,pins = <41>;
                brcm,function = <BCM2835_FSEL_ALT0>;
        };
-       pwm1_gpio45: pwm1_gpio45 {
+       pwm1_gpio45: pwm1-gpio45 {
                brcm,pins = <45>;
                brcm,function = <BCM2835_FSEL_ALT0>;
        };

diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi
index db56a34..50aee66 100644 (file)
--- a/arch/arm/boot/dts/bcm2836.dtsi
+++ b/arch/arm/boot/dts/bcm2836.dtsi
@@ -10,7 +10,7 @@
                         <0x40000000 0x40000000 0x00001000>;
                dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
 
-               local_intc: local_intc@40000000 {
+               local_intc: interrupt-controller@40000000 {
                        compatible = "brcm,bcm2836-l1-intc";
                        reg = <0x40000000 0x100>;
                        interrupt-controller;

diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index d2d9c6e..c9c52a1 100644 (file)
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -135,17 +135,17 @@
                         * groups only make sense to switch to a
                         * particular function together.
                         */
-                       dpi_gpio0: dpi_gpio0 {
+                       dpi_gpio0: dpi-gpio0 {
                                brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11
                                             12 13 14 15 16 17 18 19
                                             20 21 22 23 24 25 26 27>;
                                brcm,function = <BCM2835_FSEL_ALT2>;
                        };
-                       emmc_gpio22: emmc_gpio22 {
+                       emmc_gpio22: emmc-gpio22 {
                                brcm,pins = <22 23 24 25 26 27>;
                                brcm,function = <BCM2835_FSEL_ALT3>;
                        };
-                       emmc_gpio34: emmc_gpio34 {
+                       emmc_gpio34: emmc-gpio34 {
                                brcm,pins = <34 35 36 37 38 39>;
                                brcm,function = <BCM2835_FSEL_ALT3>;
                                brcm,pull = <BCM2835_PUD_OFF
@@ -155,95 +155,95 @@
                                             BCM2835_PUD_UP
                                             BCM2835_PUD_UP>;
                        };
-                       emmc_gpio48: emmc_gpio48 {
+                       emmc_gpio48: emmc-gpio48 {
                                brcm,pins = <48 49 50 51 52 53>;
                                brcm,function = <BCM2835_FSEL_ALT3>;
                        };
 
-                       gpclk0_gpio4: gpclk0_gpio4 {
+                       gpclk0_gpio4: gpclk0-gpio4 {
                                brcm,pins = <4>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       gpclk1_gpio5: gpclk1_gpio5 {
+                       gpclk1_gpio5: gpclk1-gpio5 {
                                brcm,pins = <5>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       gpclk1_gpio42: gpclk1_gpio42 {
+                       gpclk1_gpio42: gpclk1-gpio42 {
                                brcm,pins = <42>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       gpclk1_gpio44: gpclk1_gpio44 {
+                       gpclk1_gpio44: gpclk1-gpio44 {
                                brcm,pins = <44>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       gpclk2_gpio6: gpclk2_gpio6 {
+                       gpclk2_gpio6: gpclk2-gpio6 {
                                brcm,pins = <6>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       gpclk2_gpio43: gpclk2_gpio43 {
+                       gpclk2_gpio43: gpclk2-gpio43 {
                                brcm,pins = <43>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                                brcm,pull = <BCM2835_PUD_OFF>;
                        };
 
-                       i2c0_gpio0: i2c0_gpio0 {
+                       i2c0_gpio0: i2c0-gpio0 {
                                brcm,pins = <0 1>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       i2c0_gpio28: i2c0_gpio28 {
+                       i2c0_gpio28: i2c0-gpio28 {
                                brcm,pins = <28 29>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       i2c0_gpio44: i2c0_gpio44 {
+                       i2c0_gpio44: i2c0-gpio44 {
                                brcm,pins = <44 45>;
                                brcm,function = <BCM2835_FSEL_ALT1>;
                        };
-                       i2c1_gpio2: i2c1_gpio2 {
+                       i2c1_gpio2: i2c1-gpio2 {
                                brcm,pins = <2 3>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       i2c1_gpio44: i2c1_gpio44 {
+                       i2c1_gpio44: i2c1-gpio44 {
                                brcm,pins = <44 45>;
                                brcm,function = <BCM2835_FSEL_ALT2>;
                        };
 
-                       jtag_gpio22: jtag_gpio22 {
+                       jtag_gpio22: jtag-gpio22 {
                                brcm,pins = <22 23 24 25 26 27>;
                                brcm,function = <BCM2835_FSEL_ALT4>;
                        };
 
-                       pcm_gpio18: pcm_gpio18 {
+                       pcm_gpio18: pcm-gpio18 {
                                brcm,pins = <18 19 20 21>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       pcm_gpio28: pcm_gpio28 {
+                       pcm_gpio28: pcm-gpio28 {
                                brcm,pins = <28 29 30 31>;
                                brcm,function = <BCM2835_FSEL_ALT2>;
                        };
 
-                       sdhost_gpio48: sdhost_gpio48 {
+                       sdhost_gpio48: sdhost-gpio48 {
                                brcm,pins = <48 49 50 51 52 53>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
 
-                       spi0_gpio7: spi0_gpio7 {
+                       spi0_gpio7: spi0-gpio7 {
                                brcm,pins = <7 8 9 10 11>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       spi0_gpio35: spi0_gpio35 {
+                       spi0_gpio35: spi0-gpio35 {
                                brcm,pins = <35 36 37 38 39>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
-                       spi1_gpio16: spi1_gpio16 {
+                       spi1_gpio16: spi1-gpio16 {
                                brcm,pins = <16 17 18 19 20 21>;
                                brcm,function = <BCM2835_FSEL_ALT4>;
                        };
-                       spi2_gpio40: spi2_gpio40 {
+                       spi2_gpio40: spi2-gpio40 {
                                brcm,pins = <40 41 42 43 44 45>;
                                brcm,function = <BCM2835_FSEL_ALT4>;
                        };
 
-                       uart0_gpio14: uart0_gpio14 {
+                       uart0_gpio14: uart0-gpio14 {
                                brcm,pins = <14 15>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };
@@ -252,50 +252,50 @@
                         * people often run uart0 on the two pins
                         * without flow control.
                         */
-                       uart0_ctsrts_gpio16: uart0_ctsrts_gpio16 {
+                       uart0_ctsrts_gpio16: uart0-ctsrts-gpio16 {
                                brcm,pins = <16 17>;
                                brcm,function = <BCM2835_FSEL_ALT3>;
                        };
-                       uart0_ctsrts_gpio30: uart0_ctsrts_gpio30 {
+                       uart0_ctsrts_gpio30: uart0-ctsrts-gpio30 {
                                brcm,pins = <30 31>;
                                brcm,function = <BCM2835_FSEL_ALT3>;
                                brcm,pull = <BCM2835_PUD_UP BCM2835_PUD_OFF>;
                        };
-                       uart0_gpio32: uart0_gpio32 {
+                       uart0_gpio32: uart0-gpio32 {
                                brcm,pins = <32 33>;
                                brcm,function = <BCM2835_FSEL_ALT3>;
                                brcm,pull = <BCM2835_PUD_OFF BCM2835_PUD_UP>;
                        };
-                       uart0_gpio36: uart0_gpio36 {
+                       uart0_gpio36: uart0-gpio36 {
                                brcm,pins = <36 37>;
                                brcm,function = <BCM2835_FSEL_ALT2>;
                        };
-                       uart0_ctsrts_gpio38: uart0_ctsrts_gpio38 {
+                       uart0_ctsrts_gpio38: uart0-ctsrts-gpio38 {
                                brcm,pins = <38 39>;
                                brcm,function = <BCM2835_FSEL_ALT2>;
                        };
 
-                       uart1_gpio14: uart1_gpio14 {
+                       uart1_gpio14: uart1-gpio14 {
                                brcm,pins = <14 15>;
                                brcm,function = <BCM2835_FSEL_ALT5>;
                        };
-                       uart1_ctsrts_gpio16: uart1_ctsrts_gpio16 {
+                       uart1_ctsrts_gpio16: uart1-ctsrts-gpio16 {
                                brcm,pins = <16 17>;
                                brcm,function = <BCM2835_FSEL_ALT5>;
                        };
-                       uart1_gpio32: uart1_gpio32 {
+                       uart1_gpio32: uart1-gpio32 {
                                brcm,pins = <32 33>;
                                brcm,function = <BCM2835_FSEL_ALT5>;
                        };
-                       uart1_ctsrts_gpio30: uart1_ctsrts_gpio30 {
+                       uart1_ctsrts_gpio30: uart1-ctsrts-gpio30 {
                                brcm,pins = <30 31>;
                                brcm,function = <BCM2835_FSEL_ALT5>;
                        };
-                       uart1_gpio40: uart1_gpio40 {
+                       uart1_gpio40: uart1-gpio40 {
                                brcm,pins = <40 41>;
                                brcm,function = <BCM2835_FSEL_ALT5>;
                        };
-                       uart1_ctsrts_gpio42: uart1_ctsrts_gpio42 {
+                       uart1_ctsrts_gpio42: uart1-ctsrts-gpio42 {
                                brcm,pins = <42 43>;
                                brcm,function = <BCM2835_FSEL_ALT5>;
                        };