6 files changed, 525 insertions, 110 deletions

diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index b691d3e14754..787a8f134677 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -282,7 +282,7 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 }
 
 /* Setup any dynamic params in the uart desc */
-int cpm_uart_init_portdesc(void)
+int __init cpm_uart_init_portdesc(void)
 {
 #if defined(CONFIG_SERIAL_CPM_SMC1) || defined(CONFIG_SERIAL_CPM_SMC2)
         u32 addr;
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index aee1b31f1a1c..3db206d29b33 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -60,7 +60,8 @@ struct timer_list mcfrs_timer_struct;
 #if defined(CONFIG_HW_FEITH)
 #define CONSOLE_BAUD_RATE       38400
 #define DEFAULT_CBAUD           B38400
-#elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB) || defined(CONFIG_M5329EVB)
+#elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB) || \
+      defined(CONFIG_M5329EVB) || defined(CONFIG_GILBARCO)
 #define CONSOLE_BAUD_RATE       115200
 #define DEFAULT_CBAUD           B115200
 #elif defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \
@@ -109,12 +110,30 @@ static struct mcf_serial mcfrs_table[] = {
                 .irq = IRQBASE,
                 .flags = ASYNC_BOOT_AUTOCONF,
         },
+#ifdef MCFUART_BASE2
         {  /* ttyS1 */
                 .magic = 0,
                 .addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE2),
                 .irq = IRQBASE+1,
                 .flags = ASYNC_BOOT_AUTOCONF,
         },
+#endif
+#ifdef MCFUART_BASE3
+        {  /* ttyS2 */
+                .magic = 0,
+                .addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE3),
+                .irq = IRQBASE+2,
+                .flags = ASYNC_BOOT_AUTOCONF,
+        },
+#endif
+#ifdef MCFUART_BASE4
+        {  /* ttyS3 */
+                .magic = 0,
+                .addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE4),
+                .irq = IRQBASE+3,
+                .flags = ASYNC_BOOT_AUTOCONF,
+        },
+#endif
 };
 
 
@@ -1516,6 +1535,22 @@ static void mcfrs_irqinit(struct mcf_serial *info)
         imrp = (volatile unsigned long *) (MCF_MBAR + MCFICM_INTC0 +
                 MCFINTC_IMRL);
         *imrp &= ~((1 << (info->irq - MCFINT_VECBASE)) | 1);
+#if defined(CONFIG_M527x)
+        {
+                /*
+                 * External Pin Mask Setting & Enable External Pin for Interface
+                 * mrcbis@aliceposta.it
+                 */
+                unsigned short *serpin_enable_mask;
+                serpin_enable_mask = (MCF_IPSBAR + MCF_GPIO_PAR_UART);
+                if (info->line == 0)
+                        *serpin_enable_mask |= UART0_ENABLE_MASK;
+                else if (info->line == 1)
+                        *serpin_enable_mask |= UART1_ENABLE_MASK;
+                else if (info->line == 2)
+                        *serpin_enable_mask |= UART2_ENABLE_MASK;
+        }
+#endif
 #elif defined(CONFIG_M520x)
         volatile unsigned char *icrp, *uartp;
         volatile unsigned long *imrp;
@@ -1713,7 +1748,7 @@ mcfrs_init(void)
         /* Initialize the tty_driver structure */
         mcfrs_serial_driver->owner = THIS_MODULE;
         mcfrs_serial_driver->name = "ttyS";
-        mcfrs_serial_driver->driver_name = "serial";
+        mcfrs_serial_driver->driver_name = "mcfserial";
         mcfrs_serial_driver->major = TTY_MAJOR;
         mcfrs_serial_driver->minor_start = 64;
         mcfrs_serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
@@ -1797,10 +1832,23 @@ void mcfrs_init_console(void)
         uartp[MCFUART_UMR] = MCFUART_MR1_PARITYNONE | MCFUART_MR1_CS8;
         uartp[MCFUART_UMR] = MCFUART_MR2_STOP1;
 
+#ifdef  CONFIG_M5272
+{
+        /*
+         * For the MCF5272, also compute the baudrate fraction.
+         */
+        int fraction = MCF_BUSCLK - (clk * 32 * mcfrs_console_baud);
+        fraction *= 16;
+        fraction /= (32 * mcfrs_console_baud);
+        uartp[MCFUART_UFPD] = (fraction & 0xf);         /* set fraction */
+        clk = (MCF_BUSCLK / mcfrs_console_baud) / 32;
+}
+#else
         clk = ((MCF_BUSCLK / mcfrs_console_baud) + 16) / 32; /* set baud */
+#endif
+
         uartp[MCFUART_UBG1] = (clk & 0xff00) >> 8;  /* set msb baud */
         uartp[MCFUART_UBG2] = (clk & 0xff);  /* set lsb baud */
