ARM: dts: at91: sam9x60-curiosity: Improve alignment with upstream

- nodes moved
- using node references by label instead of dulicating the node tree

Makes it easier to compare with the dts file from Linux kernel.

Signed-off-by: Alexander Dahl <ada@thorsis.com>

diff --git a/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi b/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi
index 0c3c0406b453c73851e66dc1231eca08065cad4e..a1b76e94d11fad2897904042a6772ca004453365 100644 (file)
--- a/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi
+++ b/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi
@@ -14,10 +14,6 @@
 
                apb {
                        bootph-all;
-
-                       pinctrl {
-                               bootph-all;
-                       };
                };
        };
 
@@ -42,6 +38,10 @@
        bootph-all;
 };
 
+&pinctrl {
+       bootph-all;
+};
+
 &pinctrl_dbgu {
        bootph-all;
 };

diff --git a/arch/arm/dts/at91-sam9x60_curiosity.dts b/arch/arm/dts/at91-sam9x60_curiosity.dts
index ae707dd64bd0c2ba7c785045e8490da0ff87d84f..fb59405b242951440400815658d4d0def9d611cf 100644 (file)
--- a/arch/arm/dts/at91-sam9x60_curiosity.dts
+++ b/arch/arm/dts/at91-sam9x60_curiosity.dts
@@ -11,60 +11,18 @@
 #include "sam9x60.dtsi"
 
 / {
-       model = "Microchip SAM9X60 CURIOSITY";
+       model = "Microchip SAM9X60 Curiosity";
        compatible = "microchip,sam9x60-curiosity", "microchip,sam9x60", "atmel,at91sam9";
 
-       ahb {
-               apb {
-                       flx0: flexcom@f801c600 {
-                               atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
-                               status = "okay";
-
-                               i2c@600 {
-                                       compatible = "microchip,sam9x60-i2c";
-                                       reg = <0x600 0x200>;
-                                       pinctrl-names = "default";
-                                       pinctrl-0 = <&pinctrl_flx0>;
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
-                                       status = "okay";
-
-                                       eeprom@53 {
-                                               compatible = "atmel,24c02";
-                                               reg = <0x53>;
-                                               pagesize = <16>;
-                                       };
-                               };
-                       };
-
-                       pinctrl {
-                                       pinctrl_flx0: flx0_default {
-                                               atmel,pins =
-                                                       <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE
-                                                        AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;
-                                       };
-
-                                       pinctrl_onewire_tm_default: onewire_tm_default {
-                                               atmel,pins =
-                                                       <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
-                                       };
-
-                                       usb1 {
-                                               pinctrl_usb_default: usb_default {
-                                                       atmel,pins = <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
-                                                                       AT91_PIOD 18 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
-                                               };
-                                       };
-                       };
-               };
-       };
-
        chosen {
                stdout-path = &dbgu;
                i2c0 = &flx0;
        };
 
+       memory {
+               reg = <0x20000000 0x8000000>;
+       };
+
        clocks {
                slow_xtal: slow_xtal {
                        clock-frequency = <32768>;
@@ -75,10 +33,6 @@
                };
        };
 
-       memory {
-               reg = <0x20000000 0x8000000>;
-       };
-
        onewire_tm: onewire {
                gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
@@ -92,11 +46,55 @@
        };
 };
 
+&flx0 {
+       atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
+       status = "okay";
+
+       i2c@600 {
+               compatible = "microchip,sam9x60-i2c";
+               reg = <0x600 0x200>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_flx0>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
+               status = "okay";
+
+               eeprom@53 {
+                       compatible = "atmel,24c02";
+                       reg = <0x53>;
+                       pagesize = <16>;
+               };
+       };
+};
+
 &macb0 {
        phy-mode = "rmii";
        status = "okay";
 };
 
+&pinctrl {
+       flexcom {
+               pinctrl_flx0: flx0_default {
+                       atmel,pins =
+                               <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+               };
+       };
+
+       pinctrl_onewire_tm_default: onewire_tm_default {
+               atmel,pins =
+                       <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
+       };
+
+       usb1 {
+               pinctrl_usb_default: usb_default {
+                       atmel,pins = <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+                                     AT91_PIOD 18 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+       };
+};
+
 &usb1 {
        num-ports = <3>;
        atmel,vbus-gpio = <0