Merge branch 'linus' into x86/amd-iommu
[sfrench/cifs-2.6.git] / arch / powerpc / boot / dts / holly.dts
index b5d87895fe060977fe8f9ff6e05c4ee726bcb9ed..f87fe7b9ced946e6e5a1ac699d97af48404397cb 100644 (file)
@@ -10,6 +10,8 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
        model = "41K7339";
        compatible = "ibm,holly";
                #size-cells =<0>;
                PowerPC,750CL@0 {
                        device_type = "cpu";
-                       reg = <0>;
-                       d-cache-line-size = <20>;
-                       i-cache-line-size = <20>;
-                       d-cache-size = <8000>;
-                       i-cache-size = <8000>;
-                       d-cache-sets = <80>;
-                       i-cache-sets = <80>;
-                       timebase-frequency = <2faf080>;
-                       clock-frequency = <23c34600>;
-                       bus-frequency = <bebc200>;
+                       reg = <0x00000000>;
+                       d-cache-line-size = <32>;
+                       i-cache-line-size = <32>;
+                       d-cache-size = <32768>;
+                       i-cache-size = <32768>;
+                       d-cache-sets = <128>;
+                       i-cache-sets = <128>;
+                       timebase-frequency = <50000000>;
+                       clock-frequency = <600000000>;
+                       bus-frequency = <200000000>;
                };
        };
 
        memory@0 {
                device_type = "memory";
-               reg = <00000000 20000000>;
+               reg = <0x00000000 0x20000000>;
        };
 
        tsi109@c0000000 {
                compatible = "tsi109-bridge", "tsi108-bridge";
                #address-cells = <1>;
                #size-cells = <1>;
-               ranges = <00000000 c0000000 00010000>;
-               reg = <c0000000 00010000>;
+               ranges = <0x00000000 0xc0000000 0x00010000>;
+               reg = <0xc0000000 0x00010000>;
 
                i2c@7000 {
                        device_type = "i2c";
                        compatible  = "tsi109-i2c", "tsi108-i2c";
                        interrupt-parent = <&MPIC>;
-                       interrupts = <2>;
-                       reg = <7000 400>;
+                       interrupts = <0xe 0x2>;
+                       reg = <0x00007000 0x00000400>;
                };
 
                MDIO: mdio@6000 {
                        device_type = "mdio";
                        compatible = "tsi109-mdio", "tsi108-mdio";
-                       reg = <6000 50>;
+                       reg = <0x00006000 0x00000050>;
                        #address-cells = <1>;
                        #size-cells = <0>;
 
                        PHY1: ethernet-phy@1 {
                                compatible = "bcm5461a";
-                               reg = <1>;
+                               reg = <0x00000001>;
                                txc-rxc-delay-disable;
                        };
 
                        PHY2: ethernet-phy@2 {
                                compatible = "bcm5461a";
-                               reg = <2>;
+                               reg = <0x00000002>;
                                txc-rxc-delay-disable;
                        };
                };
                        compatible = "tsi109-ethernet", "tsi108-ethernet";
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       reg = <6000 200>;
+                       reg = <0x00006000 0x00000200>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupt-parent = <&MPIC>;
-                       interrupts = <10 2>;
+                       interrupts = <0x10 0x2>;
                        mdio-handle = <&MDIO>;
                        phy-handle = <&PHY1>;
                };
                        compatible = "tsi109-ethernet", "tsi108-ethernet";
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       reg = <6400 200>;
+                       reg = <0x00006400 0x00000200>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupt-parent = <&MPIC>;
-                       interrupts = <11 2>;
+                       interrupts = <0x11 0x2>;
                        mdio-handle = <&MDIO>;
                        phy-handle = <&PHY2>;
                };
                serial@7808 {
                        device_type = "serial";
                        compatible = "ns16550";
-                       reg = <7808 200>;
-                       virtual-reg = <c0007808>;
-                       clock-frequency = <3F9C6000>;
-                       current-speed = <1c200>;
+                       reg = <0x00007808 0x00000200>;
+                       virtual-reg = <0xc0007808>;
+                       clock-frequency = <1067212800>;
+                       current-speed = <115200>;
                        interrupt-parent = <&MPIC>;
-                       interrupts = <2>;
+                       interrupts = <0xc 0x2>;
                };
 
                serial@7c08 {
                        device_type = "serial";
                        compatible = "ns16550";
-                       reg = <7c08 200>;
-                       virtual-reg = <c0007c08>;
-                       clock-frequency = <3F9C6000>;
-                       current-speed = <1c200>;
+                       reg = <0x00007c08 0x00000200>;
+                       virtual-reg = <0xc0007c08>;
+                       clock-frequency = <1067212800>;
+                       current-speed = <115200>;
                        interrupt-parent = <&MPIC>;
-                       interrupts = <2>;
+                       interrupts = <0xd 0x2>;
                };
 
                MPIC: pic@7400 {
                        compatible = "chrp,open-pic";
                        interrupt-controller;
                        #interrupt-cells = <2>;
-                       reg = <7400 400>;
+                       reg = <0x00007400 0x00000400>;
                        big-endian;
                };
 
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
                        #address-cells = <3>;