-
         uartp[MCFUART_UCSR] = MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER;
         uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;
 
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 4f80c5b4a753..6dd579ed9777 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -1,6 +1,4 @@
 /*
- * drivers/serial/mpc52xx_uart.c
- *
  * Driver for the PSC of the Freescale MPC52xx PSCs configured as UARTs.
  *
  * FIXME According to the usermanual the status bits in the status register
@@ -14,18 +12,20 @@
  *
  *
  * Maintainer : Sylvain Munaut <tnt@246tNt.com>
- * 
+ *
  * Some of the code has been inspired/copied from the 2.4 code written
  * by Dale Farnsworth <dfarnsworth@mvista.com>.
- * 
- * Copyright (C) 2004-2005 Sylvain Munaut <tnt@246tNt.com>
+ *
+ * Copyright (C) 2006 Secret Lab Technologies Ltd.
+ *                    Grant Likely <grant.likely@secretlab.ca>
+ * Copyright (C) 2004-2006 Sylvain Munaut <tnt@246tNt.com>
  * Copyright (C) 2003 MontaVista, Software, Inc.
- * 
+ *
  * This file is licensed under the terms of the GNU General Public License
  * version 2. This program is licensed "as is" without any warranty of any
  * kind, whether express or implied.
  */
- 
+
 /* Platform device Usage :
  *
  * Since PSCs can have multiple function, the correct driver for each one
@@ -44,7 +44,24 @@
  * will be mapped to.
  */
 
-#include <linux/platform_device.h>
+/* OF Platform device Usage :
+ *
+ * This driver is only used for PSCs configured in uart mode.  The device
+ * tree will have a node for each PSC in uart mode w/ device_type = "serial"
+ * and "mpc52xx-psc-uart" in the compatible string
+ *
+ * By default, PSC devices are enumerated in the order they are found.  However
+ * a particular PSC number can be forces by adding 'device_no = <port#>'
+ * to the device node.
+ *
+ * The driver init all necessary registers to place the PSC in uart mode without
+ * DCD. However, the pin multiplexing aren't changed and should be set either
+ * by the bootloader or in the platform init code.
+ */
+
+#undef DEBUG
+
+#include <linux/device.h>
 #include <linux/module.h>
 #include <linux/tty.h>
 #include <linux/serial.h>
@@ -54,6 +71,12 @@
 #include <asm/delay.h>
 #include <asm/io.h>
 
+#if defined(CONFIG_PPC_MERGE)
+#include <asm/of_platform.h>
+#else
+#include <linux/platform_device.h>
+#endif
+
 #include <asm/mpc52xx.h>
 #include <asm/mpc52xx_psc.h>
 
@@ -80,6 +103,12 @@ static struct uart_port mpc52xx_uart_ports[MPC52xx_PSC_MAXNUM];
          *        it's cleared, then a memset(...,0,...) should be added to
          *        the console_init
          */
+#if defined(CONFIG_PPC_MERGE)
+/* lookup table for matching device nodes to index numbers */
+static struct device_node *mpc52xx_uart_nodes[MPC52xx_PSC_MAXNUM];
+
+static void mpc52xx_uart_of_enumerate(void);
+#endif
 
 #define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))
 
@@ -96,32 +125,40 @@ static irqreturn_t mpc52xx_uart_int(int irq,void *dev_id);
 #define uart_console(port)      (0)
 #endif
 
+#if defined(CONFIG_PPC_MERGE)
+static struct of_device_id mpc52xx_uart_of_match[] = {
+        { .type = "serial", .compatible = "mpc52xx-psc-uart", },
+        { .type = "serial", .compatible = "mpc5200-psc", }, /* Efika only! */
+        {},
+};
+#endif
+
 
 /* ======================================================================== */
 /* UART operations                                                          */
 /* ======================================================================== */
 
-static unsigned int 
+static unsigned int
 mpc52xx_uart_tx_empty(struct uart_port *port)
 {
         int status = in_be16(&PSC(port)->mpc52xx_psc_status);
         return (status & MPC52xx_PSC_SR_TXEMP) ? TIOCSER_TEMT : 0;
 }
 
-static void 
+static void
 mpc52xx_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
         /* Not implemented */
 }
 
-static unsigned int 
+static unsigned int
 mpc52xx_uart_get_mctrl(struct uart_port *port)
 {
         /* Not implemented */
         return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
 }
 
-static void 
+static void
 mpc52xx_uart_stop_tx(struct uart_port *port)
 {
         /* port->lock taken by caller */
@@ -129,7 +166,7 @@ mpc52xx_uart_stop_tx(struct uart_port *port)
         out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
 }
 
-static void 
+static void
 mpc52xx_uart_start_tx(struct uart_port *port)
 {
         /* port->lock taken by caller */
@@ -137,12 +174,12 @@ mpc52xx_uart_start_tx(struct uart_port *port)
         out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
 }
 
-static void 
+static void
 mpc52xx_uart_send_xchar(struct uart_port *port, char ch)
 {
         unsigned long flags;
         spin_lock_irqsave(&port->lock, flags);
-        
+
         port->x_char = ch;
         if (ch) {
                 /* Make sure tx interrupts are on */
@@ -150,7 +187,7 @@ mpc52xx_uart_send_xchar(struct uart_port *port, char ch)
                 port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
                 out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
         }
-        
+
         spin_unlock_irqrestore(&port->lock, flags);
 }
 
@@ -178,7 +215,7 @@ mpc52xx_uart_break_ctl(struct uart_port *port, int ctl)
                 out_8(&PSC(port)->command,MPC52xx_PSC_START_BRK);
         else
                 out_8(&PSC(port)->command,MPC52xx_PSC_STOP_BRK);
-        
+
         spin_unlock_irqrestore(&port->lock, flags);
 }
 
@@ -197,11 +234,11 @@ mpc52xx_uart_startup(struct uart_port *port)
         /* Reset/activate the port, clear and enable interrupts */
         out_8(&psc->command,MPC52xx_PSC_RST_RX);
         out_8(&psc->command,MPC52xx_PSC_RST_TX);
