interrupt-affinity = <&cpu0>, <&cpu1>;
        };
 
-       mpcore {
+       mpcore@19000000 {
                compatible = "simple-bus";
                ranges = <0x00000000 0x19000000 0x00023000>;
                #address-cells = <1>;
                              <0x20100 0x100>;
                };
 
-               L2: l2-cache {
+               L2: l2-cache@22000 {
                        compatible = "arm,pl310-cache";
                        reg = <0x22000 0x1000>;
                        cache-unified;
                };
        };
 
-       axi {
+       axi@18000000 {
                compatible = "simple-bus";
                ranges = <0x00000000 0x18000000 0x0011c40c>;
                #address-cells = <1>;
                                          "imp_sleep_timer_p5",
                                          "imp_sleep_timer_p7",
                                          "imp_sleep_timer_p8";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
                        status = "disabled";
 
                        /* ports are defined in board DTS */
 
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x80000000>;
        };
 
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x80000000>;
        };
 
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x40000000>;
        };
 
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x80000000>;
        };
 
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x80000000>;
        };
 
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x20000000>;
        };
 
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x80000000>;
        };
 
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x80000000>;
        };