ARM: dts: at91: rearrange kizbox dts using aliases nodes

Use aliases nodes to easy kizbox dts readability.

Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
Link: https://lore.kernel.org/r/20191205223021.1370083-1-kamel.bouhara@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts
index 90996ea..7d938cc 100644 (file)
--- a/arch/arm/boot/dts/at91-kizbox.dts
+++ b/arch/arm/boot/dts/at91-kizbox.dts
@@ -28,85 +28,6 @@
                };
        };
 
-       ahb {
-               apb {
-                       tcb0: timer@fffa0000 {
-                               timer@0 {
-                                       compatible = "atmel,tcb-timer";
-                                       reg = <0>, <1>;
-                               };
-
-                               timer@2 {
-                                       compatible = "atmel,tcb-timer";
-                                       reg = <2>;
-                               };
-                       };
-
-                       macb0: ethernet@fffc4000 {
-                               phy-mode = "mii";
-                               pinctrl-0 = <&pinctrl_macb_rmii
-                                            &pinctrl_macb_rmii_mii_alt>;
-                               status = "okay";
-                       };
-
-                       usart3: serial@fffd0000 {
-                               status = "okay";
-                       };
-
-                       dbgu: serial@fffff200 {
-                               status = "okay";
-                       };
-
-                       watchdog@fffffd40 {
-                               timeout-sec = <15>;
-                               atmel,max-heartbeat-sec = <16>;
-                               atmel,min-heartbeat-sec = <0>;
-                               status = "okay";
-                       };
-               };
-
-               usb0: ohci@500000 {
-                       num-ports = <1>;
-                       status = "okay";
-               };
-
-               ebi: ebi@10000000 {
-                       status = "okay";
-
-                       nand_controller: nand-controller {
-                               status = "okay";
-                               pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>;
-                               pinctrl-names = "default";
-
-                               nand@3 {
-                                       reg = <0x3 0x0 0x800000>;
-                                       rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>;
-                                       cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>;
-                                       nand-bus-width = <8>;
-                                       nand-ecc-mode = "soft";
-                                       nand-on-flash-bbt;
-                                       label = "atmel_nand";
-
-                                       partitions {
-                                               compatible = "fixed-partitions";
-                                               #address-cells = <1>;
-                                               #size-cells = <1>;
-
-                                               bootstrap@0 {
-                                                       label = "bootstrap";
-                                                       reg = <0x0 0x20000>;
-                                               };
-
-                                               ubi@20000 {
-                                                       label = "ubi";
-                                                       reg = <0x20000 0x7fe0000>;
-                                               };
-                                       };
-                               };
-                       };
-               };
-       };
-
        gpio_keys {
                compatible = "gpio-keys";
                #address-cells = <1>;
@@ -127,15 +48,6 @@
                };
        };
 
-       i2c-gpio-0 {
-               status = "okay";
-
-               rtc: pcf8563@51 {
-                       compatible = "nxp,pcf8563";
-                       reg = <0x51>;
-               };
-       };
-
        pwm_leds {
                compatible = "pwm-leds";
 
@@ -179,3 +91,87 @@
                             &pinctrl_tcb1_tiob0>;
        };
 };
+
+&tcb0 {
+       timer@0 {
+               compatible = "atmel,tcb-timer";
+               reg = <0>, <1>;
+       };
+
+       timer@2 {
+               compatible = "atmel,tcb-timer";
+               reg = <2>;
+       };
+};
+
+&ebi {
+       status = "okay";
+};
+
+&nand_controller {
+       status = "okay";
+       pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>;
+       pinctrl-names = "default";
+
+       nand@3 {
+               reg = <0x3 0x0 0x800000>;
+               rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>;
+               cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>;
+               nand-bus-width = <8>;
+               nand-ecc-mode = "soft";
+               nand-on-flash-bbt;
+               label = "atmel_nand";
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       bootstrap@0 {
+                               label = "bootstrap";
+                               reg = <0x0 0x20000>;
+                       };
+
+                       ubi@20000 {
+                               label = "ubi";
+                               reg = <0x20000 0x7fe0000>;
+                       };
+               };
+       };
+};
+
+&macb0 {
+       phy-mode = "mii";
+       pinctrl-0 = <&pinctrl_macb_rmii
+                    &pinctrl_macb_rmii_mii_alt>;
+       status = "okay";
+};
+
+&usart3 {
+       status = "okay";
+};
+
+&dbgu {
+       status = "okay";
+};
+
+&watchdog {
+       timeout-sec = <15>;
+       atmel,max-heartbeat-sec = <16>;
+       atmel,min-heartbeat-sec = <0>;
+       status = "okay";
+};
+
+&usb0 {
+       num-ports = <1>;
+       status = "okay";
+};
+
+&i2c_gpio0 {
+       status = "okay";
+
+       rtc: pcf8563@51 {
+               compatible = "nxp,pcf8563";
+               reg = <0x51>;
+       };
+};

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 16c6fd3..6afbb48 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -738,7 +738,7 @@
                                status = "disabled";
                        };
 
-                       watchdog@fffffd40 {
+                       watchdog: watchdog@fffffd40 {
                                compatible = "atmel,at91sam9260-wdt";
                                reg = <0xfffffd40 0x10>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -793,7 +793,7 @@
                };
        };
 
-       i2c-gpio-0 {
+       i2c_gpio0: i2c-gpio-0 {
                compatible = "i2c-gpio";
                gpios = <&pioA 23 GPIO_ACTIVE_HIGH /* sda */
                         &pioA 24 GPIO_ACTIVE_HIGH /* scl */