projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Move files and patches to files-2.6.23 and patches-2.6.23
[openwrt.git] / target / linux / ifxmips / files / drivers / serial / ifxmips_asc.c
diff --git a/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c b/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c
index b191241..2dc8917 100644 (file)
--- a/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c
+++ b/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c
@@ -1,6 +1,4 @@
 /*
 /*
- *  Driver for IFXMIPSASC serial ports
- *
  *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
  *
  * This program is free software; you can redistribute it and/or modify
  *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -43,14 +41,13 @@
 #include <linux/console.h>
 #include <linux/sysrq.h>
 #include <linux/irq.h>
 #include <linux/console.h>
 #include <linux/sysrq.h>
 #include <linux/irq.h>
-
+#include <linux/platform_device.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
 #include <asm/ifxmips/ifxmips.h>
 #include <asm/ifxmips/ifxmips_irq.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
 #include <asm/ifxmips/ifxmips.h>
 #include <asm/ifxmips/ifxmips_irq.h>
-#include <asm/ifxmips/ifxmips_serial.h>
 
 #define PORT_IFXMIPSASC  111
 
 
 #define PORT_IFXMIPSASC  111
 
@@ -60,56 +57,49 @@
 
 static void ifxmipsasc_tx_chars(struct uart_port *port);
 extern void prom_printf(const char * fmt, ...);
 
 static void ifxmipsasc_tx_chars(struct uart_port *port);
 extern void prom_printf(const char * fmt, ...);
-static struct uart_port ifxmipsasc_port;
+static struct uart_port ifxmipsasc_port[2];
 static struct uart_driver ifxmipsasc_reg;
 static struct uart_driver ifxmipsasc_reg;
-static unsigned int uartclk = 0;
 extern unsigned int ifxmips_get_fpi_hz(void);
 
 static void
 extern unsigned int ifxmips_get_fpi_hz(void);
 
 static void
-ifxmipsasc_stop_tx (struct uart_port *port)
+ifxmipsasc_stop_tx(struct uart_port *port)
 {
 {
-       /* fifo underrun shuts up after firing once */
        return;
 }
 
 static void
        return;
 }
 
 static void
-ifxmipsasc_start_tx (struct uart_port *port)
+ifxmipsasc_start_tx(struct uart_port *port)
 {
        unsigned long flags;
 {
        unsigned long flags;
-
        local_irq_save(flags);
        ifxmipsasc_tx_chars(port);
        local_irq_restore(flags);
        local_irq_save(flags);
        ifxmipsasc_tx_chars(port);
        local_irq_restore(flags);
-
        return;
 }
 
 static void
        return;
 }
 
 static void
-ifxmipsasc_stop_rx (struct uart_port *port)
+ifxmipsasc_stop_rx(struct uart_port *port)
 {
 {
-       /* clear the RX enable bit */
-       writel(ASCWHBSTATE_CLRREN, IFXMIPS_ASC1_WHBSTATE);
+       ifxmips_w32(ASCWHBSTATE_CLRREN, port->membase + IFXMIPS_ASC_WHBSTATE);
 }
 
 static void
 }
 
 static void
-ifxmipsasc_enable_ms (struct uart_port *port)
+ifxmipsasc_enable_ms(struct uart_port *port)
 {
 {
-       /* no modem signals */
-       return;
 }
 
 static void
 }
 
 static void