-        
+
         out_be32(&psc->sicr,0); /* UART mode DCD ignored */
 
         out_be16(&psc->mpc52xx_psc_clock_select, 0xdd00); /* /16 prescaler on */
-        
+
         out_8(&psc->rfcntl, 0x00);
         out_be16(&psc->rfalarm, 0x1ff);
         out_8(&psc->tfcntl, 0x07);
@@ -209,10 +246,10 @@ mpc52xx_uart_startup(struct uart_port *port)
 
         port->read_status_mask |= MPC52xx_PSC_IMR_RXRDY | MPC52xx_PSC_IMR_TXRDY;
         out_be16(&psc->mpc52xx_psc_imr,port->read_status_mask);
-        
+
         out_8(&psc->command,MPC52xx_PSC_TX_ENABLE);
         out_8(&psc->command,MPC52xx_PSC_RX_ENABLE);
-                
+
         return 0;
 }
 
@@ -220,19 +257,19 @@ static void
 mpc52xx_uart_shutdown(struct uart_port *port)
 {
         struct mpc52xx_psc __iomem *psc = PSC(port);
-        
+
         /* Shut down the port, interrupt and all */
         out_8(&psc->command,MPC52xx_PSC_RST_RX);
         out_8(&psc->command,MPC52xx_PSC_RST_TX);
-        
-        port->read_status_mask = 0; 
+
+        port->read_status_mask = 0;
         out_be16(&psc->mpc52xx_psc_imr,port->read_status_mask);
 
         /* Release interrupt */
         free_irq(port->irq, port);
 }
 
-static void 
+static void
 mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
                          struct termios *old)
 {
@@ -241,10 +278,10 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
         unsigned char mr1, mr2;
         unsigned short ctr;
         unsigned int j, baud, quot;
-        
+
         /* Prepare what we're gonna write */
         mr1 = 0;
-        
+
         switch (new->c_cflag & CSIZE) {
                 case CS5:       mr1 |= MPC52xx_PSC_MODE_5_BITS;
                                 break;
@@ -261,8 +298,8 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
                         MPC52xx_PSC_MODE_PARODD : MPC52xx_PSC_MODE_PAREVEN;
         } else
                 mr1 |= MPC52xx_PSC_MODE_PARNONE;
-        
-        
+
+
         mr2 = 0;
 
         if (new->c_cflag & CSTOPB)
@@ -276,7 +313,7 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
         baud = uart_get_baud_rate(port, new, old, 0, port->uartclk/16);
         quot = uart_get_divisor(port, baud);
         ctr = quot & 0xffff;
-        
+
         /* Get the lock */
         spin_lock_irqsave(&port->lock, flags);
 
@@ -290,14 +327,14 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
          * boot for the console, all stuff is not yet ready to receive at that
          * time and that just makes the kernel oops */
         /* while (j-- && mpc52xx_uart_int_rx_chars(port)); */
-        while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP) && 
+        while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP) &&
                --j)
                 udelay(1);
 
         if (!j)
                 printk( KERN_ERR "mpc52xx_uart.c: "
                         "Unable to flush RX & TX fifos in-time in set_termios."
-                        "Some chars may have been lost.\n" ); 
+                        "Some chars may have been lost.\n" );
 
         /* Reset the TX & RX */
         out_8(&psc->command,MPC52xx_PSC_RST_RX);
@@ -309,7 +346,7 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
         out_8(&psc->mode,mr2);
         out_8(&psc->ctur,ctr >> 8);
         out_8(&psc->ctlr,ctr & 0xff);
-        
+
         /* Reenable TX & RX */
         out_8(&psc->command,MPC52xx_PSC_TX_ENABLE);
         out_8(&psc->command,MPC52xx_PSC_RX_ENABLE);
@@ -332,7 +369,7 @@ mpc52xx_uart_release_port(struct uart_port *port)
                 port->membase = NULL;
         }
 
-        release_mem_region(port->mapbase, MPC52xx_PSC_SIZE);
+        release_mem_region(port->mapbase, sizeof(struct mpc52xx_psc));
 }
 
 static int
@@ -341,12 +378,13 @@ mpc52xx_uart_request_port(struct uart_port *port)
         int err;
 
         if (port->flags & UPF_IOREMAP) /* Need to remap ? */
-                port->membase = ioremap(port->mapbase, MPC52xx_PSC_SIZE);
+                port->membase = ioremap(port->mapbase,
+                                        sizeof(struct mpc52xx_psc));
 
         if (!port->membase)
                 return -EINVAL;
 
