Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / arch / powerpc / boot / dts / prpmc2800.dts

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index b96b400dc3bd6d7175ab7122016311417f1f3ec4..1ee6ff43dd57e772e543297a7b22b5809e7f6f48 100644 (file)
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -27,7 +27,7 @@
                PowerPC,7447 {
                        device_type = "cpu";
                        reg = <0>;
-                       clock-frequency = <733000000>;  /* Default */
+                       clock-frequency = <733333333>;  /* Default */
                        bus-frequency = <133333333>;
                        timebase-frequency = <33333333>;
                        i-cache-line-size = <32>;
@@ -42,11 +42,11 @@
                reg = <0x0 0x20000000>;                 /* Default (512MB) */
        };
 
-       mv64x60@f1000000 { /* Marvell Discovery */
+       system-controller@f1000000 { /* Marvell Discovery mv64360 */
                #address-cells = <1>;
                #size-cells = <1>;
                model = "mv64360";                      /* Default */
-               compatible = "marvell,mv64x60";
+               compatible = "marvell,mv64360";
                clock-frequency = <133333333>;
                reg = <0xf1000000 0x10000>;
                virtual-reg = <0xf1000000>;
@@ -74,7 +74,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        device_type = "mdio";
-                       compatible = "marvell,mv64x60-mdio";
+                       compatible = "marvell,mv64360-mdio";
                        PHY0: ethernet-phy@1 {
                                device_type = "ethernet-phy";
                                compatible = "broadcom,bcm5421";
@@ -91,21 +91,24 @@
                        };
                };
 
-               ethernet@2000 {
+               ethernet-group@2000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "marvell,mv64360-eth-group";
                        reg = <0x2000 0x2000>;
-                       eth0 {
+                       ethernet@0 {
                                device_type = "network";
-                               compatible = "marvell,mv64x60-eth";
-                               block-index = <0>;
+                               compatible = "marvell,mv64360-eth";
+                               reg = <0>;
                                interrupts = <32>;
                                interrupt-parent = <&PIC>;
                                phy = <&PHY0>;
                                local-mac-address = [ 00 00 00 00 00 00 ];
                        };
-                       eth1 {
+                       ethernet@1 {
                                device_type = "network";
-                               compatible = "marvell,mv64x60-eth";
-                               block-index = <1>;
+                               compatible = "marvell,mv64360-eth";
+                               reg = <1>;
                                interrupts = <33>;
                                interrupt-parent = <&PIC>;
                                phy = <&PHY1>;
@@ -114,41 +117,35 @@
                };
 
                SDMA0: sdma@4000 {
-                       device_type = "dma";
-                       compatible = "marvell,mv64x60-sdma";
+                       compatible = "marvell,mv64360-sdma";
                        reg = <0x4000 0xc18>;
                        virtual-reg = <0xf1004000>;
-                       interrupt-base = <0>;
                        interrupts = <36>;
                        interrupt-parent = <&PIC>;
                };
 
                SDMA1: sdma@6000 {
-                       device_type = "dma";
-                       compatible = "marvell,mv64x60-sdma";
+                       compatible = "marvell,mv64360-sdma";
                        reg = <0x6000 0xc18>;
                        virtual-reg = <0xf1006000>;
-                       interrupt-base = <0>;
                        interrupts = <38>;
                        interrupt-parent = <&PIC>;
                };
 
                BRG0: brg@b200 {
-                       compatible = "marvell,mv64x60-brg";
+                       compatible = "marvell,mv64360-brg";
                        reg = <0xb200 0x8>;
                        clock-src = <8>;
-                       clock-frequency = <133000000>;
+                       clock-frequency = <133333333>;
                        current-speed = <9600>;
-                       bcr = <0>;
                };
 
                BRG1: brg@b208 {
-                       compatible = "marvell,mv64x60-brg";
+                       compatible = "marvell,mv64360-brg";
                        reg = <0xb208 0x8>;
                        clock-src = <8>;
-                       clock-frequency = <133000000>;
+                       clock-frequency = <133333333>;
                        current-speed = <9600>;
-                       bcr = <0>;
                };
 
                CUNIT: cunit@f200 {
@@ -166,7 +163,7 @@
 
                MPSC0: mpsc@8000 {
                        device_type = "serial";
-                       compatible = "marvell,mpsc";
+                       compatible = "marvell,mv64360-mpsc";
                        reg = <0x8000 0x38>;
                        virtual-reg = <0xf1008000>;
                        sdma = <&SDMA0>;
@@ -174,19 +171,14 @@
                        cunit = <&CUNIT>;
                        mpscrouting = <&MPSCROUTING>;
                        mpscintr = <&MPSCINTR>;
-                       block-index = <0>;
-                       max_idle = <40>;
-                       chr_1 = <0>;
-                       chr_2 = <0>;
-                       chr_10 = <3>;
-                       mpcr = <0>;
+                       cell-index = <0>;
                        interrupts = <40>;
                        interrupt-parent = <&PIC>;
                };
 
                MPSC1: mpsc@9000 {
                        device_type = "serial";
-                       compatible = "marvell,mpsc";
+                       compatible = "marvell,mv64360-mpsc";
                        reg = <0x9000 0x38>;
                        virtual-reg = <0xf1009000>;
                        sdma = <&SDMA1>;
@@ -194,31 +186,21 @@
                        cunit = <&CUNIT>;
                        mpscrouting = <&MPSCROUTING>;
                        mpscintr = <&MPSCINTR>;
-                       block-index = <1>;
-                       max_idle = <40>;
-                       chr_1 = <0>;
-                       chr_2 = <0>;
-                       chr_10 = <3>;
-                       mpcr = <0>;
+                       cell-index = <1>;
                        interrupts = <42>;
                        interrupt-parent = <&PIC>;
                };
 
                wdt@b410 {                      /* watchdog timer */
-                       compatible = "marvell,mv64x60-wdt";
+                       compatible = "marvell,mv64360-wdt";
                        reg = <0xb410 0x8>;
-                       timeout = <10>;         /* wdt timeout in seconds */
                };
 
                i2c@c000 {
                        device_type = "i2c";
-                       compatible = "marvell,mv64x60-i2c";
+                       compatible = "marvell,mv64360-i2c";
                        reg = <0xc000 0x20>;
                        virtual-reg = <0xf100c000>;
-                       freq_m = <8>;
-                       freq_n = <3>;
-                       timeout = <1000>;               /* 1000 = 1 second */
-                       retries = <1>;
                        interrupts = <37>;
                        interrupt-parent = <&PIC>;
                };
@@ -226,18 +208,18 @@
                PIC: pic {
                        #interrupt-cells = <1>;
                        #address-cells = <0>;
-                       compatible = "marvell,mv64x60-pic";
+                       compatible = "marvell,mv64360-pic";
                        reg = <0x0 0x88>;
                        interrupt-controller;
                };
 
                mpp@f000 {
-                       compatible = "marvell,mv64x60-mpp";
+                       compatible = "marvell,mv64360-mpp";
                        reg = <0xf000 0x10>;
                };
 
                gpp@f100 {
-                       compatible = "marvell,mv64x60-gpp";
+                       compatible = "marvell,mv64360-gpp";
                        reg = <0xf100 0x20>;
                };
 
@@ -246,7 +228,7 @@
                        #size-cells = <2>;
                        #interrupt-cells = <1>;
                        device_type = "pci";
-                       compatible = "marvell,mv64x60-pci";
+                       compatible = "marvell,mv64360-pci";
                        reg = <0xcf8 0x8>;
                        ranges = <0x01000000 0x0        0x0
                                        0x88000000 0x0 0x01000000
@@ -285,28 +267,28 @@
                };
 
                cpu-error@0070 {
-                       compatible = "marvell,mv64x60-cpu-error";
+                       compatible = "marvell,mv64360-cpu-error";
                        reg = <0x70 0x10 0x128 0x28>;
                        interrupts = <3>;
                        interrupt-parent = <&PIC>;
                };
 
                sram-ctrl@0380 {
-                       compatible = "marvell,mv64x60-sram-ctrl";
+                       compatible = "marvell,mv64360-sram-ctrl";
                        reg = <0x380 0x80>;
                        interrupts = <13>;
                        interrupt-parent = <&PIC>;
                };
 
                pci-error@1d40 {
-                       compatible = "marvell,mv64x60-pci-error";
+                       compatible = "marvell,mv64360-pci-error";
                        reg = <0x1d40 0x40 0xc28 0x4>;
                        interrupts = <12>;
                        interrupt-parent = <&PIC>;
                };
 
                mem-ctrl@1400 {
-                       compatible = "marvell,mv64x60-mem-ctrl";
+                       compatible = "marvell,mv64360-mem-ctrl";
                        reg = <0x1400 0x60>;
                        interrupts = <17>;
                        interrupt-parent = <&PIC>;