-ifxmipsasc_rx_chars (struct uart_port *port)
+ifxmipsasc_rx_chars(struct uart_port *port)
 {
        struct tty_struct *tty = port->info->tty;
        unsigned int ch = 0, rsr = 0, fifocnt;
 
 {
        struct tty_struct *tty = port->info->tty;
        unsigned int ch = 0, rsr = 0, fifocnt;
 
-       fifocnt = readl(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_RXFFLMASK;
-       while (fifocnt--)
+       fifocnt = ifxmips_r32(port->membase + IFXMIPS_ASC_FSTAT) & ASCFSTAT_RXFFLMASK;
+       while(fifocnt--)
        {
                u8 flag = TTY_NORMAL;
        {
                u8 flag = TTY_NORMAL;
-               ch = readl(IFXMIPS_ASC1_RBUF);
-               rsr = (readl(IFXMIPS_ASC1_STATE) & ASCSTATE_ANY) | UART_DUMMY_UER_RX;
+               ch = ifxmips_r32(port->membase + IFXMIPS_ASC_RBUF);
+               rsr = (ifxmips_r32(port->membase + IFXMIPS_ASC_STATE) & ASCSTATE_ANY) | UART_DUMMY_UER_RX;
                tty_flip_buffer_push(tty);
                port->icount.rx++;
 
                tty_flip_buffer_push(tty);
                port->icount.rx++;
 
@@ -117,31 +107,35 @@ ifxmipsasc_rx_chars (struct uart_port *port)
                 * Note that the error handling code is
                 * out of the main execution path
                 */
                 * Note that the error handling code is
                 * out of the main execution path
                 */
-               if (rsr & ASCSTATE_ANY) {
-                       if (rsr & ASCSTATE_PE) {
+               if(rsr & ASCSTATE_ANY)
+               {
+                       if(rsr & ASCSTATE_PE)
+                       {
                                port->icount.parity++;
                                port->icount.parity++;
-                               writel(readl(IFXMIPS_ASC1_WHBSTATE) | ASCWHBSTATE_CLRPE, IFXMIPS_ASC1_WHBSTATE);
-                       } else if (rsr & ASCSTATE_FE) {
+                               ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_WHBSTATE) | ASCWHBSTATE_CLRPE, port->membase + IFXMIPS_ASC_WHBSTATE);
+                       } else if(rsr & ASCSTATE_FE)
+                       {
                                port->icount.frame++;
                                port->icount.frame++;
-                               writel(readl(IFXMIPS_ASC1_WHBSTATE) | ASCWHBSTATE_CLRFE, IFXMIPS_ASC1_WHBSTATE);
+                               ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_WHBSTATE) | ASCWHBSTATE_CLRFE, port->membase + IFXMIPS_ASC_WHBSTATE);
                        }
                        }
-                       if (rsr & ASCSTATE_ROE) {
+                       if(rsr & ASCSTATE_ROE)
+                       {
                                port->icount.overrun++;
                                port->icount.overrun++;
-                               writel(readl(IFXMIPS_ASC1_WHBSTATE) | ASCWHBSTATE_CLRROE, IFXMIPS_ASC1_WHBSTATE);
+                               ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_WHBSTATE) | ASCWHBSTATE_CLRROE, port->membase + IFXMIPS_ASC_WHBSTATE);
                        }
 
                        rsr &= port->read_status_mask;
 
                        }
 
                        rsr &= port->read_status_mask;
 
-                       if (rsr & ASCSTATE_PE)
+                       if(rsr & ASCSTATE_PE)
                                flag = TTY_PARITY;
                                flag = TTY_PARITY;
-                       else if (rsr & ASCSTATE_FE)
+                       else if(rsr & ASCSTATE_FE)
                                flag = TTY_FRAME;
                }
 
                                flag = TTY_FRAME;
                }
 
-               if ((rsr & port->ignore_status_mask) == 0)
+               if((rsr & port->ignore_status_mask) == 0)
                        tty_insert_flip_char(tty, ch, flag);
 
                        tty_insert_flip_char(tty, ch, flag);
 
-               if (rsr & ASCSTATE_ROE)
+               if(rsr & ASCSTATE_ROE)
                        /*
                         * Overrun is special, since it's reported
                         * immediately, and doesn't affect the current
                        /*
                         * Overrun is special, since it's reported
                         * immediately, and doesn't affect the current
@@ -149,189 +143,163 @@ ifxmipsasc_rx_chars (struct uart_port *port)
                         */
                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
        }
                         */
                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
        }
-       if (ch != 0)
+       if(ch != 0)
                tty_flip_buffer_push(tty);
                tty_flip_buffer_push(tty);
-
        return;
 }
 
 
 static void
        return;
 }
 
 
 static void
