Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...

[pandora-kernel.git] / arch / ppc / syslib / mpc8xx_devices.c

diff --git a/arch/ppc/syslib/mpc8xx_devices.c b/arch/ppc/syslib/mpc8xx_devices.c
index bd41ed8..cf5ab47 100644 (file)
--- a/arch/ppc/syslib/mpc8xx_devices.c
+++ b/arch/ppc/syslib/mpc8xx_devices.c
@@ -170,12 +170,18 @@ struct platform_device ppc_sys_platform_devices[] = {
        [MPC8xx_CPM_SMC1] = {
                .name = "fsl-cpm-smc",
                .id     = 1,
-               .num_resources  = 2,
+               .num_resources  = 3,
                .resource = (struct resource[]) {
                        {
                                .name   = "regs",
-                               .start  = 0xa82,
-                               .end    = 0xa91,
+                               .start  = 0xa80,
+                               .end    = 0xa8f,
+                               .flags  = IORESOURCE_MEM,
+                       },
+                       {
+                               .name   = "pram",
+                               .start  = 0x3e80,
+                               .end    = 0x3ebf,
                                .flags  = IORESOURCE_MEM,
                        },
                        {
@@ -189,14 +195,21 @@ struct platform_device ppc_sys_platform_devices[] = {
        [MPC8xx_CPM_SMC2] = {
                .name = "fsl-cpm-smc",
                .id     = 2,
-               .num_resources  = 2,
+               .num_resources  = 3,
                .resource = (struct resource[]) {
                        {
                                .name   = "regs",
-                               .start  = 0xa92,
-                               .end    = 0xaa1,
+                               .start  = 0xa90,
+                               .end    = 0xa9f,
                                .flags  = IORESOURCE_MEM,
                        },
+                       {
+                               .name   = "pram",
+                               .start  = 0x3f80,
+                               .end    = 0x3fbf,
+                               .flags  = IORESOURCE_MEM,
+
+                       },
                        {
                                .name   = "interrupt",
                                .start  = MPC8xx_INT_SMC2,
@@ -205,6 +218,14 @@ struct platform_device ppc_sys_platform_devices[] = {
                        },
                },
        },
+
+        [MPC8xx_MDIO_FEC] = {
+                .name = "fsl-cpm-fec-mdio",
+                .id = 0,
+                .num_resources = 0,
+
+        },
+
 };
 
 static int __init mach_mpc8xx_fixup(struct platform_device *pdev)