[PATCH] ppc32: Update MPC834x platform to work with new phylib

MPC834x uses the gianfar network driver which now uses the new phylib.  We
need to update the platform code to create a gianfar platform MDIO bus and
pass the right intializations to the gianfar driver to make things work
again.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 22 insertions, 14 deletions

diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c
index dbf8acac507f..f43fbf9a9389 100644
--- a/arch/ppc/syslib/mpc83xx_devices.c
+++ b/arch/ppc/syslib/mpc83xx_devices.c
@@ -27,18 +27,20 @@
  * what IMMRBAR is, will get fixed up by mach_mpc83xx_fixup
  */
 
+struct gianfar_mdio_data mpc83xx_mdio_pdata = {
+        .paddr = 0x24520,
+};
+
 static struct gianfar_platform_data mpc83xx_tsec1_pdata = {
         .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
             FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
             FSL_GIANFAR_DEV_HAS_MULTI_INTR,
-        .phy_reg_addr = 0x24000,
 };
 
 static struct gianfar_platform_data mpc83xx_tsec2_pdata = {
         .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
             FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
             FSL_GIANFAR_DEV_HAS_MULTI_INTR,
-        .phy_reg_addr = 0x24000,
 };
 
 static struct fsl_i2c_platform_data mpc83xx_fsl_i2c1_pdata = {
@@ -220,6 +222,12 @@ struct platform_device ppc_sys_platform_devices[] = {
                         },
                 },
         },
+        [MPC83xx_MDIO] = {
+                .name = "fsl-gianfar_mdio",
+                .id = 0,
+                .dev.platform_data = &mpc83xx_mdio_pdata,
+                .num_resources = 0,
+        },
 };
 
 static int __init mach_mpc83xx_fixup(struct platform_device *pdev)
diff --git a/arch/ppc/syslib/mpc83xx_sys.c b/arch/ppc/syslib/mpc83xx_sys.c
index 29aa63350025..da743446789b 100644
--- a/arch/ppc/syslib/mpc83xx_sys.c
+++ b/arch/ppc/syslib/mpc83xx_sys.c
@@ -24,72 +24,72 @@ struct ppc_sys_spec ppc_sys_specs[] = {
                 .ppc_sys_name   = "8349E",
                 .mask           = 0xFFFF0000,
                 .value          = 0x80500000,
-                .num_devices    = 8,
+                .num_devices    = 9,
                 .device_list    = (enum ppc_sys_devices[])
                 {
                         MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
                         MPC83xx_IIC2, MPC83xx_DUART, MPC83xx_SEC2,
-                        MPC83xx_USB2_DR, MPC83xx_USB2_MPH
+                        MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
                 },
         },
         {
                 .ppc_sys_name   = "8349",
                 .mask           = 0xFFFF0000,
                 .value          = 0x80510000,
-                .num_devices    = 7,
+                .num_devices    = 8,
                 .device_list    = (enum ppc_sys_devices[])
                 {
                         MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
                         MPC83xx_IIC2, MPC83xx_DUART,
-                        MPC83xx_USB2_DR, MPC83xx_USB2_MPH
+                        MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
                 },
         },
         {
                 .ppc_sys_name   = "8347E",
                 .mask           = 0xFFFF0000,
                 .value          = 0x80520000,
-                .num_devices    = 8,
+                .num_devices    = 9,
                 .device_list    = (enum ppc_sys_devices[])
                 {
                         MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
                         MPC83xx_IIC2, MPC83xx_DUART, MPC83xx_SEC2,
-                        MPC83xx_USB2_DR, MPC83xx_USB2_MPH
+                        MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
                 },
         },
         {
                 .ppc_sys_name   = "8347",
                 .mask           = 0xFFFF0000,
                 .value          = 0x80530000,
-                .num_devices    = 7,
+                .num_devices    = 8,
                 .device_list    = (enum ppc_sys_devices[])
                 {
                         MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
                         MPC83xx_IIC2, MPC83xx_DUART,
-                        MPC83xx_USB2_DR, MPC83xx_USB2_MPH
+                        MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
                 },
         },
         {
                 .ppc_sys_name   = "8343E",
                 .mask           = 0xFFFF0000,
                 .value          = 0x80540000,
-                .num_devices    = 7,
+                .num_devices    = 8,
                 .device_list    = (enum ppc_sys_devices[])
                 {
                         MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
                         MPC83xx_IIC2, MPC83xx_DUART, MPC83xx_SEC2,
-                        MPC83xx_USB2_DR,
+                        MPC83xx_USB2_DR, MPC83xx_MDIO
                 },
         },
         {
                 .ppc_sys_name   = "8343",
                 .mask           = 0xFFFF0000,
                 .value          = 0x80550000,
-                .num_devices    = 6,
+                .num_devices    = 7,
                 .device_list    = (enum ppc_sys_devices[])
                 {
                         MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
                         MPC83xx_IIC2, MPC83xx_DUART,
-                        MPC83xx_USB2_DR,
+                        MPC83xx_USB2_DR, MPC83xx_MDIO
                 },
         },
         {       /* default match */