-ifxmipsasc_tx_chars (struct uart_port *port)
+ifxmipsasc_tx_chars(struct uart_port *port)
 {
        struct circ_buf *xmit = &port->info->xmit;
 {
        struct circ_buf *xmit = &port->info->xmit;
-
-       if (uart_tx_stopped(port)) {
+       if(uart_tx_stopped(port))
+       {
                ifxmipsasc_stop_tx(port);
                return;
        }
 
                ifxmipsasc_stop_tx(port);
                return;
        }
 
-       while(((readl(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK)
-                               >> ASCFSTAT_TXFFLOFF) != IFXMIPSASC_TXFIFO_FULL)
+       while(((ifxmips_r32(port->membase + IFXMIPS_ASC_FSTAT) & ASCFSTAT_TXFFLMASK)
+                               >> ASCFSTAT_TXFFLOFF) != TXFIFO_FULL)
        {
        {
-               if (port->x_char) {
-                       writel(port->x_char, IFXMIPS_ASC1_TBUF);
+               if(port->x_char)
+               {
+                       ifxmips_w32(port->x_char, port->membase + IFXMIPS_ASC_TBUF);
                        port->icount.tx++;
                        port->x_char = 0;
                        continue;
                }
 
                        port->icount.tx++;
                        port->x_char = 0;
                        continue;
                }
 
-               if (uart_circ_empty(xmit))
+               if(uart_circ_empty(xmit))
                        break;
 
                        break;
 
-               writel(port->info->xmit.buf[port->info->xmit.tail], IFXMIPS_ASC1_TBUF);
+               ifxmips_w32(port->info->xmit.buf[port->info->xmit.tail], port->membase + IFXMIPS_ASC_TBUF);
                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
                port->icount.tx++;
        }
 
                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
                port->icount.tx++;
        }
 
-       if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+       if(uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                uart_write_wakeup(port);
 }
 
 static irqreturn_t
                uart_write_wakeup(port);
 }
 
 static irqreturn_t
-ifxmipsasc_tx_int (int irq, void *port)
+ifxmipsasc_tx_int(int irq, void *_port)
 {
 {
-       writel(ASC_IRNCR_TIR, IFXMIPS_ASC1_IRNCR);
+       struct uart_port *port = (struct uart_port*) _port;
+       ifxmips_w32(ASC_IRNCR_TIR, port->membase + IFXMIPS_ASC_IRNCR);
        ifxmipsasc_start_tx(port);
        ifxmipsasc_start_tx(port);
-       mask_and_ack_ifxmips_irq(irq);
-
+       ifxmips_mask_and_ack_irq(irq);
        return IRQ_HANDLED;
 }
 
 static irqreturn_t
        return IRQ_HANDLED;
 }
 
 static irqreturn_t
-ifxmipsasc_er_int (int irq, void *port)
+ifxmipsasc_er_int(int irq, void *_port)
 {
 {
+       struct uart_port *port = (struct uart_port*) _port;
        /* clear any pending interrupts */
        /* clear any pending interrupts */
-       writel(readl(IFXMIPS_ASC1_WHBSTATE) | ASCWHBSTATE_CLRPE |
-                       ASCWHBSTATE_CLRFE | ASCWHBSTATE_CLRROE, IFXMIPS_ASC1_WHBSTATE);
-
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_WHBSTATE) | ASCWHBSTATE_CLRPE |
+                       ASCWHBSTATE_CLRFE | ASCWHBSTATE_CLRROE, port->membase + IFXMIPS_ASC_WHBSTATE);
        return IRQ_HANDLED;
 }
 
 static irqreturn_t
        return IRQ_HANDLED;
 }
 
 static irqreturn_t
-ifxmipsasc_rx_int (int irq, void *port)
+ifxmipsasc_rx_int(int irq, void *_port)
 {
 {
-       writel(ASC_IRNCR_RIR, IFXMIPS_ASC1_IRNCR);
-       ifxmipsasc_rx_chars((struct uart_port *) port);
-       mask_and_ack_ifxmips_irq(irq);
-
+       struct uart_port *port = (struct uart_port*)_port;
+       ifxmips_w32(ASC_IRNCR_RIR, port->membase + IFXMIPS_ASC_IRNCR);
+       ifxmipsasc_rx_chars((struct uart_port*)port);
+       ifxmips_mask_and_ack_irq(irq);
        return IRQ_HANDLED;
 }
 
 static unsigned int
        return IRQ_HANDLED;
 }
 
 static unsigned int
