Merge git://git.denx.de/u-boot-usb

[u-boot] / arch / arm / dts / ast2500-u-boot.dtsi

diff --git a/arch/arm/dts/ast2500-u-boot.dtsi b/arch/arm/dts/ast2500-u-boot.dtsi
index faeeec1be4d2539143576af80275616df51c8e58..7f80bad7d050dc42a42d341366deff33971b9733 100644 (file)
--- a/arch/arm/dts/ast2500-u-boot.dtsi
+++ b/arch/arm/dts/ast2500-u-boot.dtsi
@@ -34,30 +34,39 @@
 
                apb {
                        u-boot,dm-pre-reloc;
+               };
 
-                       timer: timer@1e782000 {
-                               u-boot,dm-pre-reloc;
-                       };
+       };
+};
 
-                       uart1: serial@1e783000 {
-                               clocks = <&scu PCLK_UART1>;
-                       };
+&uart1 {
+       clocks = <&scu PCLK_UART1>;
+};
 
-                       uart2: serial@1e78d000 {
-                               clocks = <&scu PCLK_UART2>;
-                       };
+&uart2 {
+       clocks = <&scu PCLK_UART2>;
+};
 
-                       uart3: serial@1e78e000 {
-                               clocks = <&scu PCLK_UART3>;
-                       };
+&uart3 {
+       clocks = <&scu PCLK_UART3>;
+};
 
-                       uart4: serial@1e78f000 {
-                               clocks = <&scu PCLK_UART4>;
-                       };
+&uart4 {
+       clocks = <&scu PCLK_UART4>;
+};
 
-                       uart5: serial@1e784000 {
-                               clocks = <&scu PCLK_UART5>;
-                       };
-               };
-       };
+&uart5 {
+       clocks = <&scu PCLK_UART5>;
+};
+
+&timer {
+       u-boot,dm-pre-reloc;
+};
+
+&mac0 {
+       clocks = <&scu PCLK_MAC1>, <&scu PLL_D2PLL>;
+};
+
+&mac1 {
+       clocks = <&scu PCLK_MAC2>, <&scu PLL_D2PLL>;
 };