summaryrefslogtreecommitdiffstats
path: root/arch/ppc/syslib/mpc85xx_devices.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-01-17 16:29:06 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 16:29:06 +0100
commitea9b395fe20ac74be788f415af2622ac8f0c35c7 (patch)
treed1653e1a4cbe360aa7132ea4e29ab92a02038224 /arch/ppc/syslib/mpc85xx_devices.c
parentMerge branch 'upstream' (diff)
parent[PATCH] libata: add a function to decide if we need iordy (diff)
downloadlinux-ea9b395fe20ac74be788f415af2622ac8f0c35c7.tar.xz
linux-ea9b395fe20ac74be788f415af2622ac8f0c35c7.zip
Merge branch 'upstream'
Diffstat (limited to 'arch/ppc/syslib/mpc85xx_devices.c')
-rw-r--r--arch/ppc/syslib/mpc85xx_devices.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/ppc/syslib/mpc85xx_devices.c b/arch/ppc/syslib/mpc85xx_devices.c
index 69949d255658..00e9b6ff2f6e 100644
--- a/arch/ppc/syslib/mpc85xx_devices.c
+++ b/arch/ppc/syslib/mpc85xx_devices.c
@@ -26,7 +26,6 @@
* what CCSRBAR is, will get fixed up by mach_mpc85xx_fixup
*/
struct gianfar_mdio_data mpc85xx_mdio_pdata = {
- .paddr = MPC85xx_MIIM_OFFSET,
};
static struct gianfar_platform_data mpc85xx_tsec1_pdata = {
@@ -720,7 +719,14 @@ struct platform_device ppc_sys_platform_devices[] = {
.name = "fsl-gianfar_mdio",
.id = 0,
.dev.platform_data = &mpc85xx_mdio_pdata,
- .num_resources = 0,
+ .num_resources = 1,
+ .resource = (struct resource[]) {
+ {
+ .start = 0x24520,
+ .end = 0x2453f,
+ .flags = IORESOURCE_MEM,
+ },
+ },
},
};