-ifxmipsasc_tx_empty (struct uart_port *port)
+ifxmipsasc_tx_empty(struct uart_port *port)
 {
        int status;
 {
        int status;
-
-       status = readl(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK;
-
+       status = ifxmips_r32(port->membase + IFXMIPS_ASC_FSTAT) & ASCFSTAT_TXFFLMASK;
        return status ? 0 : TIOCSER_TEMT;
 }
 
 static unsigned int
        return status ? 0 : TIOCSER_TEMT;
 }
 
 static unsigned int
-ifxmipsasc_get_mctrl (struct uart_port *port)
+ifxmipsasc_get_mctrl(struct uart_port *port)
 {
        return TIOCM_CTS | TIOCM_CAR | TIOCM_DSR;
 }
 
 static void
 {
        return TIOCM_CTS | TIOCM_CAR | TIOCM_DSR;
 }
 
 static void
-ifxmipsasc_set_mctrl (struct uart_port *port, u_int mctrl)
+ifxmipsasc_set_mctrl(struct uart_port *port, u_int mctrl)
 {
 {
-       return;
 }
 
 static void
 }
 
 static void
-ifxmipsasc_break_ctl (struct uart_port *port, int break_state)
+ifxmipsasc_break_ctl(struct uart_port *port, int break_state)
 {
 {
-       return;
-}
-
-static void
-ifxmipsasc1_hw_init (void)
-{
-       /* this setup was probably already done in ROM/u-boot  but we do it again*/
-       /* TODO: GPIO pins are multifunction */
-       writel(readl(IFXMIPS_ASC1_CLC) & ~IFXMIPS_ASC1_CLC_DISS, IFXMIPS_ASC1_CLC);
-       writel((readl(IFXMIPS_ASC1_CLC) & ~ASCCLC_RMCMASK) | (1 << ASCCLC_RMCOFFSET), IFXMIPS_ASC1_CLC);
-       writel(0, IFXMIPS_ASC1_PISEL);
-       writel(((IFXMIPSASC_TXFIFO_FL << ASCTXFCON_TXFITLOFF) &
-               ASCTXFCON_TXFITLMASK) | ASCTXFCON_TXFEN | ASCTXFCON_TXFFLU, IFXMIPS_ASC1_TXFCON);
-       writel(((IFXMIPSASC_RXFIFO_FL << ASCRXFCON_RXFITLOFF) &
-               ASCRXFCON_RXFITLMASK) | ASCRXFCON_RXFEN | ASCRXFCON_RXFFLU, IFXMIPS_ASC1_RXFCON);
-       wmb ();
-
-       /*framing, overrun, enable */
-       writel(readl(IFXMIPS_ASC1_CON) | ASCCON_M_8ASYNC | ASCCON_FEN | ASCCON_TOEN | ASCCON_ROEN,
-               IFXMIPS_ASC1_CON);
 }
 
 static int
 }
 
 static int
-ifxmipsasc_startup (struct uart_port *port)
+ifxmipsasc_startup(struct uart_port *port)
 {
        unsigned long flags;
        int retval;
 
 {
        unsigned long flags;
        int retval;
 
-       /* this assumes: CON.BRS = CON.FDE = 0 */
-       if (uartclk == 0)
-               uartclk = ifxmips_get_fpi_hz();
+       port->uartclk = ifxmips_get_fpi_hz();
 
 
-       ifxmipsasc_port.uartclk = uartclk;
-
-       ifxmipsasc1_hw_init();
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_CLC) & ~IFXMIPS_ASC_CLC_DISS, port->membase + IFXMIPS_ASC_CLC);
+       ifxmips_w32(((ifxmips_r32(port->membase + IFXMIPS_ASC_CLC) & ~ASCCLC_RMCMASK)) | (1 << ASCCLC_RMCOFFSET), port->membase + IFXMIPS_ASC_CLC);
+       ifxmips_w32(0, port->membase + IFXMIPS_ASC_PISEL);
+       ifxmips_w32(((TXFIFO_FL << ASCTXFCON_TXFITLOFF) & ASCTXFCON_TXFITLMASK) | ASCTXFCON_TXFEN | ASCTXFCON_TXFFLU, port->membase + IFXMIPS_ASC_TXFCON);
+       ifxmips_w32(((RXFIFO_FL << ASCRXFCON_RXFITLOFF) & ASCRXFCON_RXFITLMASK) | ASCRXFCON_RXFEN | ASCRXFCON_RXFFLU, port->membase + IFXMIPS_ASC_RXFCON);
+       wmb ();
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_CON) | ASCCON_M_8ASYNC | ASCCON_FEN | ASCCON_TOEN | ASCCON_ROEN, port->membase + IFXMIPS_ASC_CON);
 
        local_irq_save(flags);
 
 
        local_irq_save(flags);
 
-       retval = request_irq(IFXMIPSASC1_RIR, ifxmipsasc_rx_int, IRQF_DISABLED, "asc_rx", port);
-       if (retval){
-               printk("failed to request ifxmipsasc_rx_int\n");
+       retval = request_irq(port->irq, ifxmipsasc_tx_int, IRQF_DISABLED, "asc_tx", port);
+       if(retval)
+       {
+               printk("failed to request ifxmipsasc_tx_int\n");
                return retval;
        }
 
                return retval;
        }
 
-       retval = request_irq(IFXMIPSASC1_TIR, ifxmipsasc_tx_int, IRQF_DISABLED, "asc_tx", port);
-       if (retval){
-               printk("failed to request ifxmipsasc_tx_int\n");
+       retval = request_irq(port->irq + 2, ifxmipsasc_rx_int, IRQF_DISABLED, "asc_rx", port);
+       if(retval)
+       {
+               printk("failed to request ifxmipsasc_rx_int\n");
                goto err1;
        }
 
                goto err1;
        }
 
-       retval = request_irq(IFXMIPSASC1_EIR, ifxmipsasc_er_int, IRQF_DISABLED, "asc_er", port);
-       if (retval){
+       retval = request_irq(port->irq + 3, ifxmipsasc_er_int, IRQF_DISABLED, "asc_er", port);
+       if(retval)
+       {
                printk("failed to request ifxmipsasc_er_int\n");
                goto err2;
        }
 
                printk("failed to request ifxmipsasc_er_int\n");
                goto err2;
        }
 
-       writel(ASC_IRNREN_RX_BUF | ASC_IRNREN_TX_BUF | ASC_IRNREN_ERR | ASC_IRNREN_TX,
-               IFXMIPS_ASC1_IRNREN);
+       ifxmips_w32(ASC_IRNREN_RX_BUF | ASC_IRNREN_TX_BUF | ASC_IRNREN_ERR | ASC_IRNREN_TX, port->membase + IFXMIPS_ASC_IRNREN);
 
        local_irq_restore(flags);
 
        local_irq_restore(flags);
-
        return 0;
 
 err2:
        return 0;
 
 err2:
-       free_irq(IFXMIPSASC1_TIR, port);
-
+       free_irq(port->irq + 2, port);
 err1:
 err1:
-       free_irq(IFXMIPSASC1_RIR, port);
+       free_irq(port->irq, port);
        local_irq_restore(flags);
        local_irq_restore(flags);