-        err = request_mem_region(port->mapbase, MPC52xx_PSC_SIZE,
+        err = request_mem_region(port->mapbase, sizeof(struct mpc52xx_psc),
                         "mpc52xx_psc_uart") != NULL ? 0 : -EBUSY;
 
         if (err && (port->flags & UPF_IOREMAP)) {
@@ -373,7 +411,7 @@ mpc52xx_uart_verify_port(struct uart_port *port, struct serial_struct *ser)
 
         if ( (ser->irq != port->irq) ||
              (ser->io_type != SERIAL_IO_MEM) ||
-             (ser->baud_base != port->uartclk)  || 
+             (ser->baud_base != port->uartclk)  ||
              (ser->iomem_base != (void*)port->mapbase) ||
              (ser->hub6 != 0 ) )
                 return -EINVAL;
@@ -404,11 +442,11 @@ static struct uart_ops mpc52xx_uart_ops = {
         .verify_port    = mpc52xx_uart_verify_port
 };
 
-        
+
 /* ======================================================================== */
 /* Interrupt handling                                                       */
 /* ======================================================================== */
-        
+
 static inline int
 mpc52xx_uart_int_rx_chars(struct uart_port *port)
 {
@@ -435,11 +473,11 @@ mpc52xx_uart_int_rx_chars(struct uart_port *port)
 
                 flag = TTY_NORMAL;
                 port->icount.rx++;
-        
+
                 if ( status & (MPC52xx_PSC_SR_PE |
                                MPC52xx_PSC_SR_FE |
                                MPC52xx_PSC_SR_RB) ) {
-                        
+
                         if (status & MPC52xx_PSC_SR_RB) {
                                 flag = TTY_BREAK;
                                 uart_handle_break(port);
@@ -464,7 +502,7 @@ mpc52xx_uart_int_rx_chars(struct uart_port *port)
         }
 
         tty_flip_buffer_push(tty);
-        
+
         return in_be16(&PSC(port)->mpc52xx_psc_status) & MPC52xx_PSC_SR_RXRDY;
 }
 
@@ -509,25 +547,25 @@ mpc52xx_uart_int_tx_chars(struct uart_port *port)
         return 1;
 }
 
-static irqreturn_t 
+static irqreturn_t
 mpc52xx_uart_int(int irq, void *dev_id)
 {
         struct uart_port *port = dev_id;
         unsigned long pass = ISR_PASS_LIMIT;
         unsigned int keepgoing;
         unsigned short status;
-        
+
         spin_lock(&port->lock);
-        
+
         /* While we have stuff to do, we continue */
         do {
                 /* If we don't find anything to do, we stop */
-                keepgoing = 0; 
-                
+                keepgoing = 0;
+
                 /* Read status */
                 status = in_be16(&PSC(port)->mpc52xx_psc_isr);
                 status &= port->read_status_mask;
-                        
+
                 /* Do we need to receive chars ? */
                 /* For this RX interrupts must be on and some chars waiting */
                 if ( status & MPC52xx_PSC_IMR_RXRDY )
@@ -537,15 +575,15 @@ mpc52xx_uart_int(int irq, void *dev_id)
                 /* For this, TX must be ready and TX interrupt enabled */
                 if ( status & MPC52xx_PSC_IMR_TXRDY )
                         keepgoing |= mpc52xx_uart_int_tx_chars(port);
-                
+
                 /* Limit number of iteration */
                 if ( !(--pass) )
                         keepgoing = 0;
 
         } while (keepgoing);
-        
+
         spin_unlock(&port->lock);
-        
+
         return IRQ_HANDLED;
 }
 
@@ -563,13 +601,18 @@ mpc52xx_console_get_options(struct uart_port *port,
         struct mpc52xx_psc __iomem *psc = PSC(port);
         unsigned char mr1;
 
+        pr_debug("mpc52xx_console_get_options(port=%p)\n", port);
+
         /* Read the mode registers */
         out_8(&psc->command,MPC52xx_PSC_SEL_MODE_REG_1);
         mr1 = in_8(&psc->mode);
-        
+
         /* CT{U,L}R are write-only ! */
-        *baud = __res.bi_baudrate ?
-                __res.bi_baudrate : CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;
+        *baud = CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;
+#if !defined(CONFIG_PPC_MERGE)
+        if (__res.bi_baudrate)
+                *baud = __res.bi_baudrate;
+#endif
 
         /* Parse them */
         switch (mr1 & MPC52xx_PSC_MODE_BITS_MASK) {
@@ -579,26 +622,26 @@ mpc52xx_console_get_options(struct uart_port *port,
                 case MPC52xx_PSC_MODE_8_BITS:
                 default:                        *bits = 8;
         }
-        
+
         if (mr1 & MPC52xx_PSC_MODE_PARNONE)
                 *parity = 'n';
         else
                 *parity = mr1 & MPC52xx_PSC_MODE_PARODD ? 'o' : 'e';
 }
 
-static void  
+static void
 mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_port *port = &mpc52xx_uart_ports[co->index];
         struct mpc52xx_psc __iomem *psc = PSC(port);
         unsigned int i, j;
-        
+
         /* Disable interrupts */
         out_be16(&psc->mpc52xx_psc_imr, 0);
 
         /* Wait the TX buffer to be empty */
-        j = 5000000;    /* Maximum wait */      
-        while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP) && 
+        j = 5000000;    /* Maximum wait */
+        while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP) &&
                --j)
                 udelay(1);
 
@@ -607,13 +650,13 @@ mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
                 /* Line return handling */
                 if (*s == '\n')
                         out_8(&psc->mpc52xx_psc_buffer_8, '\r');
-                
+
                 /* Send the char */
                 out_8(&psc->mpc52xx_psc_buffer_8, *s);
 
                 /* Wait the TX buffer to be empty */
-                j = 20000;      /* Maximum wait */      
-                while (!(in_be16(&psc->mpc52xx_psc_status) & 
+                j = 20000;      /* Maximum wait */
+                while (!(in_be16(&psc->mpc52xx_psc_status) &
                          MPC52xx_PSC_SR_TXEMP) && --j)
                         udelay(1);
         }
@@ -622,6 +665,7 @@ mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
         out_be16(&psc->mpc52xx_psc_imr, port->read_status_mask);
 }
 
