diff --git a/arch/arm/boot/dts/spear600-evb.dts b/arch/arm/boot/dts/spear600-evb.dts
index d865a891776d..375eb61f792a 100644
--- a/arch/arm/boot/dts/spear600-evb.dts
+++ b/arch/arm/boot/dts/spear600-evb.dts
@@ -22,95 +22,91 @@ memory {
 		device_type = "memory";
 		reg = <0 0x10000000>;
 	};
+};
 
-	ahb {
-		clcd@fc200000 {
-			status = "okay";
+&clcd {
+	status = "okay";
+};
+
+&dmac {
+	status = "okay";
+};
+
+&ehci_usb0 {
+	status = "okay";
+};
+
+&ehci_usb1 {
+	status = "okay";
+};
+
+&gmac {
+	phy-mode = "gmii";
+	status = "okay";
+};
+
+&ohci_usb0 {
+	status = "okay";
+};
+
+&ohci_usb1 {
+	status = "okay";
+};
+
+&smi {
+	status = "okay";
+	clock-rate=<50000000>;
+
+	flash@f8000000 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		reg = <0xf8000000 0x800000>;
+		st,smi-fast-mode;
+
+		partition@0 {
+			label = "xloader";
+			reg = <0x0 0x10000>;
 		};
-
-		dma@fc400000 {
-			status = "okay";
+		partition@10000 {
+			label = "u-boot";
+			reg = <0x10000 0x50000>;
 		};
-
-		ehci@e1800000 {
-			status = "okay";
+		partition@60000 {
+			label = "environment";
+			reg = <0x60000 0x10000>;
 		};
-
-		ehci@e2000000 {
-			status = "okay";
+		partition@70000 {
+			label = "dtb";
+			reg = <0x70000 0x10000>;
 		};
-
-		gmac: ethernet@e0800000 {
-			phy-mode = "gmii";
-			status = "okay";
+		partition@80000 {
+			label = "linux";
+			reg = <0x80000 0x310000>;
 		};
-
-		ohci@e1900000 {
-			status = "okay";
-		};
-
-		ohci@e2100000 {
-			status = "okay";
-		};
-
-		smi: flash@fc000000 {
-			status = "okay";
-			clock-rate=<50000000>;
-
-			flash@f8000000 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				reg = <0xf8000000 0x800000>;
-				st,smi-fast-mode;
-
-				partition@0 {
-					label = "xloader";
-					reg = <0x0 0x10000>;
-				};
-				partition@10000 {
-					label = "u-boot";
-					reg = <0x10000 0x50000>;
-				};
-				partition@60000 {
-					label = "environment";
-					reg = <0x60000 0x10000>;
-				};
-				partition@70000 {
-					label = "dtb";
-					reg = <0x70000 0x10000>;
-				};
-				partition@80000 {
-					label = "linux";
-					reg = <0x80000 0x310000>;
-				};
-				partition@390000 {
-					label = "rootfs";
-					reg = <0x390000 0x0>;
-				};
-			};
-		};
-
-		apb {
-			serial@d0000000 {
-				status = "okay";
-				pinctrl-names = "default";
-				pinctrl-0 = <>;
-			};
-
-			serial@d0080000 {
-				status = "okay";
-				pinctrl-names = "default";
-				pinctrl-0 = <>;
-			};
-
-			rtc@fc900000 {
-			       status = "okay";
-			};
-
-			i2c@d0200000 {
-				clock-frequency = <400000>;
-				status = "okay";
-			};
+		partition@390000 {
+			label = "rootfs";
+			reg = <0x390000 0x0>;
 		};
 	};
 };
+
+&uart0 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <>;
+};
+
+&uart1 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <>;
+};
+
+&rtc {
+	status = "okay";
+};
+
+&i2c {
+	clock-frequency = <400000>;
+	status = "okay";
+};