[PATCH] ppc32 CPM_UART: various fixes for pq2 uart users

This fixes various odd things that missed update together with cpm_uart
platform_device move. Unified resources names, restructurisation, etc.
Also, addressed issue with recent phys/virt translation rework. Being
cache-coherent, CPM2's do alloc_bootmem() for the console stuff, and it was
used to treat console buffer descriptor mapping 1:1 (as in CPM1 case),
which is definitely wrong.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

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_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
-                        MPC82xx_CPM_USB, MPC82xx_SEC1,
+                        MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SCC4,
+                        MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,
+                        MPC82xx_CPM_I2C, MPC82xx_CPM_USB, MPC82xx_SEC1,
                 },
         },
         /* below is a list of the 8280 family of processors */