+#if !defined(CONFIG_PPC_MERGE)
 static int __init
 mpc52xx_console_setup(struct console *co, char *options)
 {
@@ -634,7 +678,7 @@ mpc52xx_console_setup(struct console *co, char *options)
 
         if (co->index < 0 || co->index >= MPC52xx_PSC_MAXNUM)
                 return -EINVAL;
-        
+
         /* Basic port init. Needed since we use some uart_??? func before
          * real init for early access */
         spin_lock_init(&port->lock);
@@ -656,6 +700,78 @@ mpc52xx_console_setup(struct console *co, char *options)
         return uart_set_options(port, co, baud, parity, bits, flow);
 }
 
+#else
+
+static int __init
+mpc52xx_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port = &mpc52xx_uart_ports[co->index];
+        struct device_node *np = mpc52xx_uart_nodes[co->index];
+        unsigned int ipb_freq;
+        struct resource res;
+        int ret;
+
+        int baud = CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        pr_debug("mpc52xx_console_setup co=%p, co->index=%i, options=%s\n",
+                 co, co->index, options);
+
+        if ((co->index < 0) || (co->index > MPC52xx_PSC_MAXNUM)) {
+                pr_debug("PSC%x out of range\n", co->index);
+                return -EINVAL;
+        }
+
+        if (!np) {
+                pr_debug("PSC%x not found in device tree\n", co->index);
+                return -EINVAL;
+        }
+
+        pr_debug("Console on ttyPSC%x is %s\n",
+                 co->index, mpc52xx_uart_nodes[co->index]->full_name);
+
+        /* Fetch register locations */
+        if ((ret = of_address_to_resource(np, 0, &res)) != 0) {
+                pr_debug("Could not get resources for PSC%x\n", co->index);
+                return ret;
+        }
+
+        /* Search for bus-frequency property in this node or a parent */
+        if ((ipb_freq = mpc52xx_find_ipb_freq(np)) == 0) {
+                pr_debug("Could not find IPB bus frequency!\n");
+                return -EINVAL;
+        }
+
+        /* Basic port init. Needed since we use some uart_??? func before
+         * real init for early access */
+        spin_lock_init(&port->lock);
+        port->uartclk   = ipb_freq / 2;
+        port->ops       = &mpc52xx_uart_ops;
+        port->mapbase = res.start;
+        port->membase = ioremap(res.start, sizeof(struct mpc52xx_psc));
+        port->irq = irq_of_parse_and_map(np, 0);
+
+        if (port->membase == NULL)
+                return -EINVAL;
+
+        pr_debug("mpc52xx-psc uart at %lx, mapped to %p, irq=%x, freq=%i\n",
+                 port->mapbase, port->membase, port->irq, port->uartclk);
+
+        /* Setup the port parameters accoding to options */
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                mpc52xx_console_get_options(port, &baud, &parity, &bits, &flow);
+
+        pr_debug("Setting console parameters: %i %i%c1 flow=%c\n",
+                 baud, bits, parity, flow);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+#endif /* defined(CONFIG_PPC_MERGE) */
+
 
 static struct uart_driver mpc52xx_uart_driver;
 
@@ -669,10 +785,11 @@ static struct console mpc52xx_console = {
         .data   = &mpc52xx_uart_driver,
 };
 
-        
-static int __init 
+
+static int __init
 mpc52xx_console_init(void)
 {
+        mpc52xx_uart_of_enumerate();
         register_console(&mpc52xx_console);
         return 0;
 }
@@ -700,6 +817,7 @@ static struct uart_driver mpc52xx_uart_driver = {
 };
 
 
+#if !defined(CONFIG_PPC_MERGE)
 /* ======================================================================== */
 /* Platform Driver                                                          */
 /* ======================================================================== */
@@ -723,8 +841,6 @@ mpc52xx_uart_probe(struct platform_device *dev)
         /* Init the port structure */
         port = &mpc52xx_uart_ports[idx];
 
-        memset(port, 0x00, sizeof(struct uart_port));
-
         spin_lock_init(&port->lock);
         port->uartclk   = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
         port->fifosize  = 512;
@@ -733,6 +849,7 @@ mpc52xx_uart_probe(struct platform_device *dev)
                           ( uart_console(port) ? 0 : UPF_IOREMAP );
         port->line      = idx;
         port->ops       = &mpc52xx_uart_ops;
+        port->dev       = &dev->dev;
 
         /* Search for IRQ and mapbase */
         for (i=0 ; i<dev->num_resources ; i++, res++) {
@@ -771,7 +888,7 @@ mpc52xx_uart_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
 
-        if (sport)
+        if (port)
                 uart_suspend_port(&mpc52xx_uart_driver, port);
 
         return 0;
@@ -789,6 +906,7 @@ mpc52xx_uart_resume(struct platform_device *dev)
 }
 #endif
 
+
 static struct platform_driver mpc52xx_uart_platform_driver = {
         .probe          = mpc52xx_uart_probe,
         .remove         = mpc52xx_uart_remove,
@@ -800,6 +918,184 @@ static struct platform_driver mpc52xx_uart_platform_driver = {
                 .name   = "mpc52xx-psc",
         },
 };
