git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
mpc83xx_devices.c
diff --git
a/arch/ppc/syslib/mpc83xx_devices.c
b/arch/ppc/syslib/mpc83xx_devices.c
index
75c8e98
..
1af2c00
100644
(file)
--- a/
arch/ppc/syslib/mpc83xx_devices.c
+++ b/
arch/ppc/syslib/mpc83xx_devices.c
@@
-1,9
+1,7
@@
/*
/*
- * arch/ppc/platforms/83xx/mpc83xx_devices.c
- *
* MPC83xx Device descriptions
*
* MPC83xx Device descriptions
*
- * Maintainer: Kumar Gala <
kumar.gala@freescale.com
>
+ * Maintainer: Kumar Gala <
galak@kernel.crashing.org
>
*
* Copyright 2005 Freescale Semiconductor Inc.
*
*
* Copyright 2005 Freescale Semiconductor Inc.
*
@@
-21,23
+19,25
@@
#include <asm/mpc83xx.h>
#include <asm/irq.h>
#include <asm/ppc_sys.h>
#include <asm/mpc83xx.h>
#include <asm/irq.h>
#include <asm/ppc_sys.h>
+#include <asm/machdep.h>
/* We use offsets for IORESOURCE_MEM since we do not know at compile time
* what IMMRBAR is, will get fixed up by mach_mpc83xx_fixup
*/
/* We use offsets for IORESOURCE_MEM since we do not know at compile time
* what IMMRBAR is, will get fixed up by mach_mpc83xx_fixup
*/
+struct gianfar_mdio_data mpc83xx_mdio_pdata = {
+};
+
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,
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,
};
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 = {
};
static struct fsl_i2c_platform_data mpc83xx_fsl_i2c1_pdata = {
@@
-165,7
+165,7
@@
struct platform_device ppc_sys_platform_devices[] = {
},
[MPC83xx_DUART] = {
.name = "serial8250",
},
[MPC83xx_DUART] = {
.name = "serial8250",
- .id =
0
,
+ .id =
PLAT8250_DEV_PLATFORM
,
.dev.platform_data = serial_platform_data,
},
[MPC83xx_SEC2] = {
.dev.platform_data = serial_platform_data,
},
[MPC83xx_SEC2] = {
@@
-191,8
+191,8
@@
struct platform_device ppc_sys_platform_devices[] = {
.num_resources = 2,
.resource = (struct resource[]) {
{
.num_resources = 2,
.resource = (struct resource[]) {
{
- .start = 0x2
2
000,
- .end = 0x2
2
fff,
+ .start = 0x2
3
000,
+ .end = 0x2
3
fff,
.flags = IORESOURCE_MEM,
},
{
.flags = IORESOURCE_MEM,
},
{
@@
-208,8
+208,8
@@
struct platform_device ppc_sys_platform_devices[] = {
.num_resources = 2,
.resource = (struct resource[]) {
{
.num_resources = 2,
.resource = (struct resource[]) {
{
- .start = 0x2
3
000,
- .end = 0x2
3
fff,
+ .start = 0x2
2
000,
+ .end = 0x2
2
fff,
.flags = IORESOURCE_MEM,
},
{
.flags = IORESOURCE_MEM,
},
{
@@
-219,6
+219,19
@@
struct platform_device ppc_sys_platform_devices[] = {
},
},
},
},
},
},
+ [MPC83xx_MDIO] = {
+ .name = "fsl-gianfar_mdio",
+ .id = 0,
+ .dev.platform_data = &mpc83xx_mdio_pdata,
+ .num_resources = 1,
+ .resource = (struct resource[]) {
+ {
+ .start = 0x24520,
+ .end = 0x2453f,
+ .flags = IORESOURCE_MEM,
+ },
+ },
+ },
};
static int __init mach_mpc83xx_fixup(struct platform_device *pdev)
};
static int __init mach_mpc83xx_fixup(struct platform_device *pdev)