Merge https://gitlab.denx.de/u-boot/custodians/u-boot-clk

[oweals/u-boot.git] / arch / arm / dts / at91sam9g20-taurus.dts

diff --git a/arch/arm/dts/at91sam9g20-taurus.dts b/arch/arm/dts/at91sam9g20-taurus.dts
index f27d77279f32783778e24d3c4ac4ceffec029856..c00c5a8b8dda6ba65384496bc962151aaf5fa2a1 100644 (file)
--- a/arch/arm/dts/at91sam9g20-taurus.dts
+++ b/arch/arm/dts/at91sam9g20-taurus.dts
@@ -15,9 +15,10 @@
 
 / {
        model = "Siemens taurus";
-       compatible = "atmel,at91sam9g20ek", "atmel,at91sam9g20", "atmel,at91sam9";
+       compatible = "atmel,at91sam9g20", "atmel,at91sam9";
 
        chosen {
+               u-boot,dm-pre-reloc;
                stdout-path = &dbgu;
        };
 
@@ -34,86 +35,86 @@
                        clock-frequency = <18432000>;
                };
        };
+};
 
-       ahb {
-               apb {
-                       pinctrl@fffff400 {
-                               board {
-                                       pinctrl_pck0_as_mck: pck0_as_mck {
-                                               atmel,pins =
-                                                       <AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PC1 periph B */
-                                       };
-
-                               };
-                       };
-
-                       dbgu: serial@fffff200 {
-                               status = "okay";
-                       };
-
-                       usart0: serial@fffb0000 {
-                               pinctrl-0 =
-                                       <&pinctrl_usart0
-                                        &pinctrl_usart0_rts
-                                        &pinctrl_usart0_cts
-                                        &pinctrl_usart0_dtr_dsr
-                                        &pinctrl_usart0_dcd
-                                        &pinctrl_usart0_ri>;
-                               status = "okay";
-                       };
-
-                       usart1: serial@fffb4000 {
-                               status = "okay";
-                       };
-
-                       macb0: ethernet@fffc4000 {
-                               phy-mode = "rmii";
-                               status = "okay";
-                       };
-
-                       usb1: gadget@fffa4000 {
-                               atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
-                               status = "okay";
-                       };
-
-                       ssc0: ssc@fffbc000 {
-                               status = "okay";
-                               pinctrl-0 = <&pinctrl_ssc0_tx>;
-                       };
-
-                       spi0: spi@fffc8000 {
-                               cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
-                               mtd_dataflash@0 {
-                                       compatible = "atmel,at45", "atmel,dataflash";
-                                       spi-max-frequency = <50000000>;
-                                       reg = <1>;
-                               };
-                       };
-
-                       rtc@fffffd20 {
-                               atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
-                               status = "okay";
-                       };
-
-                       watchdog@fffffd40 {
-                               status = "okay";
-                       };
-
-                       gpbr: syscon@fffffd50 {
-                               status = "okay";
-                       };
-               };
+&dbgu {
+       status = "okay";
+};
 
-               nand0: nand@40000000 {
-                       nand-bus-width = <8>;
-                       nand-ecc-mode = "soft";
-                       nand-on-flash-bbt;
-                       status = "okay";
-               };
+&gpbr {
+       status = "okay";
+};
+
+&macb0 {
+       phy-mode = "rmii";
+       status = "okay";
+};
 
-               usb0: ohci@00500000 {
-                       num-ports = <2>;
-                       status = "okay";
+&nand0 {
+       nand-bus-width = <8>;
+       nand-ecc-mode = "soft";
+       nand-on-flash-bbt;
+       status = "okay";
+};
+
+&pinctrl {
+       u-boot,dm-pre-reloc;
+       board {
+               pinctrl_pck0_as_mck: pck0_as_mck {
+                       atmel,pins =
+                       /* PC1 periph B */
+                       <AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;
                };
+
        };
 };
+
+&rtc {
+       atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
+       status = "okay";
+};
+
+&spi0 {
+       cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
+       mtd_dataflash@0 {
+               compatible = "atmel,at45", "atmel,dataflash";
+               spi-max-frequency = <50000000>;
+               reg = <1>;
+       };
+};
+
+&ssc0 {
+       status = "okay";
+       pinctrl-0 = <&pinctrl_ssc0_tx>;
+};
+
+&usart0 {
+       pinctrl-0 =
+               <&pinctrl_usart0
+                &pinctrl_usart0_rts
+                &pinctrl_usart0_cts
+                &pinctrl_usart0_dtr_dsr
+                &pinctrl_usart0_dcd
+                &pinctrl_usart0_ri>;
+       status = "okay";
+};
+
+&usart1 {
+       status = "okay";
+};
+
+&usb0 {
+       num-ports = <2>;
+       status = "okay";
+};
+
+&usb1 {
+       atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
+       status = "okay";
+};
+
+&watchdog {
+       u-boot,dm-pre-reloc;
+       timeout-sec = <15>;
+       status = "okay";
+};