-
        return retval;
 }
 
 static void
        return retval;
 }
 
 static void
-ifxmipsasc_shutdown (struct uart_port *port)
+ifxmipsasc_shutdown(struct uart_port *port)
 {
 {
-       free_irq(IFXMIPSASC1_RIR, port);
-       free_irq(IFXMIPSASC1_TIR, port);
-       free_irq(IFXMIPSASC1_EIR, port);
-       /*
-        * disable the baudrate generator to disable the ASC
-        */
-       writel(0, IFXMIPS_ASC1_CON);
-
-       /* flush and then disable the fifos */
-       writel(readl(IFXMIPS_ASC1_RXFCON) | ASCRXFCON_RXFFLU, IFXMIPS_ASC1_RXFCON);
-       writel(readl(IFXMIPS_ASC1_RXFCON) & ~ASCRXFCON_RXFEN, IFXMIPS_ASC1_RXFCON);
-       writel(readl(IFXMIPS_ASC1_TXFCON) | ASCTXFCON_TXFFLU, IFXMIPS_ASC1_TXFCON);
-       writel(readl(IFXMIPS_ASC1_TXFCON) & ~ASCTXFCON_TXFEN, IFXMIPS_ASC1_TXFCON);
+       free_irq(port->irq, port);
+       free_irq(port->irq + 2, port);
+       free_irq(port->irq + 3, port);
+
+       ifxmips_w32(0, port->membase + IFXMIPS_ASC_CON);
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_RXFCON) | ASCRXFCON_RXFFLU, port->membase + IFXMIPS_ASC_RXFCON);
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_RXFCON) & ~ASCRXFCON_RXFEN, port->membase + IFXMIPS_ASC_RXFCON);
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_TXFCON) | ASCTXFCON_TXFFLU, port->membase + IFXMIPS_ASC_TXFCON);
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_TXFCON) & ~ASCTXFCON_TXFEN, port->membase + IFXMIPS_ASC_TXFCON);
 }
 
 static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new, struct ktermios *old)
 }
 
 static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new, struct ktermios *old)
@@ -346,8 +314,8 @@ static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new,
        cflag = new->c_cflag;
        iflag = new->c_iflag;
 
        cflag = new->c_cflag;
        iflag = new->c_iflag;
 
-       /* byte size and parity */
-       switch (cflag & CSIZE) {
+       switch(cflag & CSIZE)
+       {
        case CS7:
                con = ASCCON_M_7ASYNC;
                break;
        case CS7:
                con = ASCCON_M_7ASYNC;
                break;
@@ -359,34 +327,36 @@ static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new,
                break;
        }
 
                break;
        }
 
-       if (cflag & CSTOPB)
+       if(cflag & CSTOPB)
                con |= ASCCON_STP;
 
                con |= ASCCON_STP;
 
-       if (cflag & PARENB) {
-               if (!(cflag & PARODD))
+       if(cflag & PARENB)
+       {
+               if(!(cflag & PARODD))
                        con &= ~ASCCON_ODD;
                else
                        con |= ASCCON_ODD;
        }
 
        port->read_status_mask = ASCSTATE_ROE;
                        con &= ~ASCCON_ODD;
                else
                        con |= ASCCON_ODD;
        }
 
        port->read_status_mask = ASCSTATE_ROE;
-       if (iflag & INPCK)
+       if(iflag & INPCK)
                port->read_status_mask |= ASCSTATE_FE | ASCSTATE_PE;
 
        port->ignore_status_mask = 0;
                port->read_status_mask |= ASCSTATE_FE | ASCSTATE_PE;
 
        port->ignore_status_mask = 0;
-       if (iflag & IGNPAR)
+       if(iflag & IGNPAR)
                port->ignore_status_mask |= ASCSTATE_FE | ASCSTATE_PE;
 
                port->ignore_status_mask |= ASCSTATE_FE | ASCSTATE_PE;
 
-       if (iflag & IGNBRK) {
+       if(iflag & IGNBRK)
+       {
                /*
                 * If we're ignoring parity and break indicators,
                 * ignore overruns too (for real raw support).
                 */
                /*
                 * If we're ignoring parity and break indicators,
                 * ignore overruns too (for real raw support).
                 */
-               if (iflag & IGNPAR)
+               if(iflag & IGNPAR)
                        port->ignore_status_mask |= ASCSTATE_ROE;
        }
 
                        port->ignore_status_mask |= ASCSTATE_ROE;
        }
 
-       if ((cflag & CREAD) == 0)
+       if((cflag & CREAD) == 0)
                port->ignore_status_mask |= UART_DUMMY_UER_RX;
 
        /* set error signals  - framing, parity  and overrun, enable receiver */
                port->ignore_status_mask |= UART_DUMMY_UER_RX;
 
        /* set error signals  - framing, parity  and overrun, enable receiver */
@@ -395,7 +365,7 @@ static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new,
        local_irq_save(flags);
 
        /* set up CON */
        local_irq_save(flags);
 
        /* set up CON */
