From: John Crispin Date: Wed, 25 Jun 2008 23:05:50 +0000 (+0000) Subject: cleanup ifxmips and add support for both ttyS X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2cc35a5235309eac4dc1feb1fff342e5db1a1e94;p=openwrt%2Fstaging%2Fsvanheule.git cleanup ifxmips and add support for both ttyS SVN-Revision: 11578 --- diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c index 010d488ae4..95630ae368 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c @@ -26,6 +26,18 @@ static char buf[1024]; unsigned int *prom_cp1_base = NULL; unsigned int prom_cp1_size = 0; +static inline u32 +asc_r32(unsigned long r) +{ + return ifxmips_r32((u32*)(IFXMIPS_ASC_BASE_ADDR + IFXMIPS_ASC_BASE_DIFF + r)); +} + +static inline void +asc_w32(u32 v, unsigned long r) +{ + ifxmips_w32(v, (u32*)(IFXMIPS_ASC_BASE_ADDR + IFXMIPS_ASC_BASE_DIFF + r)); +} + void prom_free_prom_memory(void) { @@ -34,11 +46,15 @@ prom_free_prom_memory(void) void prom_putchar(char c) { - while((ifxmips_r32(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF); + unsigned long flags; + + local_irq_save(flags); + while((asc_r32(IFXMIPS_ASC_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF); if(c == '\n') - ifxmips_w32('\r', IFXMIPS_ASC1_TBUF); - ifxmips_w32(c, IFXMIPS_ASC1_TBUF); + asc_w32('\r', IFXMIPS_ASC_TBUF); + asc_w32(c, IFXMIPS_ASC_TBUF); + local_irq_restore(flags); } void diff --git a/target/linux/ifxmips/files/drivers/char/ifxmips_led.c b/target/linux/ifxmips/files/drivers/char/ifxmips_led.c index 40d2c96f69..090516c5ad 100644 --- a/target/linux/ifxmips/files/drivers/char/ifxmips_led.c +++ b/target/linux/ifxmips/files/drivers/char/ifxmips_led.c @@ -147,7 +147,7 @@ ifxmips_led_probe(struct platform_device *dev) struct ifxmips_led *tmp = kzalloc(sizeof(struct ifxmips_led), GFP_KERNEL); tmp->cdev.brightness_set = ifxmips_ledapi_set; tmp->cdev.name = kmalloc(sizeof("ifxmips:led:00"), GFP_KERNEL); - sprintf(tmp->cdev.name, "ifxmips:led:%02d", i); + sprintf((char*)tmp->cdev.name, "ifxmips:led:%02d", i); tmp->cdev.default_trigger = NULL; tmp->bit = i; led_classdev_register(&dev->dev, &tmp->cdev); diff --git a/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c b/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c index d4219925fa..63a4c2af9e 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 @@ -60,56 +58,50 @@ 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 unsigned int uartclk = 0; 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 -ifxmipsasc_start_tx (struct uart_port *port) +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) +ifxmipsasc_stop_rx(struct uart_port *port) { - /* clear the RX enable bit */ - ifxmips_w32(ASCWHBSTATE_CLRREN, IFXMIPS_ASC1_WHBSTATE); + ifxmips_w32(ASCWHBSTATE_CLRREN, port->membase + IFXMIPS_ASC_WHBSTATE); } static void -ifxmipsasc_enable_ms (struct uart_port *port) +ifxmipsasc_enable_ms(struct uart_port *port) { - /* no modem signals */ - return; } 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; - fifocnt = ifxmips_r32(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_RXFFLMASK; - while (fifocnt--) + fifocnt = ifxmips_r32(port->membase + IFXMIPS_ASC_FSTAT) & ASCFSTAT_RXFFLMASK; + while(fifocnt--) { u8 flag = TTY_NORMAL; - ch = ifxmips_r32(IFXMIPS_ASC1_RBUF); - rsr = (ifxmips_r32(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++; @@ -117,31 +109,35 @@ ifxmipsasc_rx_chars (struct uart_port *port) * 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++; - ifxmips_w32(ifxmips_r32(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++; - ifxmips_w32(ifxmips_r32(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++; - ifxmips_w32(ifxmips_r32(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; - if (rsr & ASCSTATE_PE) + if(rsr & ASCSTATE_PE) flag = TTY_PARITY; - else if (rsr & ASCSTATE_FE) + else if(rsr & ASCSTATE_FE) flag = TTY_FRAME; } - if ((rsr & port->ignore_status_mask) == 0) + if((rsr & port->ignore_status_mask) == 0) 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 @@ -149,189 +145,167 @@ ifxmipsasc_rx_chars (struct uart_port *port) */ tty_insert_flip_char(tty, 0, TTY_OVERRUN); } - if (ch != 0) + if(ch != 0) tty_flip_buffer_push(tty); - return; } static void -ifxmipsasc_tx_chars (struct uart_port *port) +ifxmipsasc_tx_chars(struct uart_port *port) { struct circ_buf *xmit = &port->info->xmit; - if (uart_tx_stopped(port)) { + if(uart_tx_stopped(port)) + { ifxmipsasc_stop_tx(port); return; } - while(((ifxmips_r32(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) + while(((ifxmips_r32(port->membase + IFXMIPS_ASC_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF) != IFXMIPSASC_TXFIFO_FULL) { - if (port->x_char) { - ifxmips_w32(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; } - if (uart_circ_empty(xmit)) + if(uart_circ_empty(xmit)) break; - ifxmips_w32(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++; } - if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) + if(uart_circ_chars_pending(xmit) < WAKEUP_CHARS) uart_write_wakeup(port); } static irqreturn_t -ifxmipsasc_tx_int (int irq, void *port) +ifxmipsasc_tx_int(int irq, void *_port) { - ifxmips_w32(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); ifxmips_mask_and_ack_irq(irq); - 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 */ - ifxmips_w32(ifxmips_r32(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) +ifxmipsasc_rx_int(int irq, void *_port) { - ifxmips_w32(ASC_IRNCR_RIR, IFXMIPS_ASC1_IRNCR); - ifxmipsasc_rx_chars((struct uart_port *) port); + 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) +ifxmipsasc_tx_empty(struct uart_port *port) { int status; - - status = ifxmips_r32(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) +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) -{ - return; -} - -static void -ifxmipsasc_break_ctl (struct uart_port *port, int break_state) +ifxmipsasc_set_mctrl(struct uart_port *port, u_int mctrl) { - return; } static void -ifxmipsasc1_hw_init (void) +ifxmipsasc_break_ctl(struct uart_port *port, int break_state) { - /* this setup was probably already done in ROM/u-boot but we do it again*/ - /* TODO: GPIO pins are multifunction */ - ifxmips_w32(ifxmips_r32(IFXMIPS_ASC1_CLC) & ~IFXMIPS_ASC1_CLC_DISS, IFXMIPS_ASC1_CLC); - ifxmips_w32((ifxmips_r32(IFXMIPS_ASC1_CLC) & ~ASCCLC_RMCMASK) | (1 << ASCCLC_RMCOFFSET), IFXMIPS_ASC1_CLC); - ifxmips_w32(0, IFXMIPS_ASC1_PISEL); - ifxmips_w32(((IFXMIPSASC_TXFIFO_FL << ASCTXFCON_TXFITLOFF) & - ASCTXFCON_TXFITLMASK) | ASCTXFCON_TXFEN | ASCTXFCON_TXFFLU, IFXMIPS_ASC1_TXFCON); - ifxmips_w32(((IFXMIPSASC_RXFIFO_FL << ASCRXFCON_RXFITLOFF) & - ASCRXFCON_RXFITLMASK) | ASCRXFCON_RXFEN | ASCRXFCON_RXFFLU, IFXMIPS_ASC1_RXFCON); - wmb (); - - /*framing, overrun, enable */ - ifxmips_w32(ifxmips_r32(IFXMIPS_ASC1_CON) | ASCCON_M_8ASYNC | ASCCON_FEN | ASCCON_TOEN | ASCCON_ROEN, - IFXMIPS_ASC1_CON); } static int -ifxmipsasc_startup (struct uart_port *port) +ifxmipsasc_startup(struct uart_port *port) { unsigned long flags; int retval; - /* this assumes: CON.BRS = CON.FDE = 0 */ - if (uartclk == 0) + if(uartclk == 0) uartclk = ifxmips_get_fpi_hz(); - ifxmipsasc_port.uartclk = uartclk; + 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(((IFXMIPSASC_TXFIFO_FL << ASCTXFCON_TXFITLOFF) & ASCTXFCON_TXFITLMASK) | ASCTXFCON_TXFEN | ASCTXFCON_TXFFLU, port->membase + IFXMIPS_ASC_TXFCON); + ifxmips_w32(((IFXMIPSASC_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){ + retval = request_irq(port->irq, ifxmipsasc_rx_int, IRQF_DISABLED, "asc_rx", port); + if(retval) + { printk("failed to request ifxmipsasc_rx_int\n"); return retval; } - retval = request_irq(IFXMIPSASC1_TIR, ifxmipsasc_tx_int, IRQF_DISABLED, "asc_tx", port); - if (retval){ + retval = request_irq(port->irq + 2, ifxmipsasc_tx_int, IRQF_DISABLED, "asc_tx", port); + if(retval) + { printk("failed to request ifxmipsasc_tx_int\n"); 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; } - ifxmips_w32(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) +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 - */ - ifxmips_w32(0, IFXMIPS_ASC1_CON); - - /* flush and then disable the fifos */ - ifxmips_w32(ifxmips_r32(IFXMIPS_ASC1_RXFCON) | ASCRXFCON_RXFFLU, IFXMIPS_ASC1_RXFCON); - ifxmips_w32(ifxmips_r32(IFXMIPS_ASC1_RXFCON) & ~ASCRXFCON_RXFEN, IFXMIPS_ASC1_RXFCON); - ifxmips_w32(ifxmips_r32(IFXMIPS_ASC1_TXFCON) | ASCTXFCON_TXFFLU, IFXMIPS_ASC1_TXFCON); - ifxmips_w32(ifxmips_r32(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,8 +320,8 @@ 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) { + switch(cflag & CSIZE) + { case CS7: con = ASCCON_M_7ASYNC; break; @@ -359,34 +333,36 @@ static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new, break; } - if (cflag & CSTOPB) + if(cflag & CSTOPB) 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; - if (iflag & INPCK) + if(iflag & INPCK) 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; - if (iflag & IGNBRK) { + if(iflag & IGNBRK) + { /* * 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; } - 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 */ @@ -395,7 +371,7 @@ static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new, local_irq_save(flags); /* set up CON */ - ifxmips_w32(ifxmips_r32(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); @@ -403,67 +379,68 @@ static void ifxmipsasc_set_termios(struct uart_port *port, struct ktermios *new, quot = quot / 2 - 1; /* disable the baudrate generator */ - ifxmips_w32(ifxmips_r32(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 */ - ifxmips_w32(ifxmips_r32(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 */ - ifxmips_w32(ifxmips_r32(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 */ - ifxmips_w32(quot, IFXMIPS_ASC1_BG); + ifxmips_w32(quot, port->membase + IFXMIPS_ASC_BG); /* turn the baudrate generator back on */ - ifxmips_w32(ifxmips_r32(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 */ - ifxmips_w32(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) +ifxmipsasc_type(struct uart_port *port) { return port->type == PORT_IFXMIPSASC ? "IFXMIPSASC" : NULL; } static void -ifxmipsasc_release_port (struct uart_port *port) +ifxmipsasc_release_port(struct uart_port *port) { - return; } static int -ifxmipsasc_request_port (struct uart_port *port) +ifxmipsasc_request_port(struct uart_port *port) { 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 -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; - if (ser->type != PORT_UNKNOWN && ser->type != PORT_IFXMIPSASC) + if(ser->type != PORT_UNKNOWN && ser->type != PORT_IFXMIPSASC) ret = -EINVAL; - if (ser->irq < 0 || ser->irq >= NR_IRQS) + if(ser->irq < 0 || ser->irq >= NR_IRQS) ret = -EINVAL; - if (ser->baud_base < 9600) + if(ser->baud_base < 9600) 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, @@ -482,57 +459,67 @@ static struct uart_ops ifxmipsasc_pops = { .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_RIR(0), + uartclk: 0, + fifosize: 16, + type: PORT_IFXMIPSASC, + ops: &ifxmipsasc_pops, + flags: ASYNC_BOOT_AUTOCONF, + }, { + 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_RIR(1), + uartclk: 0, + fifosize: 16, + type: PORT_IFXMIPSASC, + ops: &ifxmipsasc_pops, + flags: ASYNC_BOOT_AUTOCONF, + } }; 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 i, fifocnt; unsigned long 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 = (ifxmips_r32(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) + fifocnt = (ifxmips_r32((u32*)(IFXMIPS_ASC_BASE_ADDR + (co->index * IFXMIPS_ASC_BASE_DIFF) + IFXMIPS_ASC_FSTAT)) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF; - } while (fifocnt == IFXMIPSASC_TXFIFO_FULL); + }while(fifocnt == IFXMIPSASC_TXFIFO_FULL); - if (s[i] == '\0') - { + if(s[i] == '\0') break; - } - if (s[i] == '\n') + if(s[i] == '\n') { - ifxmips_w32('\r', IFXMIPS_ASC1_TBUF); + ifxmips_w32('\r', (u32*)(IFXMIPS_ASC_BASE_ADDR + (co->index * IFXMIPS_ASC_BASE_DIFF) + IFXMIPS_ASC_TBUF)); do { - fifocnt = (ifxmips_r32(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) + fifocnt = (ifxmips_r32((u32*)(IFXMIPS_ASC_BASE_ADDR + (co->index * IFXMIPS_ASC_BASE_DIFF) + IFXMIPS_ASC_FSTAT)) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF; - } while (fifocnt == IFXMIPSASC_TXFIFO_FULL); + } while(fifocnt == IFXMIPSASC_TXFIFO_FULL); } - ifxmips_w32(s[i], IFXMIPS_ASC1_TBUF); + ifxmips_w32(s[i], (u32*)(IFXMIPS_ASC_BASE_ADDR + (co->index * IFXMIPS_ASC_BASE_DIFF) + IFXMIPS_ASC_TBUF)); } 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 baud = 115200; @@ -540,62 +527,74 @@ ifxmipsasc_console_setup (struct console *co, char *options) int parity = 'n'; int flow = 'n'; - if (uartclk == 0) + if(uartclk == 0) uartclk = ifxmips_get_fpi_hz(); co->index = 0; - port = &ifxmipsasc_port; - ifxmipsasc_port.uartclk = uartclk; - ifxmipsasc_port.type = PORT_IFXMIPSASC; + port = &ifxmipsasc_port[co->index]; + ifxmipsasc_port[co->index].uartclk = uartclk; + ifxmipsasc_port[co->index].type = PORT_IFXMIPSASC; - if (options){ + if(options) uart_parse_options(options, &baud, &parity, &bits, &flow); - } return uart_set_options(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) +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 = { +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, + .nr = 2, + .cons = ifxmipsasc_console, }; static int __init -ifxmipsasc_init (void) +ifxmipsasc_init(void) { unsigned char res; uart_register_driver(&ifxmipsasc_reg); - res = uart_add_one_port(&ifxmipsasc_reg, &ifxmipsasc_port); + res = uart_add_one_port(&ifxmipsasc_reg, &ifxmipsasc_port[0]); + res = uart_add_one_port(&ifxmipsasc_reg, &ifxmipsasc_port[1]); return res; } static void __exit -ifxmipsasc_exit (void) +ifxmipsasc_exit(void) { uart_unregister_driver(&ifxmipsasc_reg); } diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h index a2efc78839..7966b13c07 100644 --- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h +++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h @@ -38,17 +38,31 @@ /*------------ ASC1 */ -#define IFXMIPS_ASC1_BASE_ADDR (KSEG1 + 0x1E100C00) - -/* FIFO status register */ -#define IFXMIPS_ASC1_FSTAT ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0048)) -#define ASCFSTAT_TXFFLMASK 0x3F00 -#define ASCFSTAT_TXFFLOFF 8 - -/* ASC1 transmit buffer */ -#define IFXMIPS_ASC1_TBUF ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0020)) - -/* channel operating modes */ +#define IFXMIPS_ASC_BASE_ADDR (KSEG1 + 0x1E100400) +#define IFXMIPS_ASC_BASE_DIFF (0x1E100C00 - 0x1E100400) + +#define IFXMIPS_ASC_FSTAT 0x0048 +#define IFXMIPS_ASC_TBUF 0x0020 +#define IFXMIPS_ASC_WHBSTATE 0x0018 +#define IFXMIPS_ASC_RBUF 0x0024 +#define IFXMIPS_ASC_STATE 0x0014 +#define IFXMIPS_ASC_IRNCR 0x00F8 +#define IFXMIPS_ASC_CLC 0x0000 +#define IFXMIPS_ASC_PISEL 0x0004 +#define IFXMIPS_ASC_TXFCON 0x0044 +#define IFXMIPS_ASC_RXFCON 0x0040 +#define IFXMIPS_ASC_CON 0x0010 +#define IFXMIPS_ASC_BG 0x0050 +#define IFXMIPS_ASC_IRNREN 0x00F4 + +#define IFXMIPS_ASC_CLC_DISS 0x2 +#define ASC_IRNREN_RX_BUF 0x8 +#define ASC_IRNREN_TX_BUF 0x4 +#define ASC_IRNREN_ERR 0x2 +#define ASC_IRNREN_TX 0x1 +#define ASC_IRNCR_TIR 0x4 +#define ASC_IRNCR_RIR 0x2 +#define ASC_IRNCR_EIR 0x4 #define ASCOPT_CSIZE 0x3 #define ASCOPT_CS7 0x1 #define ASCOPT_CS8 0x2 @@ -56,50 +70,9 @@ #define ASCOPT_STOPB 0x8 #define ASCOPT_PARODD 0x0 #define ASCOPT_CREAD 0x20 +#define ASCFSTAT_TXFFLMASK 0x3F00 +#define ASCFSTAT_TXFFLOFF 8 -/* hardware modified control register */ -#define IFXMIPS_ASC1_WHBSTATE ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0018)) - -/* receive buffer register */ -#define IFXMIPS_ASC1_RBUF ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0024)) - -/* status register */ -#define IFXMIPS_ASC1_STATE ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0014)) - -/* interrupt control */ -#define IFXMIPS_ASC1_IRNCR ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x00F8)) - -#define ASC_IRNCR_TIR 0x4 -#define ASC_IRNCR_RIR 0x2 -#define ASC_IRNCR_EIR 0x4 - -/* clock control */ -#define IFXMIPS_ASC1_CLC ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0000)) - -#define IFXMIPS_ASC1_CLC_DISS 0x2 - -/* port input select register */ -#define IFXMIPS_ASC1_PISEL ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0004)) - -/* tx fifo */ -#define IFXMIPS_ASC1_TXFCON ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0044)) - -/* rx fifo */ -#define IFXMIPS_ASC1_RXFCON ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0040)) - -/* control */ -#define IFXMIPS_ASC1_CON ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0010)) - -/* timer reload */ -#define IFXMIPS_ASC1_BG ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x0050)) - -/* int enable */ -#define IFXMIPS_ASC1_IRNREN ((u32*)(IFXMIPS_ASC1_BASE_ADDR + 0x00F4)) - -#define ASC_IRNREN_RX_BUF 0x8 -#define ASC_IRNREN_TX_BUF 0x4 -#define ASC_IRNREN_ERR 0x2 -#define ASC_IRNREN_TX 0x1 /*------------ RCU */ diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_irq.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_irq.h index 6c9f59e0f6..6017df0ace 100644 --- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_irq.h +++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_irq.h @@ -28,9 +28,9 @@ #define INT_NUM_IM4_IRL0 (INT_NUM_IRQ0 + 128) #define INT_NUM_IM_OFFSET (INT_NUM_IM1_IRL0 - INT_NUM_IM0_IRL0) -#define IFXMIPSASC1_TIR (INT_NUM_IM3_IRL0 + 7) -#define IFXMIPSASC1_RIR (INT_NUM_IM3_IRL0 + 9) -#define IFXMIPSASC1_EIR (INT_NUM_IM3_IRL0 + 10) +#define IFXMIPSASC_TIR(x) (INT_NUM_IM3_IRL0 + (x * 7)) +#define IFXMIPSASC_RIR(x) (INT_NUM_IM3_IRL0 + (x * 7) + 2) +#define IFXMIPSASC_EIR(x) (INT_NUM_IM3_IRL0 + (x * 7) + 3) #define IFXMIPS_SSC_TIR (INT_NUM_IM0_IRL0 + 15) #define IFXMIPS_SSC_RIR (INT_NUM_IM0_IRL0 + 14) diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_prom.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_prom.h index 248fe50ad8..1c2013ed6d 100644 --- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_prom.h +++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_prom.h @@ -20,8 +20,8 @@ #ifndef _IFXPROM_H__ #define _IFXPROM_H__ -void prom_printf(const char * fmt, ...); -u32 *prom_get_cp1_base(void); -u32 prom_get_cp1_size(void); +extern void prom_printf(const char * fmt, ...); +extern u32 *prom_get_cp1_base(void); +extern u32 prom_get_cp1_size(void); #endif diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_wdt.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_wdt.h index 5071d778a8..34833e8ea9 100644 --- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_wdt.h +++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_wdt.h @@ -15,6 +15,7 @@ * * Copyright (C) 2005 infineon * Copyright (C) 2007 John Crispin + * */ #ifndef IFXMIPS_WDT_H diff --git a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h index 2ea25f289f..0d207b0938 100644 --- a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h +++ b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h @@ -1,4 +1,6 @@ /* + * include/asm-mips/mach-ifxmips/gpio.h + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -14,81 +16,63 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * * Copyright (C) 2007 John Crispin + * */ + #ifndef _IFXMIPS_GPIO_H_ #define _IFXMIPS_GPIO_H_ #include #include -static inline int -gpio_direction_input(unsigned gpio) -{ +static inline int gpio_direction_input(unsigned gpio) { ifxmips_port_set_dir_in(0, gpio); return 0; } -static inline int -gpio_direction_output(unsigned gpio, int value) -{ +static inline int gpio_direction_output(unsigned gpio, int value) { ifxmips_port_set_dir_out(0, gpio); return 0; } -static inline int -gpio_get_value(unsigned gpio) -{ +static inline int gpio_get_value(unsigned gpio) { ifxmips_port_get_input(0, gpio); return 0; } -static inline void -gpio_set_value(unsigned gpio, int value) -{ +static inline void gpio_set_value(unsigned gpio, int value) { ifxmips_port_set_output(0, gpio); } -static inline int -gpio_request(unsigned gpio, const char *label) -{ +static inline int gpio_request(unsigned gpio, const char *label) { return 0; } -static inline void -gpio_free(unsigned gpio) -{ +static inline void gpio_free(unsigned gpio) { } -static inline int -gpio_to_irq(unsigned gpio) -{ +static inline int gpio_to_irq(unsigned gpio) { return 0; } -static inline int -irq_to_gpio(unsigned irq) -{ +static inline int irq_to_gpio(unsigned irq) { return 0; } -static inline int -gpio_cansleep(unsigned gpio) -{ +static inline int gpio_cansleep(unsigned gpio) { return 0; } -static inline int -gpio_get_value_cansleep(unsigned gpio) -{ +static inline int gpio_get_value_cansleep(unsigned gpio) { might_sleep(); return gpio_get_value(gpio); } -static inline void -gpio_set_value_cansleep(unsigned gpio, int value) -{ +static inline void gpio_set_value_cansleep(unsigned gpio, int value) { might_sleep(); gpio_set_value(gpio, value); } + #endif + diff --git a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/irq.h b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/irq.h index 98d8902fba..f178abf485 100644 --- a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/irq.h +++ b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/irq.h @@ -1,4 +1,6 @@ /* + * include/asm-mips/mach-ifxmips/irq.h + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -14,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * * Copyright (C) 2007 John Crispin + * */ #ifndef __IFXMIPS_IRQ_H diff --git a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/war.h b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/war.h index 077a3f4f8c..de3584ecf6 100644 --- a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/war.h +++ b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/war.h @@ -1,21 +1,9 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. - * - * Copyright (C) 2007 John Crispin */ - #ifndef __ASM_MIPS_MACH_IFXMIPS_WAR_H #define __ASM_MIPS_MACH_IFXMIPS_WAR_H