+#endif /* !defined(CONFIG_PPC_MERGE) */
+
+
+#if defined(CONFIG_PPC_MERGE)
+/* ======================================================================== */
+/* OF Platform Driver                                                       */
+/* ======================================================================== */
+
+static int __devinit
+mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
+{
+        int idx = -1;
+        unsigned int ipb_freq;
+        struct uart_port *port = NULL;
+        struct resource res;
+        int ret;
+
+        dev_dbg(&op->dev, "mpc52xx_uart_probe(op=%p, match=%p)\n", op, match);
+
+        /* Check validity & presence */
+        for (idx = 0; idx < MPC52xx_PSC_MAXNUM; idx++)
+                if (mpc52xx_uart_nodes[idx] == op->node)
+                        break;
+        if (idx >= MPC52xx_PSC_MAXNUM)
+                return -EINVAL;
+        pr_debug("Found %s assigned to ttyPSC%x\n",
+                 mpc52xx_uart_nodes[idx]->full_name, idx);
+
+        /* Search for bus-frequency property in this node or a parent */
+        if ((ipb_freq = mpc52xx_find_ipb_freq(op->node)) == 0) {
+                dev_dbg(&op->dev, "Could not find IPB bus frequency!\n");
+                return -EINVAL;
+        }
+
+        /* Init the port structure */
+        port = &mpc52xx_uart_ports[idx];
+
+        spin_lock_init(&port->lock);
+        port->uartclk   = ipb_freq / 2;
+        port->fifosize  = 512;
+        port->iotype    = UPIO_MEM;
+        port->flags     = UPF_BOOT_AUTOCONF |
+                          ( uart_console(port) ? 0 : UPF_IOREMAP );
+        port->line      = idx;
+        port->ops       = &mpc52xx_uart_ops;
+        port->dev       = &op->dev;
+
+        /* Search for IRQ and mapbase */
+        if ((ret = of_address_to_resource(op->node, 0, &res)) != 0)
+                return ret;
+
+        port->mapbase = res.start;
+        port->irq = irq_of_parse_and_map(op->node, 0);
+
+        dev_dbg(&op->dev, "mpc52xx-psc uart at %lx, irq=%x, freq=%i\n",
+                port->mapbase, port->irq, port->uartclk);
+
+        if ((port->irq==NO_IRQ) || !port->mapbase) {
+                printk(KERN_ERR "Could not allocate resources for PSC\n");
+                return -EINVAL;
+        }
+
+        /* Add the port to the uart sub-system */
+        ret = uart_add_one_port(&mpc52xx_uart_driver, port);
+        if (!ret)
+                dev_set_drvdata(&op->dev, (void*)port);
+
+        return ret;
+}
+
+static int
+mpc52xx_uart_of_remove(struct of_device *op)
+{
+        struct uart_port *port = dev_get_drvdata(&op->dev);
+        dev_set_drvdata(&op->dev, NULL);
+
+        if (port)
+                uart_remove_one_port(&mpc52xx_uart_driver, port);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int
+mpc52xx_uart_of_suspend(struct of_device *op, pm_message_t state)
+{
+        struct uart_port *port = (struct uart_port *) dev_get_drvdata(&op->dev);
+
+        if (port)
+                uart_suspend_port(&mpc52xx_uart_driver, port);
+
+        return 0;
+}
+
+static int
+mpc52xx_uart_of_resume(struct of_device *op)
+{
+        struct uart_port *port = (struct uart_port *) dev_get_drvdata(&op->dev);
+
+        if (port)
+                uart_resume_port(&mpc52xx_uart_driver, port);
+
+        return 0;
+}
+#endif
+
+static void
+mpc52xx_uart_of_assign(struct device_node *np, int idx)
+{
+        int free_idx = -1;
+        int i;
+
+        /* Find the first free node */
+        for (i = 0; i < MPC52xx_PSC_MAXNUM; i++) {
+                if (mpc52xx_uart_nodes[i] == NULL) {
+                        free_idx = i;
+                        break;
+                }
+        }
+
+        if ((idx < 0) || (idx >= MPC52xx_PSC_MAXNUM))
+                idx = free_idx;
+
+        if (idx < 0)
+                return; /* No free slot; abort */
+
+        /* If the slot is already occupied, then swap slots */
+        if (mpc52xx_uart_nodes[idx] && (free_idx != -1))
+                mpc52xx_uart_nodes[free_idx] = mpc52xx_uart_nodes[idx];
+        mpc52xx_uart_nodes[i] = np;
+}
+
+static void
+mpc52xx_uart_of_enumerate(void)
+{
+        static int enum_done = 0;
+        struct device_node *np;
+        const unsigned int *devno;
+        int i;
+
+        if (enum_done)
+                return;
+
+        for_each_node_by_type(np, "serial") {
+                if (!of_match_node(mpc52xx_uart_of_match, np))
+                        continue;
+
+                /* Is a particular device number requested? */
+                devno = get_property(np, "device_no", NULL);
+                mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1);
+        }
+
+        enum_done = 1;
+
+        for (i = 0; i < MPC52xx_PSC_MAXNUM; i++) {
+                if (mpc52xx_uart_nodes[i])
+                        pr_debug("%s assigned to ttyPSC%x\n",
+                                 mpc52xx_uart_nodes[i]->full_name, i);
+        }
+}
+
+MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match);
+
+static struct of_platform_driver mpc52xx_uart_of_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "mpc52xx-psc-uart",
+        .match_table    = mpc52xx_uart_of_match,
+        .probe          = mpc52xx_uart_of_probe,
+        .remove         = mpc52xx_uart_of_remove,
+#ifdef CONFIG_PM
+        .suspend        = mpc52xx_uart_of_suspend,
+        .resume         = mpc52xx_uart_of_resume,
+#endif
+        .driver         = {
+                .name   = "mpc52xx-psc-uart",
+        },
+};
+#endif /* defined(CONFIG_PPC_MERGE) */
 
 
 /* ======================================================================== */