-                       reg = <1000 1000>;
-                       bus-range = <0 0>;
+                       reg = <0x00001000 0x00001000>;
+                       bus-range = <0x0 0x0>;
                        /*----------------------------------------------------+
                        | PCI memory range.
                        | 01 denotes I/O space
                        | 02 denotes 32-bit memory space
                        +----------------------------------------------------*/
-                       ranges = <02000000 0 40000000 40000000 0 10000000
-                                 01000000 0 00000000 7e000000 0 00010000>;
-                       clock-frequency = <7f28154>;
+                       ranges = <0x02000000 0x00000000 0x40000000 0x40000000 0x00000000 0x10000000
+                                 0x01000000 0x00000000 0x00000000 0x7e000000 0x00000000 0x00010000>;
+                       clock-frequency = <133333332>;
                        interrupt-parent = <&MPIC>;
-                       interrupts = <17 2>;
-                       interrupt-map-mask = <f800 0 0 7>;
+                       interrupts = <0x17 0x2>;
+                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                        /*----------------------------------------------------+
                        | The INTA, INTB, INTC, INTD are shared.
                        +----------------------------------------------------*/
                        interrupt-map = <
-                               0800 0 0 1 &RT0 24 0
-                               0800 0 0 2 &RT0 25 0
-                               0800 0 0 3 &RT0 26 0
-                               0800 0 0 4 &RT0 27 0
-
-                               1000 0 0 1 &RT0 25 0
-                               1000 0 0 2 &RT0 26 0
-                               1000 0 0 3 &RT0 27 0
-                               1000 0 0 4 &RT0 24 0
-
-                               1800 0 0 1 &RT0 26 0
-                               1800 0 0 2 &RT0 27 0
-                               1800 0 0 3 &RT0 24 0
-                               1800 0 0 4 &RT0 25 0
-
-                               2000 0 0 1 &RT0 27 0
-                               2000 0 0 2 &RT0 24 0
-                               2000 0 0 3 &RT0 25 0
-                               2000 0 0 4 &RT0 26 0
+                               0x800 0x0 0x0 0x1 &RT0 0x24 0x0
+                               0x800 0x0 0x0 0x2 &RT0 0x25 0x0
+                               0x800 0x0 0x0 0x3 &RT0 0x26 0x0
+                               0x800 0x0 0x0 0x4 &RT0 0x27 0x0
+
+                               0x1000 0x0 0x0 0x1 &RT0 0x25 0x0
+                               0x1000 0x0 0x0 0x2 &RT0 0x26 0x0
+                               0x1000 0x0 0x0 0x3 &RT0 0x27 0x0
+                               0x1000 0x0 0x0 0x4 &RT0 0x24 0x0
+
+                               0x1800 0x0 0x0 0x1 &RT0 0x26 0x0
+                               0x1800 0x0 0x0 0x2 &RT0 0x27 0x0
+                               0x1800 0x0 0x0 0x3 &RT0 0x24 0x0
+                               0x1800 0x0 0x0 0x4 &RT0 0x25 0x0
+
+                               0x2000 0x0 0x0 0x1 &RT0 0x27 0x0
+                               0x2000 0x0 0x0 0x2 &RT0 0x24 0x0
+                               0x2000 0x0 0x0 0x3 &RT0 0x25 0x0
+                               0x2000 0x0 0x0 0x4 &RT0 0x26 0x0
                                >;
 
                        RT0: router@1180 {
                                clock-frequency = <0>;
                                #address-cells = <0>;
                                #interrupt-cells = <2>;
-                               interrupts = <17 2>;
+                               interrupts = <0x17 0x2>;
                                interrupt-parent = <&MPIC>;
                        };
                };