2 files changed, 12 insertions, 12 deletions
diff --git a/arch/ppc/syslib/pq2_devices.c b/arch/ppc/syslib/pq2_devices.c
index 0636aed7b827..8692d00c08c4 100644
--- a/arch/ppc/syslib/pq2_devices.c
+++ b/arch/ppc/syslib/pq2_devices.c
@@ -121,13 +121,13 @@ struct platform_device ppc_sys_platform_devices[] = {
                .num_resources   = 3,
                .resource = (struct resource[]) {
                        {
-                                .name   = "scc_mem",
+                                .name   = "regs",
                                .start  = 0x11A00,
                                .end    = 0x11A1F,
                                .flags  = IORESOURCE_MEM,
                        },
                        {
-                                .name   = "scc_pram",
+                                .name   = "pram",
                                .start  = 0x8000,
                                .end    = 0x80ff,
                                .flags  = IORESOURCE_MEM,
@@ -145,13 +145,13 @@ struct platform_device ppc_sys_platform_devices[] = {
                .num_resources   = 3,
                .resource = (struct resource[]) {
                        {
-                                .name   = "scc_mem",
+                                .name   = "regs",
                                .start  = 0x11A20,
                                .end    = 0x11A3F,
                                .flags  = IORESOURCE_MEM,
                        },
                        {
-                                .name   = "scc_pram",
+                                .name   = "pram",
                                .start  = 0x8100,
                                .end    = 0x81ff,
                                .flags  = IORESOURCE_MEM,
@@ -169,13 +169,13 @@ struct platform_device ppc_sys_platform_devices[] = {
                .num_resources   = 3,
                .resource = (struct resource[]) {
                        {
-                                .name   = "scc_mem",
+                                .name   = "regs",
                                .start  = 0x11A40,
                                .end    = 0x11A5F,
                                .flags  = IORESOURCE_MEM,
                        },
                        {
-                                .name   = "scc_pram",
+                                .name   = "pram",
                                .start  = 0x8200,
                                .end    = 0x82ff,
                                .flags  = IORESOURCE_MEM,
@@ -193,13 +193,13 @@ struct platform_device ppc_sys_platform_devices[] = {
                .num_resources   = 3,
                .resource = (struct resource[]) {
                        {
-                                .name   = "scc_mem",
+                                .name   = "regs",
                                .start  = 0x11A60,
                                .end    = 0x11A7F,
                                .flags  = IORESOURCE_MEM,
                        },
                        {
-                                .name   = "scc_pram",
+                                .name   = "pram",
                                .start  = 0x8300,
                                .end    = 0x83ff,
                                .flags  = IORESOURCE_MEM,
diff --git a/arch/ppc/syslib/pq2_sys.c b/arch/ppc/syslib/pq2_sys.c
index 433b0fa203e1..fee8948162b9 100644
--- a/arch/ppc/syslib/pq2_sys.c
+++ b/arch/ppc/syslib/pq2_sys.c
@@ -139,13 +139,13 @@ struct ppc_sys_spec ppc_sys_specs[] = {
                .ppc_sys_name   = "8272",
                .mask           = 0x0000ff00,
                .value          = 0x00000c00,
-                .num_devices    = 11,
+                .num_devices    = 12,
                .device_list = (enum ppc_sys_devices[])
                {
                        MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,
-                        MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SMC1,
+                        MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SCC4,
-                        MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
+                        MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,
-                        MPC82xx_CPM_USB, MPC82xx_SEC1,
+                        MPC82xx_CPM_I2C, MPC82xx_CPM_USB, MPC82xx_SEC1,
                },
        },
        /* below is a list of the 8280 family of processors */

diff --git a/arch/ppc/syslib/pq2_devices.c b/arch/ppc/syslib/pq2_devices.c index 0636aed7b827..8692d00c08c4 100644 --- a/arch/ppc/syslib/pq2_devices.c +++ b/arch/ppc/syslib/pq2_devices.c
@@ -121,13 +121,13 @@ struct platform_device ppc_sys_platform_devices[] = {
121	.num_resources = 3,	121	.num_resources = 3,
122	.resource = (struct resource[]) {	122	.resource = (struct resource[]) {
123	{	123	{
124	.name = "scc_mem",	124	.name = "regs",
125	.start = 0x11A00,	125	.start = 0x11A00,
126	.end = 0x11A1F,	126	.end = 0x11A1F,
127	.flags = IORESOURCE_MEM,	127	.flags = IORESOURCE_MEM,
128	},	128	},
129	{	129	{
130	.name = "scc_pram",	130	.name = "pram",
131	.start = 0x8000,	131	.start = 0x8000,
132	.end = 0x80ff,	132	.end = 0x80ff,
133	.flags = IORESOURCE_MEM,	133	.flags = IORESOURCE_MEM,
@@ -145,13 +145,13 @@ struct platform_device ppc_sys_platform_devices[] = {
145	.num_resources = 3,	145	.num_resources = 3,
146	.resource = (struct resource[]) {	146	.resource = (struct resource[]) {
147	{	147	{
148	.name = "scc_mem",	148	.name = "regs",
149	.start = 0x11A20,	149	.start = 0x11A20,
150	.end = 0x11A3F,	150	.end = 0x11A3F,
151	.flags = IORESOURCE_MEM,	151	.flags = IORESOURCE_MEM,
152	},	152	},
153	{	153	{
154	.name = "scc_pram",	154	.name = "pram",
155	.start = 0x8100,	155	.start = 0x8100,
156	.end = 0x81ff,	156	.end = 0x81ff,
157	.flags = IORESOURCE_MEM,	157	.flags = IORESOURCE_MEM,
@@ -169,13 +169,13 @@ struct platform_device ppc_sys_platform_devices[] = {
169	.num_resources = 3,	169	.num_resources = 3,
170	.resource = (struct resource[]) {	170	.resource = (struct resource[]) {
171	{	171	{
172	.name = "scc_mem",	172	.name = "regs",
173	.start = 0x11A40,	173	.start = 0x11A40,
174	.end = 0x11A5F,	174	.end = 0x11A5F,
175	.flags = IORESOURCE_MEM,	175	.flags = IORESOURCE_MEM,
176	},	176	},
177	{	177	{
178	.name = "scc_pram",	178	.name = "pram",
179	.start = 0x8200,	179	.start = 0x8200,
180	.end = 0x82ff,	180	.end = 0x82ff,
181	.flags = IORESOURCE_MEM,	181	.flags = IORESOURCE_MEM,
@@ -193,13 +193,13 @@ struct platform_device ppc_sys_platform_devices[] = {
193	.num_resources = 3,	193	.num_resources = 3,
194	.resource = (struct resource[]) {	194	.resource = (struct resource[]) {
195	{	195	{
196	.name = "scc_mem",	196	.name = "regs",
197	.start = 0x11A60,	197	.start = 0x11A60,
198	.end = 0x11A7F,	198	.end = 0x11A7F,
199	.flags = IORESOURCE_MEM,	199	.flags = IORESOURCE_MEM,
200	},	200	},
201	{	201	{
202	.name = "scc_pram",	202	.name = "pram",
203	.start = 0x8300,	203	.start = 0x8300,
204	.end = 0x83ff,	204	.end = 0x83ff,
205	.flags = IORESOURCE_MEM,	205	.flags = IORESOURCE_MEM,


diff --git a/arch/ppc/syslib/pq2_sys.c b/arch/ppc/syslib/pq2_sys.c index 433b0fa203e1..fee8948162b9 100644 --- a/arch/ppc/syslib/pq2_sys.c +++ b/arch/ppc/syslib/pq2_sys.c
@@ -139,13 +139,13 @@ struct ppc_sys_spec ppc_sys_specs[] = {
139	.ppc_sys_name = "8272",	139	.ppc_sys_name = "8272",
140	.mask = 0x0000ff00,	140	.mask = 0x0000ff00,
141	.value = 0x00000c00,	141	.value = 0x00000c00,
142	.num_devices = 11,	142	.num_devices = 12,
143	.device_list = (enum ppc_sys_devices[])	143	.device_list = (enum ppc_sys_devices[])
144	{	144	{
145	MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,	145	MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,
146	MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SMC1,	146	MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SCC4,
147	MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,	147	MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,
148	MPC82xx_CPM_USB, MPC82xx_SEC1,	148	MPC82xx_CPM_I2C, MPC82xx_CPM_USB, MPC82xx_SEC1,
149	},	149	},
150	},	150	},
151	/* below is a list of the 8280 family of processors */	151	/* below is a list of the 8280 family of processors */