@@ -811,22 +1107,45 @@ mpc52xx_uart_init(void)
 {
         int ret;
 
-        printk(KERN_INFO "Serial: MPC52xx PSC driver\n");
+        printk(KERN_INFO "Serial: MPC52xx PSC UART driver\n");
 
-        ret = uart_register_driver(&mpc52xx_uart_driver);
-        if (ret == 0) {
-                ret = platform_driver_register(&mpc52xx_uart_platform_driver);
-                if (ret)
-                        uart_unregister_driver(&mpc52xx_uart_driver);
+        if ((ret = uart_register_driver(&mpc52xx_uart_driver)) != 0) {
+                printk(KERN_ERR "%s: uart_register_driver failed (%i)\n",
+                       __FILE__, ret);
+                return ret;
         }
 
-        return ret;
+#if defined(CONFIG_PPC_MERGE)
+        mpc52xx_uart_of_enumerate();
+
+        ret = of_register_platform_driver(&mpc52xx_uart_of_driver);
+        if (ret) {
+                printk(KERN_ERR "%s: of_register_platform_driver failed (%i)\n",
+                       __FILE__, ret);
+                uart_unregister_driver(&mpc52xx_uart_driver);
+                return ret;
+        }
+#else
+        ret = platform_driver_register(&mpc52xx_uart_platform_driver);
+        if (ret) {
+                printk(KERN_ERR "%s: platform_driver_register failed (%i)\n",
+                       __FILE__, ret);
+                uart_unregister_driver(&mpc52xx_uart_driver);
+                return ret;
+        }
+#endif
+
+        return 0;
 }
 
 static void __exit
 mpc52xx_uart_exit(void)
 {
+#if defined(CONFIG_PPC_MERGE)
+        of_unregister_platform_driver(&mpc52xx_uart_of_driver);
+#else
         platform_driver_unregister(&mpc52xx_uart_platform_driver);
+#endif
         uart_unregister_driver(&mpc52xx_uart_driver);
 }
 
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 00f9ffd69489..431433f4dd6d 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -723,7 +723,7 @@ static int serial_config(struct pcmcia_device * link)
         u_char *buf;
         cisparse_t *parse;
         cistpl_cftable_entry_t *cf;
-        int i, last_ret, last_fn;
+        int i;
 
         DEBUG(0, "serial_config(0x%p)\n", link);
 
@@ -740,15 +740,6 @@ static int serial_config(struct pcmcia_device * link)
         tuple->TupleOffset = 0;
         tuple->TupleDataMax = 255;
         tuple->Attributes = 0;
-        /* Get configuration register information */
-        tuple->DesiredTuple = CISTPL_CONFIG;
-        last_ret = first_tuple(link, tuple, parse);
-        if (last_ret != CS_SUCCESS) {
-                last_fn = ParseTuple;
-                goto cs_failed;
-        }
-        link->conf.ConfigBase = parse->config.base;
-        link->conf.Present = parse->config.rmask[0];
 
         /* Is this a compliant multifunction card? */
         tuple->DesiredTuple = CISTPL_LONGLINK_MFC;
@@ -757,27 +748,25 @@ static int serial_config(struct pcmcia_device * link)
 
         /* Is this a multiport card? */
         tuple->DesiredTuple = CISTPL_MANFID;
-        if (first_tuple(link, tuple, parse) == CS_SUCCESS) {
-                info->manfid = parse->manfid.manf;
-                info->prodid = parse->manfid.card;
-
-                for (i = 0; i < ARRAY_SIZE(quirks); i++)
-                        if ((quirks[i].manfid == ~0 ||
-                             quirks[i].manfid == info->manfid) &&
-                            (quirks[i].prodid == ~0 ||
-                             quirks[i].prodid == info->prodid)) {
-                                info->quirk = &quirks[i];
-                                break;
-                        }
-        }
+        info->manfid = link->manf_id;
+        info->prodid = link->card_id;
+
+        for (i = 0; i < ARRAY_SIZE(quirks); i++)
+                if ((quirks[i].manfid == ~0 ||
+                     quirks[i].manfid == info->manfid) &&
+                    (quirks[i].prodid == ~0 ||
+                     quirks[i].prodid == info->prodid)) {
+                        info->quirk = &quirks[i];
+                        break;
+                }
 
         /* Another check for dual-serial cards: look for either serial or
            multifunction cards that ask for appropriate IO port ranges */
         tuple->DesiredTuple = CISTPL_FUNCID;
         if ((info->multi == 0) &&
-            ((first_tuple(link, tuple, parse) != CS_SUCCESS) ||
-             (parse->funcid.func == CISTPL_FUNCID_MULTI) ||
-             (parse->funcid.func == CISTPL_FUNCID_SERIAL))) {
+            (link->has_func_id) &&
+            ((link->func_id == CISTPL_FUNCID_MULTI) ||
+             (link->func_id == CISTPL_FUNCID_SERIAL))) {
                 tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
                 if (first_tuple(link, tuple, parse) == CS_SUCCESS) {
                         if ((cf->io.nwin == 1) && (cf->io.win[0].len % 8 == 0))
@@ -814,8 +803,6 @@ static int serial_config(struct pcmcia_device * link)
         kfree(cfg_mem);
         return 0;
 
- cs_failed:
-        cs_error(link, last_fn, last_ret);
  failed:
         serial_remove(link);
         kfree(cfg_mem);
@@ -925,6 +912,30 @@ static struct pcmcia_device_id serial_ids[] = {
         PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
         PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "RS-COM-2P.cis"),
         PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"),
+        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100  1.00.",0x19ca78af,0xf964f42b),
+        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83),
+        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232  1.00.",0x19ca78af,0x69fb7490),
+        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232",0x19ca78af,0xb6bc0235),
+        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232",0x63f2e0bd,0xb9e175d3),
+        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232-5",0x63f2e0bd,0xfce33442),
+        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232",0x3beb8cf2,0x171e7190),
+        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232-5",0x3beb8cf2,0x20da4262),
+        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF428",0x3beb8cf2,0xea5dd57d),
+        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF500",0x3beb8cf2,0xd77255fa),
+        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: IC232",0x3beb8cf2,0x6a709903),
+        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: SL232",0x3beb8cf2,0x18430676),
+        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: XL232",0x3beb8cf2,0x6f933767),
+        PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7),
+        PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41),
+        PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029),
+        PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+        PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc),
+        PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7),
+        PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41),
+        PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029),
+        PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+        PCMCIA_MFC_DEVICE_PROD_ID12(2,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+        PCMCIA_MFC_DEVICE_PROD_ID12(3,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
         /* too generic */
         /* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */
         /* PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0160, 0x0002), */
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index cfcc3caf49d8..3b5f19ec2126 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -775,7 +775,7 @@ static int sci_notifier(struct notifier_block *self,
                          *
                          * Clean this up later..
                          */
-                        clk = clk_get("module_clk");
+                        clk = clk_get(NULL, "module_clk");
                         port->uartclk = clk_get_rate(clk) * 16;
                         clk_put(clk);
                 }
@@ -960,7 +960,7 @@ static void sci_set_termios(struct uart_port *port, struct termios *termios,
                 default:
                 {
 #if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
-                        struct clk *clk = clk_get("module_clk");
+                        struct clk *clk = clk_get(NULL, "module_clk");
                         t = SCBRR_VALUE(baud, clk_get_rate(clk));
                         clk_put(clk);
 #else
@@ -1128,7 +1128,7 @@ static void __init sci_init_ports(void)
                  * XXX: We should use a proper SCI/SCIF clock
                  */
                 {
-                        struct clk *clk = clk_get("module_clk");
+                        struct clk *clk = clk_get(NULL, "module_clk");
                         sci_ports[i].port.uartclk = clk_get_rate(clk) * 16;
                         clk_put(clk);
                 }
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index 7ee992146ae9..e4557cc4f74b 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -133,6 +133,20 @@
 # define SCIF_ORER      0x0001          /* Overrun error bit */
 # define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
 # define SCIF_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_SH7206)
+# define SCSPTR0 0xfffe8020 /* 16 bit SCIF */
+# define SCSPTR1 0xfffe8820 /* 16 bit SCIF */
+# define SCSPTR2 0xfffe9020 /* 16 bit SCIF */
+# define SCSPTR3 0xfffe9820 /* 16 bit SCIF */
+# define SCSCR_INIT(port)       0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_SH7619)
+# define SCSPTR0 0xf8400020 /* 16 bit SCIF */
+# define SCSPTR1 0xf8410020 /* 16 bit SCIF */
+# define SCSPTR2 0xf8420020 /* 16 bit SCIF */
+# define SCIF_ORER 0x0001  /* overrun error bit */
+# define SCSCR_INIT(port)       0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
 #else
 # error CPU subtype not defined
 #endif
@@ -365,6 +379,7 @@ SCIx_FNS(SCxSR,  0x08,  8, 0x10,  8, 0x08, 16, 0x10, 16, 0x04,  8)
 SCIx_FNS(SCxRDR, 0x0a,  8, 0x14,  8, 0x0A,  8, 0x14,  8, 0x05,  8)
 SCIF_FNS(SCFCR,                      0x0c,  8, 0x18, 16)
 #if defined(CONFIG_CPU_SUBTYPE_SH7760) || defined(CONFIG_CPU_SUBTYPE_SH7780)
+SCIF_FNS(SCFDR,                      0x0e, 16, 0x1C, 16)
 SCIF_FNS(SCTFDR,                     0x0e, 16, 0x1C, 16)
 SCIF_FNS(SCRFDR,                     0x0e, 16, 0x20, 16)
 SCIF_FNS(SCSPTR,                        0,  0, 0x24, 16)
@@ -544,6 +559,28 @@ static inline int sci_rxd_in(struct uart_port *port)
         if (port->mapbase == 0xffe10000)
                 return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */
 }
+#elif defined(CONFIG_CPU_SUBTYPE_SH7206)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xfffe8000)
+                return ctrl_inw(SCSPTR0) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xfffe8800)
+                return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xfffe9000)
+                return ctrl_inw(SCSPTR2) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xfffe9800)
+                return ctrl_inw(SCSPTR3) & 0x0001 ? 1 : 0; /* SCIF */
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH7619)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xf8400000)
+                return ctrl_inw(SCSPTR0) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xf8410000)
+                return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xf8420000)
+                return ctrl_inw(SCSPTR2) & 0x0001 ? 1 : 0; /* SCIF */
+}
 #endif
 
 /*