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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
mpc8xx_devices.c
diff --git
a/arch/ppc/syslib/mpc8xx_devices.c
b/arch/ppc/syslib/mpc8xx_devices.c
index
92dc98b
..
31fb565
100644
(file)
--- a/
arch/ppc/syslib/mpc8xx_devices.c
+++ b/
arch/ppc/syslib/mpc8xx_devices.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/syslib/mpc8xx_devices.c
- *
* MPC8xx Device descriptions
*
* Maintainer: Kumar Gala <galak@kernel.crashing.org>
* MPC8xx Device descriptions
*
* Maintainer: Kumar Gala <galak@kernel.crashing.org>
@@
-80,7
+78,7
@@
struct platform_device ppc_sys_platform_devices[] = {
{
.name = "pram",
.start = 0x3c00,
{
.name = "pram",
.start = 0x3c00,
- .end = 0x3c
80
,
+ .end = 0x3c
7f
,
.flags = IORESOURCE_MEM,
},
{
.flags = IORESOURCE_MEM,
},
{
@@
-105,7
+103,7
@@
struct platform_device ppc_sys_platform_devices[] = {
{
.name = "pram",
.start = 0x3d00,
{
.name = "pram",
.start = 0x3d00,
- .end = 0x3d
80
,
+ .end = 0x3d
7f
,
.flags = IORESOURCE_MEM,
},
.flags = IORESOURCE_MEM,
},
@@
-131,7
+129,7
@@
struct platform_device ppc_sys_platform_devices[] = {
{
.name = "pram",
.start = 0x3e00,
{
.name = "pram",
.start = 0x3e00,
- .end = 0x3e
80
,
+ .end = 0x3e
7f
,
.flags = IORESOURCE_MEM,
},
.flags = IORESOURCE_MEM,
},
@@
-157,7
+155,7
@@
struct platform_device ppc_sys_platform_devices[] = {
{
.name = "pram",
.start = 0x3f00,
{
.name = "pram",
.start = 0x3f00,
- .end = 0x3f
80
,
+ .end = 0x3f
7f
,
.flags = IORESOURCE_MEM,
},
.flags = IORESOURCE_MEM,
},
@@
-172,12
+170,18
@@
struct platform_device ppc_sys_platform_devices[] = {
[MPC8xx_CPM_SMC1] = {
.name = "fsl-cpm-smc",
.id = 1,
[MPC8xx_CPM_SMC1] = {
.name = "fsl-cpm-smc",
.id = 1,
- .num_resources =
2
,
+ .num_resources =
3
,
.resource = (struct resource[]) {
{
.name = "regs",
.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,
},
{
.flags = IORESOURCE_MEM,
},
{
@@
-191,14
+195,21
@@
struct platform_device ppc_sys_platform_devices[] = {
[MPC8xx_CPM_SMC2] = {
.name = "fsl-cpm-smc",
.id = 2,
[MPC8xx_CPM_SMC2] = {
.name = "fsl-cpm-smc",
.id = 2,
- .num_resources =
2
,
+ .num_resources =
3
,
.resource = (struct resource[]) {
{
.name = "regs",
.resource = (struct resource[]) {
{
.name = "regs",
- .start = 0xa9
2
,
- .end = 0xa
a1
,
+ .start = 0xa9
0
,
+ .end = 0xa
9f
,
.flags = IORESOURCE_MEM,
},
.flags = IORESOURCE_MEM,
},
+ {
+ .name = "pram",
+ .start = 0x3f80,
+ .end = 0x3fbf,
+ .flags = IORESOURCE_MEM,
+
+ },
{
.name = "interrupt",
.start = MPC8xx_INT_SMC2,
{
.name = "interrupt",
.start = MPC8xx_INT_SMC2,
@@
-207,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)
};
static int __init mach_mpc8xx_fixup(struct platform_device *pdev)