-       writel(readl(IFXMIPS_ASC1_CON) | con, IFXMIPS_ASC1_CON);
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_CON) | con, port->membase + IFXMIPS_ASC_CON);
 
        /* Set baud rate - take a divider of 2 into account */
     baud = uart_get_baud_rate(port, new, old, 0, port->uartclk / 16);
 
        /* Set baud rate - take a divider of 2 into account */
     baud = uart_get_baud_rate(port, new, old, 0, port->uartclk / 16);
@@ -403,67 +373,76 @@ static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new,
        quot = quot / 2 - 1;
 
        /* disable the baudrate generator */
        quot = quot / 2 - 1;
 
        /* disable the baudrate generator */
-       writel(readl(IFXMIPS_ASC1_CON) & ~ASCCON_R, IFXMIPS_ASC1_CON);
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_CON) & ~ASCCON_R, port->membase + IFXMIPS_ASC_CON);
 
        /* make sure the fractional divider is off */
 
        /* make sure the fractional divider is off */
-       writel(readl(IFXMIPS_ASC1_CON) & ~ASCCON_FDE, IFXMIPS_ASC1_CON);
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_CON) & ~ASCCON_FDE, port->membase + IFXMIPS_ASC_CON);
 
        /* set up to use divisor of 2 */
 
        /* set up to use divisor of 2 */
-       writel(readl(IFXMIPS_ASC1_CON) & ~ASCCON_BRS, IFXMIPS_ASC1_CON);
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_CON) & ~ASCCON_BRS, port->membase + IFXMIPS_ASC_CON);
 
        /* now we can write the new baudrate into the register */
 
        /* now we can write the new baudrate into the register */
-       writel(quot, IFXMIPS_ASC1_BG);
+       ifxmips_w32(quot, port->membase + IFXMIPS_ASC_BG);
 
        /* turn the baudrate generator back on */
 
        /* turn the baudrate generator back on */
-       writel(readl(IFXMIPS_ASC1_CON) | ASCCON_R, IFXMIPS_ASC1_CON);
+       ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_CON) | ASCCON_R, port->membase + IFXMIPS_ASC_CON);
 
        /* enable rx */
 
        /* enable rx */
-       writel(ASCWHBSTATE_SETREN, IFXMIPS_ASC1_WHBSTATE);
+       ifxmips_w32(ASCWHBSTATE_SETREN, port->membase + IFXMIPS_ASC_WHBSTATE);
 
        local_irq_restore(flags);
 }
 
 static const char*
 
        local_irq_restore(flags);
 }
 
 static const char*
-ifxmipsasc_type (struct uart_port *port)
+ifxmipsasc_type(struct uart_port *port)
 {
 {
-       return port->type == PORT_IFXMIPSASC ? "IFXMIPSASC" : NULL;
+       if(port->type == PORT_IFXMIPSASC)
+       {
+               if(port->membase == (void*)IFXMIPS_ASC_BASE_ADDR)
+                       return "asc0";
+               else
+                       return "asc1";
+       } else {
+               return NULL;
+       }
 }
 
 static void
 }
 
 static void
-ifxmipsasc_release_port (struct uart_port *port)
+ifxmipsasc_release_port(struct uart_port *port)
 {
 {
-       return;
 }
 
 static int
 }
 
 static int
-ifxmipsasc_request_port (struct uart_port *port)
+ifxmipsasc_request_port(struct uart_port *port)
 {
        return 0;
 }
 
 static void
 {
        return 0;
 }
 
 static void
-ifxmipsasc_config_port (struct uart_port *port, int flags)
+ifxmipsasc_config_port(struct uart_port *port, int flags)
 {
 {
-       if (flags & UART_CONFIG_TYPE) {
+       if(flags & UART_CONFIG_TYPE)
+       {
                port->type = PORT_IFXMIPSASC;
                ifxmipsasc_request_port(port);
        }
 }
 
 static int
                port->type = PORT_IFXMIPSASC;
                ifxmipsasc_request_port(port);
        }
 }
 
 static int
-ifxmipsasc_verify_port (struct uart_port *port, struct serial_struct *ser)
+ifxmipsasc_verify_port(struct uart_port *port, struct serial_struct *ser)
 {
        int ret = 0;
 {
        int ret = 0;
-       if (ser->type != PORT_UNKNOWN && ser->type != PORT_IFXMIPSASC)
+       if(ser->type != PORT_UNKNOWN && ser->type != PORT_IFXMIPSASC)
                ret = -EINVAL;
                ret = -EINVAL;
-       if (ser->irq < 0 || ser->irq >= NR_IRQS)
+       if(ser->irq < 0 || ser->irq >= NR_IRQS)
                ret = -EINVAL;
                ret = -EINVAL;
-       if (ser->baud_base < 9600)
+       if(ser->baud_base < 9600)
                ret = -EINVAL;
        return ret;
 }
 
                ret = -EINVAL;
        return ret;
 }
 
