diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/serial_mvf.c | 647 |
1 files changed, 149 insertions, 498 deletions
diff --git a/drivers/tty/serial/serial_mvf.c b/drivers/tty/serial/serial_mvf.c index c0b5692856cb..fa2719a5f662 100644 --- a/drivers/tty/serial/serial_mvf.c +++ b/drivers/tty/serial/serial_mvf.c @@ -25,19 +25,42 @@ * */ - +#include <linux/module.h> +#include <linux/ioport.h> +#include <linux/init.h> +#include <linux/console.h> +#include <linux/sysrq.h> +#include <linux/platform_device.h> +#include <linux/tty.h> +#include <linux/tty_flip.h> +#include <linux/serial_core.h> +#include <linux/serial.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/rational.h> +#include <linux/slab.h> +#include <linux/dma-mapping.h> + +#include <asm/io.h> +#include <asm/irq.h> +#include <mach/dma.h> +#include <mach/hardware.h> #include <mach/mvf_uart.h> +#define SERIAL_MVF_MAJOR 207 +#define MINOR_START 16 #define DRIVER_NAME "MVF-uart" +#define DEV_NAME "ttymxc" #define UART_NR 6 struct mvf_port { struct uart_port port; - struct time_list timer; + struct timer_list timer; unsigned int old_status; - int txirq,rxirqmrtsirq; - unsigned int + int txirq,rxirq,rtsirq; + struct clk *clk; + }; #ifdef CONFIG_IRDA @@ -56,42 +79,36 @@ static inline int mvf_set_bps(struct mvf_port *sport, bdl = (sbr&0xff); writeb(bdh, sport->port.membase + MVF_UART_BDH); writeb(bdl, sport->port.membase + MVF_UART_BDL); - + return 0; } -static inline mvf_set_paerity(struct mvf_port *sport, - unsigned long base,unsigned short ) +static inline void mvf_set_paerity(struct mvf_port *sport, + unsigned long base,unsigned short parity) +{ + /* + * TBD + */ +} static inline int mvf_uart_enable(struct mvf_port *sport) { - unsinged char c2; + unsigned char c2; c2 = readb(sport->port.membase + MVF_UART_C2); c2 |= (UART_C2_TE | UART_C2_RE); writeb(c2, sport->port.membase + MVF_UART_C2); - + return 0; } static inline int mvf_uart_disable(struct mvf_port *sport) { + unsigned char c2; c2 = readb(sport->port.membase + MVF_UART_C2); c2 &= ~(UART_C2_TE | UART_C2_RE); writeb(c2, sport->port.membase + MVF_UART_C2); - + return 0; } /* - * Handle any change of modem status signal since we were last called. - */ -static void mvf_mctrl_check(struct mvf_port *sport) -{ - /* - * TDB - */ - return ; - -} - -/* * This is our per-port timeout handler, for checking the * modem status signals. */ @@ -108,53 +125,10 @@ static void mvf_timeout(unsigned long data) */ static void mvf_stop_tx(struct uart_port *port) { - struct mvf_port *sport = (struct mvf_port *)port; - unsigned long temp; - - if (USE_IRDA(sport)) { - /* half duplex - wait for end of transmission */ - int n = 256; - while ((--n > 0) && - !(readb(sport->port.membase + USR2) & USR2_TXDC)) { - udelay(5); - barrier(); - } - /* - * irda transceiver - wait a bit more to avoid - * cutoff, hardware dependent - */ - udelay(sport->trcv_delay); - - /* - * half duplex - reactivate receive mode, - * flush receive pipe echo crap - */ - if (readb(sport->port.membase + USR2) & USR2_TXDC) { - temp = readb(sport->port.membase + UCR1); - temp &= ~(UCR1_TXMPTYEN | UCR1_TRDYEN); - writeb(temp, sport->port.membase + UCR1); - - temp = readb(sport->port.membase + UCR4); - temp &= ~(UCR4_TCEN); - writeb(temp, sport->port.membase + UCR4); - - while (readb(sport->port.membase + URXD0) & - URXD_CHARRDY) - barrier(); - - temp = readb(sport->port.membase + UCR1); - temp |= UCR1_RRDYEN; - writeb(temp, sport->port.membase + UCR1); - - temp = readb(sport->port.membase + UCR4); - temp |= UCR4_DREN; - writeb(temp, sport->port.membase + UCR4); - } - return; - } - - temp = readb(sport->port.membase + UCR1); - writeb(temp & ~UCR1_TXMPTYEN, sport->port.membase + UCR1); + /* + * TBD + */ + return ; } /* @@ -162,11 +136,10 @@ static void mvf_stop_tx(struct uart_port *port) */ static void mvf_stop_rx(struct uart_port *port) { - struct mvf_port *sport = (struct mvf_port *)port; - unsigned long temp; - - temp = readb(sport->port.membase + UCR2); - writeb(temp &~ UCR2_RXEN, sport->port.membase + UCR2); + /* + * TBD + */ + return ; } /* @@ -174,29 +147,18 @@ static void mvf_stop_rx(struct uart_port *port) */ static void mvf_enable_ms(struct uart_port *port) { - struct mvf_port *sport = (struct mvf_port *)port; - - mod_timer(&sport->timer, jiffies); + /* + * TBD + */ + return ; } static inline void mvf_transmit_buffer(struct mvf_port *sport) { - struct circ_buf *xmit = &sport->port.state->xmit; - - while (!uart_circ_empty(xmit) && - !(readb(sport->port.membase + UTS) & UTS_TXFULL)) { - /* send xmit->buf[xmit->tail] - * out the port here */ - writeb(xmit->buf[xmit->tail], sport->port.membase + URTX0); - xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); - sport->port.icount.tx++; - } - - if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) - uart_write_wakeup(&sport->port); - - if (uart_circ_empty(xmit)) - mvf_stop_tx(&sport->port); + /* + * TBD + */ + return ; } @@ -205,178 +167,56 @@ static inline void mvf_transmit_buffer(struct mvf_port *sport) */ static void mvf_start_tx(struct uart_port *port) { - struct mvf_port *sport = (struct mvf_port *)port; - unsigned long temp; - - if (USE_IRDA(sport)) { - /* half duplex in IrDA mode; have to disable receive mode */ - temp = readb(sport->port.membase + UCR4); - temp &= ~(UCR4_DREN); - writeb(temp, sport->port.membase + UCR4); - - temp = readb(sport->port.membase + UCR1); - temp &= ~(UCR1_RRDYEN); - writeb(temp, sport->port.membase + UCR1); - } - - - if (USE_IRDA(sport)) { - temp = readb(sport->port.membase + UCR1); - temp |= UCR1_TRDYEN; - writeb(temp, sport->port.membase + UCR1); - - temp = readb(sport->port.membase + UCR4); - temp |= UCR4_TCEN; - writeb(temp, sport->port.membase + UCR4); - } - - - if (readb(sport->port.membase + UTS) & UTS_TXEMPTY) - mvf_transmit_buffer(sport); + /* + * TBD + */ + return ; } +#if 0 static irqreturn_t mvf_rtsint(int irq, void *dev_id) { - struct mvf_port *sport = dev_id; - unsigned int val; - unsigned long flags; - - spin_lock_irqsave(&sport->port.lock, flags); - - writeb(USR1_RTSD, sport->port.membase + USR1); - val = readb(sport->port.membase + USR1) & USR1_RTSS; - uart_handle_cts_change(&sport->port, !!val); - wake_up_interruptible(&sport->port.state->port.delta_msr_wait); - - spin_unlock_irqrestore(&sport->port.lock, flags); + /* + * TBD + */ return IRQ_HANDLED; } static irqreturn_t mvf_txint(int irq, void *dev_id) { - struct mvf_port *sport = dev_id; - struct circ_buf *xmit = &sport->port.state->xmit; - unsigned long flags; - - spin_lock_irqsave(&sport->port.lock,flags); - if (sport->port.x_char) - { - /* Send next char */ - writeb(sport->port.x_char, sport->port.membase + URTX0); - goto out; - } - - if (uart_circ_empty(xmit) || uart_tx_stopped(&sport->port)) { - mvf_stop_tx(&sport->port); - goto out; - } - - mvf_transmit_buffer(sport); - - if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) - uart_write_wakeup(&sport->port); - -out: - spin_unlock_irqrestore(&sport->port.lock,flags); + /* + * TBD + */ return IRQ_HANDLED; } static irqreturn_t mvf_rxint(int irq, void *dev_id) { - struct mvf_port *sport = dev_id; - unsigned int rx,flg,ignored = 0; - struct tty_struct *tty = sport->port.state->port.tty; - unsigned long flags, temp; - - spin_lock_irqsave(&sport->port.lock,flags); - - while (readb(sport->port.membase + USR2) & USR2_RDR) { - flg = TTY_NORMAL; - sport->port.icount.rx++; - - rx = readb(sport->port.membase + URXD0); - - temp = readb(sport->port.membase + USR2); - if (temp & USR2_BRCD) { - writeb(USR2_BRCD, sport->port.membase + USR2); - if (uart_handle_break(&sport->port)) - continue; - } - - if (uart_handle_sysrq_char(&sport->port, (unsigned char)rx)) - continue; - - if (rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) ) { - if (rx & URXD_PRERR) - sport->port.icount.parity++; - else if (rx & URXD_FRMERR) - sport->port.icount.frame++; - if (rx & URXD_OVRRUN) - sport->port.icount.overrun++; - - if (rx & sport->port.ignore_status_mask) { - if (++ignored > 100) - goto out; - continue; - } - - rx &= sport->port.read_status_mask; - - if (rx & URXD_PRERR) - flg = TTY_PARITY; - else if (rx & URXD_FRMERR) - flg = TTY_FRAME; - if (rx & URXD_OVRRUN) - flg = TTY_OVERRUN; - -#ifdef SUPPORT_SYSRQ - sport->port.sysrq = 0; -#endif - } - - tty_insert_flip_char(tty, rx, flg); - } - -out: - spin_unlock_irqrestore(&sport->port.lock,flags); - tty_flip_buffer_push(tty); + /* + * TBD + */ return IRQ_HANDLED; } static irqreturn_t mvf_int(int irq, void *dev_id) { - struct mvf_port *sport = dev_id; - unsigned int sts; - - sts = readb(sport->port.membase + USR1); - - if (sts & USR1_RRDY) { - mvf_rxint(irq, dev_id); - } - - if (sts & USR1_TRDY && - readb(sport->port.membase + UCR1) & UCR1_TXMPTYEN) - mvf_txint(irq, dev_id); - - if (sts & USR1_RTSD) - mvf_rtsint(irq, dev_id); - - if (sts & USR1_AWAKE) - writeb(USR1_AWAKE, sport->port.membase + USR1); - + /* + * TBD + */ return IRQ_HANDLED; } - +#endif /* * Return TIOCSER_TEMT when transmitter is not busy. */ static unsigned int mvf_tx_empty(struct uart_port *port) { - struct mvf_port *sport = (struct mvf_port *)port; - - return (readb(sport->port.membase + USR2) & USR2_TXDC) ? TIOCSER_TEMT : 0; + /* + * TBD + */ + return 0; } /* @@ -384,29 +224,18 @@ static unsigned int mvf_tx_empty(struct uart_port *port) */ static unsigned int mvf_get_mctrl(struct uart_port *port) { - struct mvf_port *sport = (struct mvf_port *)port; unsigned int tmp = TIOCM_DSR | TIOCM_CAR; - - if (readb(sport->port.membase + USR1) & USR1_RTSS) - tmp |= TIOCM_CTS; - - if (readb(sport->port.membase + UCR2) & UCR2_CTS) - tmp |= TIOCM_RTS; - + /* + * TBD + */ return tmp; } static void mvf_set_mctrl(struct uart_port *port, unsigned int mctrl) { - struct mvf_port *sport = (struct mvf_port *)port; - unsigned long temp; - - temp = readb(sport->port.membase + UCR2) & ~UCR2_CTS; - - if (mctrl & TIOCM_RTS) - temp |= UCR2_CTS; - - writeb(temp, sport->port.membase + UCR2); + /* + * TBD + */ } /* @@ -414,19 +243,9 @@ static void mvf_set_mctrl(struct uart_port *port, unsigned int mctrl) */ static void mvf_break_ctl(struct uart_port *port, int break_state) { - struct mvf_port *sport = (struct mvf_port *)port; - unsigned long flags, temp; - - spin_lock_irqsave(&sport->port.lock, flags); - - temp = readb(sport->port.membase + UCR1) & ~UCR1_SNDBRK; - - if ( break_state != 0 ) - temp |= UCR1_SNDBRK; - - writeb(temp, sport->port.membase + UCR1); - - spin_unlock_irqrestore(&sport->port.lock, flags); + /* + * TBD + */ } #define TXTL 2 /* reset default */ @@ -435,199 +254,17 @@ static void mvf_break_ctl(struct uart_port *port, int break_state) static int mvf_startup(struct uart_port *port) { - struct mvf_port *sport = (struct mvf_port *)port; - int retval; - unsigned long flags, temp; - struct tty_struct *tty; - - - /* disable the DREN bit (Data Ready interrupt enable) before - * requesting IRQs - */ - temp = readb(sport->port.membase + UCR4); - - if (USE_IRDA(sport)) - temp |= UCR4_IRSC; - - /* set the trigger level for CTS */ - temp &= ~(UCR4_CTSTL_MASK<< UCR4_CTSTL_SHF); - temp |= CTSTL<< UCR4_CTSTL_SHF; - - writeb(temp & ~UCR4_DREN, sport->port.membase + UCR4); - - /* - * Allocate the IRQ(s) i.MX1 has three interrupts whereas later - * chips only have one interrupt. - */ - if (sport->txirq > 0) { - retval = request_irq(sport->rxirq, mvf_rxint, 0, - DRIVER_NAME, sport); - if (retval) - goto error_out1; - - retval = request_irq(sport->txirq, mvf_txint, 0, - DRIVER_NAME, sport); - if (retval) - goto error_out2; - - /* do not use RTS IRQ on IrDA */ - if (!USE_IRDA(sport)) { - retval = request_irq(sport->rtsirq, mvf_rtsint, - (sport->rtsirq < MAX_INTERNAL_IRQ) ? 0 : - IRQF_TRIGGER_FALLING | - IRQF_TRIGGER_RISING, - DRIVER_NAME, sport); - if (retval) - goto error_out3; - } - } else { - retval = request_irq(sport->port.irq, mvf_int, 0, - DRIVER_NAME, sport); - if (retval) { - free_irq(sport->port.irq, sport); - goto error_out1; - } - } - - spin_lock_irqsave(&sport->port.lock, flags); /* - * Finally, clear and enable interrupts + * TBD */ - writeb(USR1_RTSD, sport->port.membase + USR1); - - temp = readb(sport->port.membase + UCR1); - temp |= UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN; - if (sport->enable_dma) { - temp |= UCR1_RDMAEN | UCR1_TDMAEN; - /* ICD, wait for more than 32 frames, but it still to short. */ - temp |= UCR1_ICD_REG(3); - } - - if (USE_IRDA(sport)) { - temp |= UCR1_IREN; - temp &= ~(UCR1_RTSDEN); - } - - writeb(temp, sport->port.membase + UCR1); - - temp = readb(sport->port.membase + UCR2); - temp |= (UCR2_RXEN | UCR2_TXEN); - writeb(temp, sport->port.membase + UCR2); - - if (USE_IRDA(sport)) { - /* clear RX-FIFO */ - int i = 64; - while ((--i > 0) && - (readb(sport->port.membase + URXD0) & URXD_CHARRDY)) { - barrier(); - } - } - - if (!cpu_is_mx1()) { - temp = readb(sport->port.membase + UCR3); - temp |= MX2_UCR3_RXDMUXSEL; - writeb(temp, sport->port.membase + UCR3); - } - - if (USE_IRDA(sport)) { - temp = readb(sport->port.membase + UCR4); - if (sport->irda_inv_rx) - temp |= UCR4_INVR; - else - temp &= ~(UCR4_INVR); - writeb(temp | UCR4_DREN, sport->port.membase + UCR4); - - temp = readb(sport->port.membase + UCR3); - if (sport->irda_inv_tx) - temp |= UCR3_INVT; - else - temp &= ~(UCR3_INVT); - writeb(temp, sport->port.membase + UCR3); - } - - if (sport->enable_dma) { - temp = readb(sport->port.membase + UCR4); - temp |= UCR4_IDDMAEN; - writeb(temp, sport->port.membase + UCR4); - } - - /* - * Enable modem status interrupts - */ - mvf_enable_ms(&sport->port); - spin_unlock_irqrestore(&sport->port.lock,flags); - - if (USE_IRDA(sport)) { - struct mvfuart_platform_data *pdata; - pdata = sport->port.dev->platform_data; - sport->irda_inv_rx = pdata->irda_inv_rx; - sport->irda_inv_tx = pdata->irda_inv_tx; - sport->trcv_delay = pdata->transceiver_delay; - if (pdata->irda_enable) - pdata->irda_enable(1); - } - - tty = sport->port.state->port.tty; - return 0; - -error_out3: - if (sport->txirq) - free_irq(sport->txirq, sport); -error_out2: - if (sport->rxirq) - free_irq(sport->rxirq, sport); -error_out1: - return retval; } static void mvf_shutdown(struct uart_port *port) { - struct mvf_port *sport = (struct mvf_port *)port; - unsigned long temp; - unsigned long flags; - - spin_lock_irqsave(&sport->port.lock, flags); - temp = readb(sport->port.membase + UCR2); - temp &= ~(UCR2_TXEN); - writeb(temp, sport->port.membase + UCR2); - spin_unlock_irqrestore(&sport->port.lock, flags); - - if (USE_IRDA(sport)) { - struct mvfuart_platform_data *pdata; - pdata = sport->port.dev->platform_data; - if (pdata->irda_enable) - pdata->irda_enable(0); - } - - /* - * Stop our timer. - */ - del_timer_sync(&sport->timer); - /* - * Free the interrupts + * TBD */ - if (sport->txirq > 0) { - if (!USE_IRDA(sport)) - free_irq(sport->rtsirq, sport); - free_irq(sport->txirq, sport); - free_irq(sport->rxirq, sport); - } else - free_irq(sport->port.irq, sport); - - /* - * Disable all interrupts, port and break condition. - */ - - spin_lock_irqsave(&sport->port.lock, flags); - temp = readb(sport->port.membase + UCR1); - temp &= ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN); - if (USE_IRDA(sport)) - temp &= ~(UCR1_IREN); - writeb(temp, sport->port.membase + UCR1); - - spin_unlock_irqrestore(&sport->port.lock, flags); } static void @@ -636,7 +273,8 @@ mvf_set_termios(struct uart_port *port, struct ktermios *termios, { struct mvf_port *sport = (struct mvf_port *)port; unsigned long flags; - unsigned char c1,c2,c3,c4; + unsigned int baud,quot; + unsigned char c1,c2,c3; /* * We only support CS8. @@ -644,6 +282,9 @@ mvf_set_termios(struct uart_port *port, struct ktermios *termios, termios->c_cflag = CS8; c1 = UART_C1_M; + c2 = readb(sport->port.membase + MVF_UART_C2); + c3 = readb(sport->port.membase + MVF_UART_C3); + if (termios->c_cflag & PARENB){ c1 |= UART_C1_PE; @@ -657,24 +298,22 @@ mvf_set_termios(struct uart_port *port, struct ktermios *termios, /* - * Update the per-port timeout. - */ - uart_update_timeout(port, termios->c_cflag, baud); - - - /* * Ask the core to calculate the divisor for us. */ baud = uart_get_baud_rate(port, termios, old, 50, port->uartclk / 16); quot = uart_get_divisor(port, baud); + /* + * Update the per-port timeout. + */ + uart_update_timeout(port, termios->c_cflag, baud); + spin_lock_irqsave(&sport->port.lock, flags); - writeb(c1,sport->port.membase + UART_C1); - writeb(c2,sport->port.membase + UART_C2); - writeb(c3,sport->port.membase + UART_C3); - + writeb(c1,sport->port.membase + MVF_UART_C1); + writeb(c2,sport->port.membase + MVF_UART_C2); + writeb(c3,sport->port.membase + MVF_UART_C3); @@ -686,7 +325,7 @@ static const char *mvf_type(struct uart_port *port) { struct mvf_port *sport = (struct mvf_port *)port; - return sport->port.type == PORT_MVF ? "MVF" : NULL; + return sport->port.type == PORT_IMX ? "MVF" : NULL; } /* @@ -729,21 +368,21 @@ static void mvf_config_port(struct uart_port *port, int flags) if (flags & UART_CONFIG_TYPE && mvf_request_port(&sport->port) == 0) - sport->port.type = PORT_MVF; + sport->port.type = PORT_IMX; } /* * Verify the new serial_struct (for TIOCSSERIAL). * The only change we allow are to the flags and type, and - * even then only between PORT_MVF and PORT_UNKNOWN + * even then only between PORT_IMX and PORT_UNKNOWN */ static int mvf_verify_port(struct uart_port *port, struct serial_struct *ser) { - struct faradady_port *sport = (struct mvf_port *)port; + struct mvf_port *sport = (struct mvf_port *)port; int ret = 0; - if (ser->type != PORT_UNKNOWN && ser->type != PORT_MVF) + if (ser->type != PORT_UNKNOWN && ser->type != PORT_IMX) ret = -EINVAL; if (sport->port.irq != ser->irq) ret = -EINVAL; @@ -781,21 +420,23 @@ static struct uart_ops mvf_pops = { }; -static struct mvf_ports[UART_NR]; +static struct mvf_port *mvf_ports[UART_NR]; +#ifdef CONFIG_SERIAL_MVF_CONSOLE static void mvf_console_putchar(struct uart_port *port, int ch) { - struct imx_port *sport = (struct imx_port *)port; + struct mvf_port *sport = (struct mvf_port *)port; - while (readb(sport->port.membase + S1) & UART_S1_TDRE) + while (readb(sport->port.membase + MVF_UART_S1) & UART_S1_TDRE) barrier(); - writeb(ch, sport->port.membase + UART_D); + writeb(ch, sport->port.membase + MVF_UART_D); } static void mvf_console_write(struct console *co, const char *s, unsigned int count) { + struct mvf_port *sport = mvf_ports[co->index]; uart_console_write(&sport->port, s, count, mvf_console_putchar); return; } @@ -804,20 +445,21 @@ mvf_console_write(struct console *co, const char *s, unsigned int count) * try to determine the current setup. */ static void __init -imx_console_get_options(struct imx_port *sport, int *baud, +mvf_console_get_options(struct mvf_port *sport, int *baud, int *parity, int *bits) { + /* UART Enable */ - if ( readb(soprt->port.membase + UART_C1) & (UART_C1_TE | UART_C1_RE)) { - unsigned char c1,c2,c3,c4; - unsigend short br; - c1 = readb(soprt->port.membase + UART_C1); + if ( readb(sport->port.membase + MVF_UART_C2) & (UART_C2_TE | UART_C2_RE)) { + unsigned char c1; + unsigned short br; + c1 = readb(sport->port.membase + MVF_UART_C1); *parity = 'n'; if ( c1 & UART_C1_PE) *parity = (c1 & UART_C1_PT)?'o':'e'; *bits = 7; - br = readb(soprt->port.membase + UART_BDH)<<8 - | readb(soprt->port.membase + UART_BDH); + br = readb(sport->port.membase + MVF_UART_BDH)<<8 + | readb(sport->port.membase + MVF_UART_BDH); br &= 0x1fff; } } @@ -832,13 +474,19 @@ mvf_console_setup(struct console *co,char *options) if (co->index == -1 || co->index >= ARRAY_SIZE(mvf_ports)) co->index = 0; - sport = imx_ports[co->index]; + sport = mvf_ports[co->index]; if(sport == NULL) return -ENODEV; + if (options) + uart_parse_options(options, &baud, &parity, &bits, &flow); + else + mvf_console_get_options(sport, &baud, &parity, &bits); + return uart_set_options(&sport->port, co, baud, parity, bits, flow); } +static struct uart_driver mvf_reg; static struct console mvf_console = { .name = DEV_NAME, .write = mvf_console_write, @@ -849,8 +497,13 @@ static struct console mvf_console = { .data = &mvf_reg, }; -static struct uart_drive mvf_reg = { - .onwer = THIS_MODULE, +#define MVF_CONSOLE &mvf_console +#else +#define MVF_CONSOLE NULL +#endif + +static struct uart_driver mvf_reg = { + .owner = THIS_MODULE, .driver_name = DRIVER_NAME, .dev_name = DEV_NAME, .major = SERIAL_MVF_MAJOR, @@ -860,8 +513,8 @@ static struct uart_drive mvf_reg = { }; - -static int serial_farada_suspend(struct platform_device *dev,pm_message_t state) +#ifdef CONFIG_PM +static int serial_mvf_suspend(struct platform_device *dev,pm_message_t state) { /* TBD */ return 0; @@ -873,7 +526,6 @@ static int serial_mvf_resume(struct platform_device *dev) return 0; } -#idef CONFIG_PM static consit struct dev_pm_ops serial_mvf_pm_ops = { .suspend = serial_mvf_suspend, .resume = serial_mvf_resume, @@ -881,10 +533,10 @@ static consit struct dev_pm_ops serial_mvf_pm_ops = { #endif -static int seryal_mvf_probe(struct platform_device *dev) +static int serial_mvf_probe(struct platform_device *pdev) { struct mvf_port *sport; - struct mvf_platform_data *pdata; + struct mvfuart_platform_data *pdata; void __iomem *base; int ret = 0; struct resource *res; @@ -906,7 +558,7 @@ static int seryal_mvf_probe(struct platform_device *dev) sport->port.dev = &pdev->dev; sport->port.mapbase = res->start; sport->port.membase = base; - sport->port.type = PORT_MVF, + sport->port.type = PORT_IMX, sport->port.iotype = UPIO_MEM; sport->port.irq = platform_get_irq(pdev, 0); sport->rxirq = platform_get_irq(pdev, 0); @@ -932,16 +584,13 @@ static int seryal_mvf_probe(struct platform_device *dev) mvf_ports[pdev->id] = sport; pdata = pdev->dev.platform_data; +#if 0 if (pdata && (pdata->flags & MVFUART_HAVE_RTSCTS)) sport->have_rtscts = 1; if (pdata && (pdata->flags & MVFUART_USE_DCEDTE)) sport->use_dcedte = 1; if (pdata && (pdata->flags & MVFUART_SDMA)) sport->enable_dma = 1; - -#ifdef CONFIG_IRDA - if (pdata && (pdata->flags & MVFUART_IRDA)) - sport->use_irda = 1; #endif if (pdata && pdata->init) { @@ -974,11 +623,11 @@ free: } -static void serial_mvf_remove(struct platform_device *dev) +static int serial_mvf_remove(struct platform_device *dev) { - return; - + return 0; +} static struct platform_driver serial_mvf_driver = { .probe = serial_mvf_probe, @@ -989,6 +638,7 @@ static struct platform_driver serial_mvf_driver = { .owner = THIS_MODULE, #ifdef CONFIG_PM .pm = &serial_mvf_pm_ops, +#endif }, }; @@ -997,7 +647,7 @@ static int __init mvf_serial_init(void) { int ret; printk(KERN_INFO "Serial: Mvf driver\n"); - ret = uart_regiseter_driver(&mvf_reg); + ret = uart_register_driver(&mvf_reg); if ( ret ) return ret; @@ -1011,7 +661,7 @@ static int __init mvf_serial_init(void) static void __exit mvf_serial_exit(void) { - platform_driver_unregiseter(&serial_mvf_driver); + platform_driver_unregister(&serial_mvf_driver); uart_unregister_driver(&mvf_reg); } @@ -1019,7 +669,8 @@ static void __exit mvf_serial_exit(void) module_init(mvf_serial_init); module_exit(mvf_serial_exit); -MODULES_AUTHER(""); -MODULES_DESCRIPTION("Faradeay serial port driver"); +MODULE_AUTHOR("Freescale"); +MODULE_DESCRIPTION("Faradeay serial port driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:"); + |