ARM: dts: kirkwood: add node labels

This adds missing node labels to Kirkwood common and SoC specific nodes
to allow to reference them more easily.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-3-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi
index 3916937d6818032bc0c6aeb19594f8db3773479b..294a6fa0208c1d6efd0cb9be0d55749908ce326a 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-6192.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6192.dtsi
@@ -1,6 +1,6 @@
 / {
        mbus {
-               pcie-controller {
+               pciec: pcie-controller {
                        compatible = "marvell,kirkwood-pcie";
                        status = "disabled";
                        device_type = "pci";
@@ -15,7 +15,7 @@ pcie-controller {
                                0x82000000 0x1 0     MBUS_ID(0x04, 0xe8) 0       1 0 /* Port 0.0 MEM */
                                0x81000000 0x1 0     MBUS_ID(0x04, 0xe0) 0       1 0 /* Port 0.0 IO  */>;
 
-                       pcie@1,0 {
+                       pcie0: pcie@1,0 {
                                device_type = "pci";
                                assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
                                reg = <0x0800 0 0 0 0>;
@@ -76,14 +76,14 @@ pmx_sdio: pmx-sdio {
                        };
                };
 
-               rtc@10300 {
+               rtc: rtc@10300 {
                        compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
                        reg = <0x10300 0x20>;
                        interrupts = <53>;
                        clocks = <&gate_clk 7>;
                };
 
-               sata@80000 {
+               sata: sata@80000 {
                        compatible = "marvell,orion-sata";
                        reg = <0x80000 0x5000>;
                        interrupts = <21>;
@@ -92,7 +92,7 @@ sata@80000 {
                        status = "disabled";
                };
 
-               mvsdio@90000 {
+               sdio: mvsdio@90000 {
                        compatible = "marvell,orion-sdio";
                        reg = <0x90000 0x200>;
                        interrupts = <28>;

diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index 416d96e1302fab6e9af0d61ebb5cdbbe0290cfa7..2560cbbdb0b36d44e2ff66e8e20633354dd65c07 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -1,6 +1,6 @@
 / {
        mbus {
-               pcie-controller {
+               pciec: pcie-controller {
                        compatible = "marvell,kirkwood-pcie";
                        status = "disabled";
                        device_type = "pci";
@@ -15,7 +15,7 @@ pcie-controller {
                                0x82000000 0x1 0     MBUS_ID(0x04, 0xe8) 0       1 0 /* Port 0.0 MEM */
                                0x81000000 0x1 0     MBUS_ID(0x04, 0xe0) 0       1 0 /* Port 0.0 IO  */>;
 
-                       pcie@1,0 {
+                       pcie0: pcie@1,0 {
                                device_type = "pci";
                                assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
                                reg = <0x0800 0 0 0 0>;
@@ -76,14 +76,14 @@ pmx_sdio: pmx-sdio {
                        };
                };
 
-               rtc@10300 {
+               rtc: rtc@10300 {
                        compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
                        reg = <0x10300 0x20>;
                        interrupts = <53>;
                        clocks = <&gate_clk 7>;
                };
 
-               sata@80000 {
+               sata: sata@80000 {
                        compatible = "marvell,orion-sata";
                        reg = <0x80000 0x5000>;
                        interrupts = <21>;
@@ -94,7 +94,7 @@ sata@80000 {
                        status = "disabled";
                };
 
-               mvsdio@90000 {
+               sdio: mvsdio@90000 {
                        compatible = "marvell,orion-sdio";
                        reg = <0x90000 0x200>;
                        interrupts = <28>;

diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 2902e0d7971d061599d13ef8733e3a3c4ad49fd2..f4b4786b9a012ec2d9bf0600a494c5289e038025 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -1,6 +1,6 @@
 / {
        mbus {
-               pcie-controller {
+               pciec: pcie-controller {
                        compatible = "marvell,kirkwood-pcie";
                        status = "disabled";
                        device_type = "pci";
@@ -19,7 +19,7 @@ pcie-controller {
                                0x82000000 0x2 0     MBUS_ID(0x04, 0xd8) 0       1 0 /* Port 1.0 MEM */
                                0x81000000 0x2 0     MBUS_ID(0x04, 0xd0) 0       1 0 /* Port 1.0 IO  */>;
 
-                       pcie@1,0 {
+                       pcie0: pcie@1,0 {
                                device_type = "pci";
                                assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
                                reg = <0x0800 0 0 0 0>;
@@ -36,7 +36,7 @@ pcie@1,0 {
                                status = "disabled";
                        };
 
-                       pcie@2,0 {
+                       pcie1: pcie@2,0 {
                                device_type = "pci";
                                assigned-addresses = <0x82001000 0 0x00044000 0 0x2000>;
                                reg = <0x1000 0 0 0 0>;
@@ -104,20 +104,20 @@ pmx_sdio: pmx-sdio {
                        };
                };
 
-               thermal@10078 {
+               thermal: thermal@10078 {
                        compatible = "marvell,kirkwood-thermal";
                        reg = <0x10078 0x4>;
                        status = "okay";
                };
 
-               rtc@10300 {
+               rtc: rtc@10300 {
                        compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
                        reg = <0x10300 0x20>;
                        interrupts = <53>;
                        clocks = <&gate_clk 7>;
                };
 
-               i2c@11100 {
+               i2c1: i2c@11100 {
                        compatible = "marvell,mv64xxx-i2c";
                        reg = <0x11100 0x20>;
                        #address-cells = <1>;
@@ -128,7 +128,7 @@ i2c@11100 {
                        status = "disabled";
                };
 
-               sata@80000 {
+               sata: sata@80000 {
                        compatible = "marvell,orion-sata";
                        reg = <0x80000 0x5000>;
                        interrupts = <21>;
@@ -139,7 +139,7 @@ sata@80000 {
                        status = "disabled";
                };
 
-               mvsdio@90000 {
+               sdio: mvsdio@90000 {
                        compatible = "marvell,orion-sdio";
                        reg = <0x90000 0x200>;
                        interrupts = <28>;

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 90384587c27843c563d2c4328ce9411f4c26458b..2570e0f1673f40d8e9a430921ae00d9f3a9f9723 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -40,7 +40,7 @@ MBUS_ID(0x03, 0x01) 0 0xf5000000 0x10000      /* crypto sram */
                pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
                pcie-io-aperture  = <0xf2000000 0x100000>;   /*   1 MiB    I/O space */
 
-               crypto@0301 {
+               cesa: crypto@0301 {
                        compatible = "marvell,orion-crypto";
                        reg = <MBUS_ID(0xf0, 0x01) 0x30000 0x10000>,
                              <MBUS_ID(0x03, 0x01) 0 0x800>;
@@ -77,7 +77,7 @@ core_clk: core-clocks@10030 {
                        #clock-cells = <1>;
                };
 
-               spi@10600 {
+               spi0: spi@10600 {
                        compatible = "marvell,orion-spi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -123,7 +123,7 @@ i2c0: i2c@11000 {
                        status = "disabled";
                };
 
-               serial@12000 {
+               uart0: serial@12000 {
                        compatible = "ns16550a";
                        reg = <0x12000 0x100>;
                        reg-shift = <2>;
@@ -132,7 +132,7 @@ serial@12000 {
                        status = "disabled";
                };
 
-               serial@12100 {
+               uart1: serial@12100 {
                        compatible = "ns16550a";
                        reg = <0x12100 0x100>;
                        reg-shift = <2>;
@@ -146,7 +146,7 @@ mbusc: mbus-controller@20000 {
                        reg = <0x20000 0x80>, <0x1500 0x20>;
                };
 
-               system-controller@20000 {
+               sysc: system-controller@20000 {
                        compatible = "marvell,orion-system-controller";
                        reg = <0x20000 0x120>;
                };
@@ -196,7 +196,7 @@ wdt: watchdog-timer@20300 {
                        status = "okay";
                };
 
-               ehci@50000 {
+               usb0: ehci@50000 {
                        compatible = "marvell,orion-ehci";
                        reg = <0x50000 0x1000>;
                        interrupts = <19>;
@@ -204,7 +204,7 @@ ehci@50000 {
                        status = "okay";
                };
 
-               xor@60800 {
+               dma0: xor@60800 {
                        compatible = "marvell,orion-xor";
                        reg = <0x60800 0x100
                               0x60A00 0x100>;
@@ -224,7 +224,7 @@ xor01 {
                        };
                };
 
-               xor@60900 {
+               dma1: xor@60900 {
                        compatible = "marvell,orion-xor";
                        reg = <0x60900 0x100
                               0x60B00 0x100>;