X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/20abafaaf5fdb4dd7cb1e09a028b1c2c689557b7..0a546c31b26044b1b6ad50307213c1d099b45def:/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c?ds=sidebyside diff --git a/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c b/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c index b191241db..d6bf1803f 100644 --- 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 @@ -43,14 +41,15 @@ #include #include #include +#include +#include +#include +#include #include -#include -#include -#include + #include #include -#include #define PORT_IFXMIPSASC 111 @@ -59,57 +58,50 @@ #define UART_DUMMY_UER_RX 1 static void ifxmipsasc_tx_chars(struct uart_port *port); -extern void prom_printf(const char * fmt, ...); -static struct uart_port ifxmipsasc_port; +extern void prom_printf(const char *fmt, ...); +static struct uart_port ifxmipsasc_port[2]; static struct uart_driver ifxmipsasc_reg; -static unsigned int uartclk = 0; extern unsigned int ifxmips_get_fpi_hz(void); -static void -ifxmipsasc_stop_tx (struct uart_port *port) +static void ifxmipsasc_stop_tx(struct uart_port *port) { - /* fifo underrun shuts up after firing once */ return; } -static void -ifxmipsasc_start_tx (struct uart_port *port) +static void ifxmipsasc_start_tx(struct uart_port *port) { unsigned long flags; - local_irq_save(flags); ifxmipsasc_tx_chars(port); local_irq_restore(flags); - return; } -static void -ifxmipsasc_stop_rx (struct uart_port *port) +static void 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 -ifxmipsasc_enable_ms (struct uart_port *port) +static void ifxmipsasc_enable_ms(struct uart_port *port) { - /* no modem signals */ - return; } -static void -ifxmipsasc_rx_chars (struct uart_port *port) +#include + +static void ifxmipsasc_rx_chars(struct uart_port *port) { +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 26)) + struct tty_struct *tty = port->info->port.tty; +#else struct tty_struct *tty = port->info->tty; +#endif 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; - 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++; @@ -120,14 +112,14 @@ ifxmipsasc_rx_chars (struct uart_port *port) if (rsr & ASCSTATE_ANY) { if (rsr & ASCSTATE_PE) { port->icount.parity++; - writel(readl(IFXMIPS_ASC1_WHBSTATE) | ASCWHBSTATE_CLRPE, IFXMIPS_ASC1_WHBSTATE); + ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_WHBSTATE) | ASCWHBSTATE_CLRPE, port->membase + IFXMIPS_ASC_WHBSTATE); } else if (rsr & ASCSTATE_FE) { 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) { 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; @@ -151,26 +143,22 @@ ifxmipsasc_rx_chars (struct uart_port *port) } if (ch != 0) tty_flip_buffer_push(tty); - return; } -static void -ifxmipsasc_tx_chars (struct uart_port *port) +static void ifxmipsasc_tx_chars(struct uart_port *port) { struct circ_buf *xmit = &port->info->xmit; - if (uart_tx_stopped(port)) { 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); + ifxmips_w32(port->x_char, port->membase + IFXMIPS_ASC_TBUF); port->icount.tx++; port->x_char = 0; continue; @@ -179,7 +167,7 @@ ifxmipsasc_tx_chars (struct uart_port *port) if (uart_circ_empty(xmit)) 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++; } @@ -188,150 +176,112 @@ ifxmipsasc_tx_chars (struct uart_port *port) uart_write_wakeup(port); } -static irqreturn_t -ifxmipsasc_tx_int (int irq, void *port) +static irqreturn_t 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); - mask_and_ack_ifxmips_irq(irq); - + ifxmips_mask_and_ack_irq(irq); return IRQ_HANDLED; } -static irqreturn_t -ifxmipsasc_er_int (int irq, void *port) +static irqreturn_t ifxmipsasc_er_int(int irq, void *_port) { + struct uart_port *port = (struct uart_port *)_port; /* 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 -ifxmipsasc_rx_int (int irq, void *port) +static irqreturn_t 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 -ifxmipsasc_tx_empty (struct uart_port *port) +static unsigned int ifxmipsasc_tx_empty(struct uart_port *port) { 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 -ifxmipsasc_get_mctrl (struct uart_port *port) +static unsigned int ifxmipsasc_get_mctrl(struct uart_port *port) { return TIOCM_CTS | TIOCM_CAR | TIOCM_DSR; } -static void -ifxmipsasc_set_mctrl (struct uart_port *port, u_int mctrl) +static void ifxmipsasc_set_mctrl(struct uart_port *port, u_int mctrl) { - return; } -static void -ifxmipsasc_break_ctl (struct uart_port *port, int break_state) +static void 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 -ifxmipsasc_startup (struct uart_port *port) +static int ifxmipsasc_startup(struct uart_port *port) { 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); - 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(KERN_ERR "failed to request ifxmipsasc_tx_int\n"); 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(KERN_ERR "failed to request ifxmipsasc_rx_int\n"); goto err1; } - retval = request_irq(IFXMIPSASC1_EIR, ifxmipsasc_er_int, IRQF_DISABLED, "asc_er", port); - if (retval){ - printk("failed to request ifxmipsasc_er_int\n"); + retval = request_irq(port->irq + 3, ifxmipsasc_er_int, IRQF_DISABLED, "asc_er", port); + if (retval) { + printk(KERN_ERR "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); - return 0; err2: - free_irq(IFXMIPSASC1_TIR, port); - + free_irq(port->irq + 2, port); err1: - free_irq(IFXMIPSASC1_RIR, port); + free_irq(port->irq, port); local_irq_restore(flags); - return retval; } -static void -ifxmipsasc_shutdown (struct uart_port *port) +static void 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) @@ -346,7 +296,6 @@ static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new, cflag = new->c_cflag; iflag = new->c_iflag; - /* byte size and parity */ switch (cflag & CSIZE) { case CS7: con = ASCCON_M_7ASYNC; @@ -395,54 +344,56 @@ static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new, 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); + baud = uart_get_baud_rate(port, new, old, 0, port->uartclk / 16); quot = uart_get_divisor(port, baud); 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 */ - 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 */ - 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 */ - writel(quot, IFXMIPS_ASC1_BG); + ifxmips_w32(quot, port->membase + IFXMIPS_ASC_BG); /* 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 */ - writel(ASCWHBSTATE_SETREN, IFXMIPS_ASC1_WHBSTATE); + ifxmips_w32(ASCWHBSTATE_SETREN, port->membase + IFXMIPS_ASC_WHBSTATE); local_irq_restore(flags); } -static const char* -ifxmipsasc_type (struct uart_port *port) +static const char *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 -ifxmipsasc_release_port (struct uart_port *port) +static void ifxmipsasc_release_port(struct uart_port *port) { - return; } -static int -ifxmipsasc_request_port (struct uart_port *port) +static int ifxmipsasc_request_port(struct uart_port *port) { return 0; } -static void -ifxmipsasc_config_port (struct uart_port *port, int flags) +static void ifxmipsasc_config_port(struct uart_port *port, int flags) { if (flags & UART_CONFIG_TYPE) { port->type = PORT_IFXMIPSASC; @@ -450,8 +401,7 @@ ifxmipsasc_config_port (struct uart_port *port, int flags) } } -static int -ifxmipsasc_verify_port (struct uart_port *port, struct serial_struct *ser) +static int ifxmipsasc_verify_port(struct uart_port *port, struct serial_struct *ser) { int ret = 0; if (ser->type != PORT_UNKNOWN && ser->type != PORT_IFXMIPSASC) @@ -464,138 +414,141 @@ ifxmipsasc_verify_port (struct uart_port *port, struct serial_struct *ser) } static struct uart_ops ifxmipsasc_pops = { - .tx_empty = ifxmipsasc_tx_empty, + .tx_empty = ifxmipsasc_tx_empty, .set_mctrl = ifxmipsasc_set_mctrl, .get_mctrl = ifxmipsasc_get_mctrl, - .stop_tx = ifxmipsasc_stop_tx, - .start_tx = ifxmipsasc_start_tx, - .stop_rx = ifxmipsasc_stop_rx, + .stop_tx = ifxmipsasc_stop_tx, + .start_tx = ifxmipsasc_start_tx, + .stop_rx = ifxmipsasc_stop_rx, .enable_ms = ifxmipsasc_enable_ms, .break_ctl = ifxmipsasc_break_ctl, - .startup = ifxmipsasc_startup, - .shutdown = ifxmipsasc_shutdown, + .startup = ifxmipsasc_startup, + .shutdown = ifxmipsasc_shutdown, .set_termios = ifxmipsasc_set_termios, - .type = ifxmipsasc_type, + .type = ifxmipsasc_type, .release_port = ifxmipsasc_release_port, .request_port = ifxmipsasc_request_port, .config_port = ifxmipsasc_config_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 -ifxmipsasc_console_write (struct console *co, const char *s, u_int count) +static void ifxmipsasc_console_write(struct console *co, const char *s, u_int count) { + int port = co->index; int i, fifocnt; unsigned long flags; - local_irq_save(flags); - for (i = 0; i < count; i++) - { - /* wait until the FIFO is not full */ - do - { - fifocnt = (readl(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) - >> ASCFSTAT_TXFFLOFF; - } while (fifocnt == IFXMIPSASC_TXFIFO_FULL); + for (i = 0; i < count; i++) { + do { + fifocnt = (ifxmips_r32((u32 *)(IFXMIPS_ASC_BASE_ADDR + (port * IFXMIPS_ASC_BASE_DIFF) + IFXMIPS_ASC_FSTAT)) & ASCFSTAT_TXFFLMASK) + >> ASCFSTAT_TXFFLOFF; + } while (fifocnt == TXFIFO_FULL); if (s[i] == '\0') - { break; - } - if (s[i] == '\n') - { - writel('\r', IFXMIPS_ASC1_TBUF); - do - { - fifocnt = (readl(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) + if (s[i] == '\n') { + 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; - } 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 -ifxmipsasc_console_setup (struct console *co, char *options) +static int __init 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'; - - 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); - } - - 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 -ifxmipsasc_console_init (void) +static int __init 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); static struct uart_driver ifxmipsasc_reg = { - .owner = THIS_MODULE, - .driver_name = "serial", - .dev_name = "ttyS", - .major = TTY_MAJOR, - .minor = 64, - .nr = 1, - .cons = &ifxmipsasc_console, + .owner = THIS_MODULE, + .driver_name = "serial", + .dev_name = "ttyS", + .major = TTY_MAJOR, + .minor = 64, + .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); - 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); }