Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux-2.6-PQ

4 files changed, 110 insertions, 64 deletions

diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 34412bc7c4b6..d01870619a4a 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -944,12 +944,13 @@ extern int fs_mii_connect(struct net_device *dev);
 extern void fs_mii_disconnect(struct net_device *dev);
 
 static struct net_device *fs_init_instance(struct device *dev,
-                const struct fs_platform_info *fpi)
+                struct fs_platform_info *fpi)
 {
         struct net_device *ndev = NULL;
         struct fs_enet_private *fep = NULL;
         int privsize, i, r, err = 0, registered = 0;
 
+        fpi->fs_no = fs_get_id(fpi);
         /* guard */
         if ((unsigned int)fpi->fs_no >= FS_MAX_INDEX)
                 return ERR_PTR(-EINVAL);
@@ -971,7 +972,7 @@ static struct net_device *fs_init_instance(struct device *dev,
         dev_set_drvdata(dev, ndev);
         fep->fpi = fpi;
         if (fpi->init_ioports)
-                fpi->init_ioports();
+                fpi->init_ioports((struct fs_platform_info *)fpi);
 
 #ifdef CONFIG_FS_ENET_HAS_FEC
         if (fs_get_fec_index(fpi->fs_no) >= 0)
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 90ff96e3339b..a0d6136deb9b 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -46,6 +46,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/delay.h>
+#include <asm/fs_pd.h>
 
 #if defined(CONFIG_SERIAL_CPM_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
@@ -1022,15 +1023,17 @@ int cpm_uart_drv_get_platform_data(struct platform_device *pdev, int is_con)
 {
         struct resource *r;
         struct fs_uart_platform_info *pdata = pdev->dev.platform_data;
-        int idx = pdata->fs_no; /* It is UART_SMCx or UART_SCCx index */
+        int idx;        /* It is UART_SMCx or UART_SCCx index */
         struct uart_cpm_port *pinfo;
         int line;
         u32 mem, pram;
 
+        idx = pdata->fs_no = fs_uart_get_id(pdata);
+
         line = cpm_uart_id2nr(idx);
         if(line < 0) {
                 printk(KERN_ERR"%s(): port %d is not registered", __FUNCTION__, idx);
-                return -1;
+                return -EINVAL;
         }
 
         pinfo = (struct uart_cpm_port *) &cpm_uart_ports[idx];
@@ -1044,11 +1047,11 @@ int cpm_uart_drv_get_platform_data(struct platform_device *pdev, int is_con)
 
         if (!(r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs")))
                 return -EINVAL;
-        mem = r->start;
+        mem = (u32)ioremap(r->start, r->end - r->start + 1);
 
         if (!(r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pram")))
                 return -EINVAL;
-        pram = r->start;
+        pram = (u32)ioremap(r->start, r->end - r->start + 1);
 
         if(idx > fsid_smc2_uart) {
                 pinfo->sccp = (scc_t *)mem;
@@ -1179,7 +1182,7 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
                 pdata = pdev->dev.platform_data;
                 if (pdata)
                         if (pdata->init_ioports)
-                                pdata->init_ioports();
+                                pdata->init_ioports(pdata);
 
                 cpm_uart_drv_get_platform_data(pdev, 1);
         }
@@ -1189,11 +1192,7 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
         if (options) {
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
         } else {
-                bd_t *bd = (bd_t *) __res;
-
-                if (bd->bi_baudrate)
-                        baud = bd->bi_baudrate;
-                else
+                if ((baud = uart_baudrate()) == -1)
                         baud = 9600;
         }
 
@@ -1266,13 +1265,14 @@ static int cpm_uart_drv_probe(struct device *dev)
         }
 
         pdata = pdev->dev.platform_data;
-        pr_debug("cpm_uart_drv_probe: Adding CPM UART %d\n", cpm_uart_id2nr(pdata->fs_no));
 
         if ((ret = cpm_uart_drv_get_platform_data(pdev, 0)))
                 return ret;
 
+        pr_debug("cpm_uart_drv_probe: Adding CPM UART %d\n", cpm_uart_id2nr(pdata->fs_no));
+
         if (pdata->init_ioports)
-                pdata->init_ioports();
+                pdata->init_ioports(pdata);
 
         ret = uart_add_one_port(&cpm_reg, &cpm_uart_ports[pdata->fs_no].port);
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index ef3bb476c432..b691d3e14754 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -40,6 +40,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/fs_pd.h>
 
 #include <linux/serial_core.h>
 #include <linux/kernel.h>
@@ -50,8 +51,9 @@
 
 void cpm_line_cr_cmd(int line, int cmd)
 {
-        volatile cpm_cpm2_t *cp = cpmp;
         ulong val;
+        volatile cpm_cpm2_t *cp = cpm2_map(im_cpm);
+
 
         switch (line) {
         case UART_SMC1:
@@ -84,11 +86,14 @@ void cpm_line_cr_cmd(int line, int cmd)
         }
         cp->cp_cpcr = val;
         while (cp->cp_cpcr & CPM_CR_FLG) ;
+
+        cpm2_unmap(cp);
 }
 
 void smc1_lineif(struct uart_cpm_port *pinfo)
 {
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
 
         /* SMC1 is only on port D */
         io->iop_ppard |= 0x00c00000;
@@ -97,13 +102,17 @@ void smc1_lineif(struct uart_cpm_port *pinfo)
         io->iop_psord &= ~0x00c00000;
 
         /* Wire BRG1 to SMC1 */
-        cpm2_immr->im_cpmux.cmx_smr &= 0x0f;
+        cpmux->cmx_smr &= 0x0f;
         pinfo->brg = 1;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 void smc2_lineif(struct uart_cpm_port *pinfo)
 {
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
 
         /* SMC2 is only on port A */
         io->iop_ppara |= 0x00c00000;
@@ -112,13 +121,17 @@ void smc2_lineif(struct uart_cpm_port *pinfo)
         io->iop_psora &= ~0x00c00000;
 
         /* Wire BRG2 to SMC2 */
-        cpm2_immr->im_cpmux.cmx_smr &= 0xf0;
+        cpmux->cmx_smr &= 0xf0;
         pinfo->brg = 2;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 void scc1_lineif(struct uart_cpm_port *pinfo)
 {
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
 
         /* Use Port D for SCC1 instead of other functions.  */
         io->iop_ppard |= 0x00000003;
@@ -128,9 +141,12 @@ void scc1_lineif(struct uart_cpm_port *pinfo)
         io->iop_pdird |= 0x00000002;    /* Tx */
 
         /* Wire BRG1 to SCC1 */
-        cpm2_immr->im_cpmux.cmx_scr &= 0x00ffffff;
-        cpm2_immr->im_cpmux.cmx_scr |= 0x00000000;
+        cpmux->cmx_scr &= 0x00ffffff;
+        cpmux->cmx_scr |= 0x00000000;
         pinfo->brg = 1;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 void scc2_lineif(struct uart_cpm_port *pinfo)
@@ -143,43 +159,57 @@ void scc2_lineif(struct uart_cpm_port *pinfo)
          * be supported in a sane fashion.
          */
 #ifndef CONFIG_STX_GP3
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
+
         io->iop_pparb |= 0x008b0000;
         io->iop_pdirb |= 0x00880000;
         io->iop_psorb |= 0x00880000;
         io->iop_pdirb &= ~0x00030000;
         io->iop_psorb &= ~0x00030000;
 #endif
-        cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff;
-        cpm2_immr->im_cpmux.cmx_scr |= 0x00090000;
+        cpmux->cmx_scr &= 0xff00ffff;
+        cpmux->cmx_scr |= 0x00090000;
         pinfo->brg = 2;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 void scc3_lineif(struct uart_cpm_port *pinfo)
 {
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
+
         io->iop_pparb |= 0x008b0000;
         io->iop_pdirb |= 0x00880000;
         io->iop_psorb |= 0x00880000;
         io->iop_pdirb &= ~0x00030000;
         io->iop_psorb &= ~0x00030000;
-        cpm2_immr->im_cpmux.cmx_scr &= 0xffff00ff;
-        cpm2_immr->im_cpmux.cmx_scr |= 0x00001200;
+        cpmux->cmx_scr &= 0xffff00ff;
+        cpmux->cmx_scr |= 0x00001200;
         pinfo->brg = 3;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 void scc4_lineif(struct uart_cpm_port *pinfo)
 {
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
 
         io->iop_ppard |= 0x00000600;
         io->iop_psord &= ~0x00000600;   /* Tx/Rx */
         io->iop_pdird &= ~0x00000200;   /* Rx */
         io->iop_pdird |= 0x00000400;    /* Tx */
 
-        cpm2_immr->im_cpmux.cmx_scr &= 0xffffff00;
-        cpm2_immr->im_cpmux.cmx_scr |= 0x0000001b;
+        cpmux->cmx_scr &= 0xffffff00;
+        cpmux->cmx_scr |= 0x0000001b;
         pinfo->brg = 4;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 /*
@@ -254,88 +284,103 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 /* Setup any dynamic params in the uart desc */
 int cpm_uart_init_portdesc(void)
 {
+#if defined(CONFIG_SERIAL_CPM_SMC1) || defined(CONFIG_SERIAL_CPM_SMC2)
+        u32 addr;
+#endif
         pr_debug("CPM uart[-]:init portdesc\n");
 
         cpm_uart_nr = 0;
 #ifdef CONFIG_SERIAL_CPM_SMC1
-        cpm_uart_ports[UART_SMC1].smcp = (smc_t *) & cpm2_immr->im_smc[0];
-        cpm_uart_ports[UART_SMC1].smcup =
-            (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC1];
-        *(u16 *)(&cpm2_immr->im_dprambase[PROFF_SMC1_BASE]) = PROFF_SMC1;
+        cpm_uart_ports[UART_SMC1].smcp = (smc_t *) cpm2_map(im_smc[0]);
         cpm_uart_ports[UART_SMC1].port.mapbase =
-            (unsigned long)&cpm2_immr->im_smc[0];
+            (unsigned long)cpm_uart_ports[UART_SMC1].smcp;
+
+        cpm_uart_ports[UART_SMC1].smcup =
+            (smc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SMC1], PROFF_SMC_SIZE);
+        addr = (u16 *)cpm2_map_size(im_dprambase[PROFF_SMC1_BASE], 2);
+        *addr = PROFF_SMC1;
+        cpm2_unmap(addr);
+
         cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
         cpm_uart_ports[UART_SMC1].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-        cpm_uart_ports[UART_SMC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SMC1].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SMC1;
 #endif
 
 #ifdef CONFIG_SERIAL_CPM_SMC2
-        cpm_uart_ports[UART_SMC2].smcp = (smc_t *) & cpm2_immr->im_smc[1];
-        cpm_uart_ports[UART_SMC2].smcup =
-            (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC2];
-        *(u16 *)(&cpm2_immr->im_dprambase[PROFF_SMC2_BASE]) = PROFF_SMC2;
+        cpm_uart_ports[UART_SMC2].smcp = (smc_t *) cpm2_map(im_smc[1]);
         cpm_uart_ports[UART_SMC2].port.mapbase =
-            (unsigned long)&cpm2_immr->im_smc[1];
+            (unsigned long)cpm_uart_ports[UART_SMC2].smcp;
+
+        cpm_uart_ports[UART_SMC2].smcup =
+            (smc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SMC2], PROFF_SMC_SIZE);
+        addr = (u16 *)cpm2_map_size(im_dprambase[PROFF_SMC2_BASE], 2);
+        *addr = PROFF_SMC2;
+        cpm2_unmap(addr);
+
         cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
         cpm_uart_ports[UART_SMC2].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-        cpm_uart_ports[UART_SMC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SMC2].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SMC2;
 #endif
 
 #ifdef CONFIG_SERIAL_CPM_SCC1
-        cpm_uart_ports[UART_SCC1].sccp = (scc_t *) & cpm2_immr->im_scc[0];
-        cpm_uart_ports[UART_SCC1].sccup =
-            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC1];
+        cpm_uart_ports[UART_SCC1].sccp = (scc_t *) cpm2_map(im_scc[0]);
         cpm_uart_ports[UART_SCC1].port.mapbase =
-            (unsigned long)&cpm2_immr->im_scc[0];
+            (unsigned long)cpm_uart_ports[UART_SCC1].sccp;
+        cpm_uart_ports[UART_SCC1].sccup =
+            (scc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SCC1], PROFF_SCC_SIZE);
+
         cpm_uart_ports[UART_SCC1].sccp->scc_sccm &=
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC1].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC1].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC1;
 #endif
 
 #ifdef CONFIG_SERIAL_CPM_SCC2
-        cpm_uart_ports[UART_SCC2].sccp = (scc_t *) & cpm2_immr->im_scc[1];
-        cpm_uart_ports[UART_SCC2].sccup =
-            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC2];
+        cpm_uart_ports[UART_SCC2].sccp = (scc_t *) cpm2_map(im_scc[1]);
         cpm_uart_ports[UART_SCC2].port.mapbase =
-            (unsigned long)&cpm2_immr->im_scc[1];
+            (unsigned long)cpm_uart_ports[UART_SCC2].sccp;
+        cpm_uart_ports[UART_SCC2].sccup =
+            (scc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SCC2], PROFF_SCC_SIZE);
+
         cpm_uart_ports[UART_SCC2].sccp->scc_sccm &=
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC2].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC2].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC2;
 #endif
 
 #ifdef CONFIG_SERIAL_CPM_SCC3
-        cpm_uart_ports[UART_SCC3].sccp = (scc_t *) & cpm2_immr->im_scc[2];
-        cpm_uart_ports[UART_SCC3].sccup =
-            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC3];
+        cpm_uart_ports[UART_SCC3].sccp = (scc_t *) cpm2_map(im_scc[2]);
         cpm_uart_ports[UART_SCC3].port.mapbase =
-            (unsigned long)&cpm2_immr->im_scc[2];
+            (unsigned long)cpm_uart_ports[UART_SCC3].sccp;
+        cpm_uart_ports[UART_SCC3].sccup =
+            (scc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SCC3], PROFF_SCC_SIZE);
+
         cpm_uart_ports[UART_SCC3].sccp->scc_sccm &=
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC3].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC3].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC3].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC3;
 #endif
 
 #ifdef CONFIG_SERIAL_CPM_SCC4
-        cpm_uart_ports[UART_SCC4].sccp = (scc_t *) & cpm2_immr->im_scc[3];
-        cpm_uart_ports[UART_SCC4].sccup =
-            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC4];
+        cpm_uart_ports[UART_SCC4].sccp = (scc_t *) cpm2_map(im_scc[3]);
         cpm_uart_ports[UART_SCC4].port.mapbase =
-            (unsigned long)&cpm2_immr->im_scc[3];
+            (unsigned long)cpm_uart_ports[UART_SCC4].sccp;
+        cpm_uart_ports[UART_SCC4].sccup =
+            (scc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SCC4], PROFF_SCC_SIZE);
+
         cpm_uart_ports[UART_SCC4].sccp->scc_sccm &=
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC4].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC4].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC4].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC4;
 #endif
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
index 4793fecf8ece..a663300d3476 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
@@ -40,6 +40,6 @@ static inline void cpm_set_smc_fcr(volatile smc_uart_t * up)
         up->smc_tfcr = CPMFCR_GBL | CPMFCR_EB;
 }
 
-#define DPRAM_BASE      ((unsigned char *)&cpm2_immr->im_dprambase[0])
+#define DPRAM_BASE      ((unsigned char *)cpm_dpram_addr(0))
 
 #endif