-static struct uart_ops ifxmipsasc_pops = {
+static struct uart_ops ifxmipsasc_pops =
+{
        .tx_empty =             ifxmipsasc_tx_empty,
        .set_mctrl =    ifxmipsasc_set_mctrl,
        .get_mctrl =    ifxmipsasc_get_mctrl,
        .tx_empty =             ifxmipsasc_tx_empty,
        .set_mctrl =    ifxmipsasc_set_mctrl,
        .get_mctrl =    ifxmipsasc_get_mctrl,
@@ -482,120 +461,132 @@ static struct uart_ops ifxmipsasc_pops = {
        .verify_port =  ifxmipsasc_verify_port,
 };
 
        .verify_port =  ifxmipsasc_verify_port,
 };
 
-static struct uart_port ifxmipsasc_port = {
-               membase:        (void *)IFXMIPS_ASC1_BASE_ADDR,
-               mapbase:        IFXMIPS_ASC1_BASE_ADDR,
-               iotype:         SERIAL_IO_MEM,
-               irq:            IFXMIPSASC1_RIR,
-               uartclk:        0,
-               fifosize:       16,
-               unused:         {IFXMIPSASC1_TIR, IFXMIPSASC1_EIR},
-               type:           PORT_IFXMIPSASC,
-               ops:            &ifxmipsasc_pops,
-               flags:          ASYNC_BOOT_AUTOCONF,
+static struct uart_port ifxmipsasc_port[2] =
+{
+       {
+               membase:                (void *)IFXMIPS_ASC_BASE_ADDR,
+               mapbase:                IFXMIPS_ASC_BASE_ADDR,
+               iotype:                 SERIAL_IO_MEM,
+               irq:                    IFXMIPSASC_TIR(0),
+               uartclk:                0,
+               fifosize:               16,
+               type:                   PORT_IFXMIPSASC,
+               ops:                    &ifxmipsasc_pops,
+               flags:                  ASYNC_BOOT_AUTOCONF,
+               line:                   0
+       }, {
+               membase:                (void *)(IFXMIPS_ASC_BASE_ADDR + IFXMIPS_ASC_BASE_DIFF),
+               mapbase:                IFXMIPS_ASC_BASE_ADDR + IFXMIPS_ASC_BASE_DIFF,
+               iotype:                 SERIAL_IO_MEM,
+               irq:                    IFXMIPSASC_TIR(1),
+               uartclk:                0,
+               fifosize:               16,
+               type:                   PORT_IFXMIPSASC,
+               ops:                    &ifxmipsasc_pops,
+               flags:                  ASYNC_BOOT_AUTOCONF,
+               line:                   1
+       }
 };
 
 static void
 };
 
 static void
-ifxmipsasc_console_write (struct console *co, const char *s, u_int count)
+ifxmipsasc_console_write(struct console *co, const char *s, u_int count)
 {
 {
+       int port = co->index;
        int i, fifocnt;
        unsigned long flags;
        int i, fifocnt;
        unsigned long flags;
-
        local_irq_save(flags);
        local_irq_save(flags);
-       for (i = 0; i < count; i++)
+       for(i = 0; i < count; i++)
        {
        {
-               /* wait until the FIFO is not full */
-               do
-               {
-                       fifocnt = (readl(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK)
+               do {
+                       fifocnt = (ifxmips_r32((u32*)(IFXMIPS_ASC_BASE_ADDR + (port * IFXMIPS_ASC_BASE_DIFF) + IFXMIPS_ASC_FSTAT)) & ASCFSTAT_TXFFLMASK)
                                        >> ASCFSTAT_TXFFLOFF;
                                        >> ASCFSTAT_TXFFLOFF;
-               } while (fifocnt == IFXMIPSASC_TXFIFO_FULL);
+               } while(fifocnt == TXFIFO_FULL);
 
 
-               if (s[i] == '\0')
-               {
+               if(s[i] == '\0')
                        break;
                        break;
-               }
 
 
-               if (s[i] == '\n')
+               if(s[i] == '\n')
                {
                {
-                       writel('\r', IFXMIPS_ASC1_TBUF);
-                       do
-                       {
-                               fifocnt = (readl(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK)
+                       ifxmips_w32('\r', (u32*)(IFXMIPS_ASC_BASE_ADDR + (port * IFXMIPS_ASC_BASE_DIFF) + IFXMIPS_ASC_TBUF));
+                       do {
+                               fifocnt = (ifxmips_r32((u32*)(IFXMIPS_ASC_BASE_ADDR + (port * IFXMIPS_ASC_BASE_DIFF) + IFXMIPS_ASC_FSTAT)) & ASCFSTAT_TXFFLMASK)
                                        >> ASCFSTAT_TXFFLOFF;
                                        >> ASCFSTAT_TXFFLOFF;
-                       } while (fifocnt == IFXMIPSASC_TXFIFO_FULL);
+                       } while(fifocnt == TXFIFO_FULL);
                }
                }
-               writel(s[i], IFXMIPS_ASC1_TBUF);
+               ifxmips_w32(s[i], (u32*)(IFXMIPS_ASC_BASE_ADDR + (port * IFXMIPS_ASC_BASE_DIFF) + IFXMIPS_ASC_TBUF));
        }
 
        local_irq_restore(flags);
 }
 
 static int __init
        }
 
        local_irq_restore(flags);
 }
 
 static int __init
-ifxmipsasc_console_setup (struct console *co, char *options)
+ifxmipsasc_console_setup(struct console *co, char *options)
 {
 {
-       struct uart_port *port;
+       int port = co->index;
        int baud = 115200;
        int bits = 8;
        int parity = 'n';
        int flow = 'n';
        int baud = 115200;
        int bits = 8;
        int parity = 'n';
        int flow = 'n';
-
-       if (uartclk == 0)
-               uartclk = ifxmips_get_fpi_hz();
-       co->index = 0;
-       port = &ifxmipsasc_port;
-       ifxmipsasc_port.uartclk = uartclk;
-       ifxmipsasc_port.type = PORT_IFXMIPSASC;
-
-       if (options){
+       ifxmipsasc_port[port].uartclk = ifxmips_get_fpi_hz();
+       ifxmipsasc_port[port].type = PORT_IFXMIPSASC;
+       if(options)
                uart_parse_options(options, &baud, &parity, &bits, &flow);
                uart_parse_options(options, &baud, &parity, &bits, &flow);
-       }
-
-       return uart_set_options(port, co, baud, parity, bits, flow);
+       return uart_set_options(&ifxmipsasc_port[port], co, baud, parity, bits, flow);
 }
 
 }
 
-static struct uart_driver ifxmipsasc_reg;
-static struct console ifxmipsasc_console = {
-       name:           "ttyS",
-       write:          ifxmipsasc_console_write,
-       device:         uart_console_device,
-       setup:          ifxmipsasc_console_setup,
-       flags:          CON_PRINTBUFFER,
-       index:          -1,
-       data:           &ifxmipsasc_reg,
+static struct console ifxmipsasc_console[2] =
+{
+       {
+               name:           "ttyS",
+               write:          ifxmipsasc_console_write,
+               device:         uart_console_device,
+               setup:          ifxmipsasc_console_setup,
+               flags:          CON_PRINTBUFFER,
+               index:          0,
+               data:           &ifxmipsasc_reg,
+       }, {
+               name:           "ttyS",
+               write:          ifxmipsasc_console_write,
+               device:         uart_console_device,
+               setup:          ifxmipsasc_console_setup,
+               flags:          CON_PRINTBUFFER,
+               index:          1,
+               data:           &ifxmipsasc_reg,
+       }
 };
 
 static int __init
 };
 
 static int __init
-ifxmipsasc_console_init (void)
+ifxmipsasc_console_init(void)
 {
 {
-       register_console(&ifxmipsasc_console);
+       register_console(&ifxmipsasc_console[0]);
+       register_console(&ifxmipsasc_console[1]);
        return 0;
 }
 console_initcall(ifxmipsasc_console_init);
 
        return 0;
 }
 console_initcall(ifxmipsasc_console_init);
 
-static struct uart_driver ifxmipsasc_reg = {
+static struct uart_driver ifxmipsasc_reg =
+{
        .owner =                        THIS_MODULE,
        .driver_name =          "serial",
        .dev_name =                     "ttyS",
        .major =                        TTY_MAJOR,
        .minor =                        64,
        .owner =                        THIS_MODULE,
        .driver_name =          "serial",
        .dev_name =                     "ttyS",
        .major =                        TTY_MAJOR,
        .minor =                        64,
-       .nr =                           1,
-       .cons =                         &ifxmipsasc_console,
+       .nr =                           2,
+       .cons =                         &ifxmipsasc_console[1],
 };
 
 };
 
-static int __init
-ifxmipsasc_init (void)
+int __init
+ifxmipsasc_init(void)
 {
 {
-       unsigned char res;
-
+       int ret;
        uart_register_driver(&ifxmipsasc_reg);
        uart_register_driver(&ifxmipsasc_reg);
-       res = uart_add_one_port(&ifxmipsasc_reg, &ifxmipsasc_port);
-
-       return res;
+       ret = uart_add_one_port(&ifxmipsasc_reg, &ifxmipsasc_port[0]);
+       ret = uart_add_one_port(&ifxmipsasc_reg, &ifxmipsasc_port[1]);
+       return 0;
 }
 
 }
 
-static void __exit
-ifxmipsasc_exit (void)
+void __exit
+ifxmipsasc_exit(void)
 {
        uart_unregister_driver(&ifxmipsasc_reg);
 }
 {
        uart_unregister_driver(&ifxmipsasc_reg);
 }
Personal OpenWRT clone
This page took 0.051759 seconds and 4 git commands to generate.