|
|
@@ -1,378 +0,0 @@
|
|
|
---- a/drivers/serial/amba-pl010.c
|
|
|
-+++ b/drivers/serial/amba-pl010.c
|
|
|
-@@ -50,11 +50,10 @@
|
|
|
-
|
|
|
- #include <asm/io.h>
|
|
|
-
|
|
|
--#define UART_NR 8
|
|
|
--
|
|
|
- #define SERIAL_AMBA_MAJOR 204
|
|
|
- #define SERIAL_AMBA_MINOR 16
|
|
|
--#define SERIAL_AMBA_NR UART_NR
|
|
|
-+#define SERIAL_AMBA_NR CONFIG_SERIAL_AMBA_PL010_NUMPORTS
|
|
|
-+#define SERIAL_AMBA_NAME CONFIG_SERIAL_AMBA_PL010_PORTNAME
|
|
|
-
|
|
|
- #define AMBA_ISR_PASS_LIMIT 256
|
|
|
-
|
|
|
-@@ -80,9 +79,9 @@ static void pl010_stop_tx(struct uart_po
|
|
|
- struct uart_amba_port *uap = (struct uart_amba_port *)port;
|
|
|
- unsigned int cr;
|
|
|
-
|
|
|
-- cr = readb(uap->port.membase + UART010_CR);
|
|
|
-+ cr = __raw_readl(uap->port.membase + UART010_CR);
|
|
|
- cr &= ~UART010_CR_TIE;
|
|
|
-- writel(cr, uap->port.membase + UART010_CR);
|
|
|
-+ __raw_writel(cr, uap->port.membase + UART010_CR);
|
|
|
- }
|
|
|
-
|
|
|
- static void pl010_start_tx(struct uart_port *port)
|
|
|
-@@ -90,9 +89,9 @@ static void pl010_start_tx(struct uart_p
|
|
|
- struct uart_amba_port *uap = (struct uart_amba_port *)port;
|
|
|
- unsigned int cr;
|
|
|
-
|
|
|
-- cr = readb(uap->port.membase + UART010_CR);
|
|
|
-+ cr = __raw_readl(uap->port.membase + UART010_CR);
|
|
|
- cr |= UART010_CR_TIE;
|
|
|
-- writel(cr, uap->port.membase + UART010_CR);
|
|
|
-+ __raw_writel(cr, uap->port.membase + UART010_CR);
|
|
|
- }
|
|
|
-
|
|
|
- static void pl010_stop_rx(struct uart_port *port)
|
|
|
-@@ -100,9 +99,9 @@ static void pl010_stop_rx(struct uart_po
|
|
|
- struct uart_amba_port *uap = (struct uart_amba_port *)port;
|
|
|
- unsigned int cr;
|
|
|
-
|
|
|
-- cr = readb(uap->port.membase + UART010_CR);
|
|
|
-+ cr = __raw_readl(uap->port.membase + UART010_CR);
|
|
|
- cr &= ~(UART010_CR_RIE | UART010_CR_RTIE);
|
|
|
-- writel(cr, uap->port.membase + UART010_CR);
|
|
|
-+ __raw_writel(cr, uap->port.membase + UART010_CR);
|
|
|
- }
|
|
|
-
|
|
|
- static void pl010_enable_ms(struct uart_port *port)
|
|
|
-@@ -110,9 +109,9 @@ static void pl010_enable_ms(struct uart_
|
|
|
- struct uart_amba_port *uap = (struct uart_amba_port *)port;
|
|
|
- unsigned int cr;
|
|
|
-
|
|
|
-- cr = readb(uap->port.membase + UART010_CR);
|
|
|
-+ cr = __raw_readl(uap->port.membase + UART010_CR);
|
|
|
- cr |= UART010_CR_MSIE;
|
|
|
-- writel(cr, uap->port.membase + UART010_CR);
|
|
|
-+ __raw_writel(cr, uap->port.membase + UART010_CR);
|
|
|
- }
|
|
|
-
|
|
|
- static void pl010_rx_chars(struct uart_amba_port *uap)
|
|
|
-@@ -120,9 +119,9 @@ static void pl010_rx_chars(struct uart_a
|
|
|
- struct tty_struct *tty = uap->port.info->port.tty;
|
|
|
- unsigned int status, ch, flag, rsr, max_count = 256;
|
|
|
-
|
|
|
-- status = readb(uap->port.membase + UART01x_FR);
|
|
|
-+ status = __raw_readl(uap->port.membase + UART01x_FR);
|
|
|
- while (UART_RX_DATA(status) && max_count--) {
|
|
|
-- ch = readb(uap->port.membase + UART01x_DR);
|
|
|
-+ ch = __raw_readl(uap->port.membase + UART01x_DR);
|
|
|
- flag = TTY_NORMAL;
|
|
|
-
|
|
|
- uap->port.icount.rx++;
|
|
|
-@@ -131,9 +130,9 @@ static void pl010_rx_chars(struct uart_a
|
|
|
- * Note that the error handling code is
|
|
|
- * out of the main execution path
|
|
|
- */
|
|
|
-- rsr = readb(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
|
|
|
-+ rsr = __raw_readl(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
|
|
|
- if (unlikely(rsr & UART01x_RSR_ANY)) {
|
|
|
-- writel(0, uap->port.membase + UART01x_ECR);
|
|
|
-+ __raw_writel(0, uap->port.membase + UART01x_ECR);
|
|
|
-
|
|
|
- if (rsr & UART01x_RSR_BE) {
|
|
|
- rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE);
|
|
|
-@@ -163,7 +162,7 @@ static void pl010_rx_chars(struct uart_a
|
|
|
- uart_insert_char(&uap->port, rsr, UART01x_RSR_OE, ch, flag);
|
|
|
-
|
|
|
- ignore_char:
|
|
|
-- status = readb(uap->port.membase + UART01x_FR);
|
|
|
-+ status = __raw_readl(uap->port.membase + UART01x_FR);
|
|
|
- }
|
|
|
- spin_unlock(&uap->port.lock);
|
|
|
- tty_flip_buffer_push(tty);
|
|
|
-@@ -176,7 +175,7 @@ static void pl010_tx_chars(struct uart_a
|
|
|
- int count;
|
|
|
-
|
|
|
- if (uap->port.x_char) {
|
|
|
-- writel(uap->port.x_char, uap->port.membase + UART01x_DR);
|
|
|
-+ __raw_writel(uap->port.x_char, uap->port.membase + UART01x_DR);
|
|
|
- uap->port.icount.tx++;
|
|
|
- uap->port.x_char = 0;
|
|
|
- return;
|
|
|
-@@ -188,7 +187,7 @@ static void pl010_tx_chars(struct uart_a
|
|
|
-
|
|
|
- count = uap->port.fifosize >> 1;
|
|
|
- do {
|
|
|
-- writel(xmit->buf[xmit->tail], uap->port.membase + UART01x_DR);
|
|
|
-+ __raw_writel(xmit->buf[xmit->tail], uap->port.membase + UART01x_DR);
|
|
|
- xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
|
|
|
- uap->port.icount.tx++;
|
|
|
- if (uart_circ_empty(xmit))
|
|
|
-@@ -206,9 +205,9 @@ static void pl010_modem_status(struct ua
|
|
|
- {
|
|
|
- unsigned int status, delta;
|
|
|
-
|
|
|
-- writel(0, uap->port.membase + UART010_ICR);
|
|
|
-+ __raw_writel(0, uap->port.membase + UART010_ICR);
|
|
|
-
|
|
|
-- status = readb(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
|
|
|
-+ status = __raw_readl(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
|
|
|
-
|
|
|
- delta = status ^ uap->old_status;
|
|
|
- uap->old_status = status;
|
|
|
-@@ -236,7 +235,7 @@ static irqreturn_t pl010_int(int irq, vo
|
|
|
-
|
|
|
- spin_lock(&uap->port.lock);
|
|
|
-
|
|
|
-- status = readb(uap->port.membase + UART010_IIR);
|
|
|
-+ status = __raw_readl(uap->port.membase + UART010_IIR);
|
|
|
- if (status) {
|
|
|
- do {
|
|
|
- if (status & (UART010_IIR_RTIS | UART010_IIR_RIS))
|
|
|
-@@ -249,7 +248,7 @@ static irqreturn_t pl010_int(int irq, vo
|
|
|
- if (pass_counter-- == 0)
|
|
|
- break;
|
|
|
-
|
|
|
-- status = readb(uap->port.membase + UART010_IIR);
|
|
|
-+ status = __raw_readl(uap->port.membase + UART010_IIR);
|
|
|
- } while (status & (UART010_IIR_RTIS | UART010_IIR_RIS |
|
|
|
- UART010_IIR_TIS));
|
|
|
- handled = 1;
|
|
|
-@@ -263,7 +262,7 @@ static irqreturn_t pl010_int(int irq, vo
|
|
|
- static unsigned int pl010_tx_empty(struct uart_port *port)
|
|
|
- {
|
|
|
- struct uart_amba_port *uap = (struct uart_amba_port *)port;
|
|
|
-- unsigned int status = readb(uap->port.membase + UART01x_FR);
|
|
|
-+ unsigned int status = __raw_readl(uap->port.membase + UART01x_FR);
|
|
|
- return status & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;
|
|
|
- }
|
|
|
-
|
|
|
-@@ -273,7 +272,7 @@ static unsigned int pl010_get_mctrl(stru
|
|
|
- unsigned int result = 0;
|
|
|
- unsigned int status;
|
|
|
-
|
|
|
-- status = readb(uap->port.membase + UART01x_FR);
|
|
|
-+ status = __raw_readl(uap->port.membase + UART01x_FR);
|
|
|
- if (status & UART01x_FR_DCD)
|
|
|
- result |= TIOCM_CAR;
|
|
|
- if (status & UART01x_FR_DSR)
|
|
|
-@@ -299,12 +298,12 @@ static void pl010_break_ctl(struct uart_
|
|
|
- unsigned int lcr_h;
|
|
|
-
|
|
|
- spin_lock_irqsave(&uap->port.lock, flags);
|
|
|
-- lcr_h = readb(uap->port.membase + UART010_LCRH);
|
|
|
-+ lcr_h = __raw_readl(uap->port.membase + UART010_LCRH);
|
|
|
- if (break_state == -1)
|
|
|
- lcr_h |= UART01x_LCRH_BRK;
|
|
|
- else
|
|
|
- lcr_h &= ~UART01x_LCRH_BRK;
|
|
|
-- writel(lcr_h, uap->port.membase + UART010_LCRH);
|
|
|
-+ __raw_writel(lcr_h, uap->port.membase + UART010_LCRH);
|
|
|
- spin_unlock_irqrestore(&uap->port.lock, flags);
|
|
|
- }
|
|
|
-
|
|
|
-@@ -332,12 +331,12 @@ static int pl010_startup(struct uart_por
|
|
|
- /*
|
|
|
- * initialise the old status of the modem signals
|
|
|
- */
|
|
|
-- uap->old_status = readb(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
|
|
|
-+ uap->old_status = __raw_readl(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
|
|
|
-
|
|
|
- /*
|
|
|
- * Finally, enable interrupts
|
|
|
- */
|
|
|
-- writel(UART01x_CR_UARTEN | UART010_CR_RIE | UART010_CR_RTIE,
|
|
|
-+ __raw_writel(UART01x_CR_UARTEN | UART010_CR_RIE | UART010_CR_RTIE,
|
|
|
- uap->port.membase + UART010_CR);
|
|
|
-
|
|
|
- return 0;
|
|
|
-@@ -360,10 +359,10 @@ static void pl010_shutdown(struct uart_p
|
|
|
- /*
|
|
|
- * disable all interrupts, disable the port
|
|
|
- */
|
|
|
-- writel(0, uap->port.membase + UART010_CR);
|
|
|
-+ __raw_writel(0, uap->port.membase + UART010_CR);
|
|
|
-
|
|
|
- /* disable break condition and fifos */
|
|
|
-- writel(readb(uap->port.membase + UART010_LCRH) &
|
|
|
-+ __raw_writel(__raw_readl(uap->port.membase + UART010_LCRH) &
|
|
|
- ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN),
|
|
|
- uap->port.membase + UART010_LCRH);
|
|
|
-
|
|
|
-@@ -385,7 +384,7 @@ pl010_set_termios(struct uart_port *port
|
|
|
- /*
|
|
|
- * Ask the core to calculate the divisor for us.
|
|
|
- */
|
|
|
-- baud = uart_get_baud_rate(port, termios, old, 0, uap->port.uartclk/16);
|
|
|
-+ baud = uart_get_baud_rate(port, termios, old, 0, uap->port.uartclk/16);
|
|
|
- quot = uart_get_divisor(port, baud);
|
|
|
-
|
|
|
- switch (termios->c_cflag & CSIZE) {
|
|
|
-@@ -448,25 +447,25 @@ pl010_set_termios(struct uart_port *port
|
|
|
- uap->port.ignore_status_mask |= UART_DUMMY_RSR_RX;
|
|
|
-
|
|
|
- /* first, disable everything */
|
|
|
-- old_cr = readb(uap->port.membase + UART010_CR) & ~UART010_CR_MSIE;
|
|
|
-+ old_cr = __raw_readl(uap->port.membase + UART010_CR) & ~UART010_CR_MSIE;
|
|
|
-
|
|
|
- if (UART_ENABLE_MS(port, termios->c_cflag))
|
|
|
- old_cr |= UART010_CR_MSIE;
|
|
|
-
|
|
|
-- writel(0, uap->port.membase + UART010_CR);
|
|
|
-+ __raw_writel(0, uap->port.membase + UART010_CR);
|
|
|
-
|
|
|
- /* Set baud rate */
|
|
|
- quot -= 1;
|
|
|
-- writel((quot & 0xf00) >> 8, uap->port.membase + UART010_LCRM);
|
|
|
-- writel(quot & 0xff, uap->port.membase + UART010_LCRL);
|
|
|
-+ __raw_writel((quot & 0xf00) >> 8, uap->port.membase + UART010_LCRM);
|
|
|
-+ __raw_writel(quot & 0xff, uap->port.membase + UART010_LCRL);
|
|
|
-
|
|
|
- /*
|
|
|
- * ----------v----------v----------v----------v-----
|
|
|
- * NOTE: MUST BE WRITTEN AFTER UARTLCR_M & UARTLCR_L
|
|
|
- * ----------^----------^----------^----------^-----
|
|
|
- */
|
|
|
-- writel(lcr_h, uap->port.membase + UART010_LCRH);
|
|
|
-- writel(old_cr, uap->port.membase + UART010_CR);
|
|
|
-+ __raw_writel(lcr_h, uap->port.membase + UART010_LCRH);
|
|
|
-+ __raw_writel(old_cr, uap->port.membase + UART010_CR);
|
|
|
-
|
|
|
- spin_unlock_irqrestore(&uap->port.lock, flags);
|
|
|
- }
|
|
|
-@@ -538,7 +537,7 @@ static struct uart_ops amba_pl010_pops =
|
|
|
- .verify_port = pl010_verify_port,
|
|
|
- };
|
|
|
-
|
|
|
--static struct uart_amba_port *amba_ports[UART_NR];
|
|
|
-+static struct uart_amba_port *amba_ports[SERIAL_AMBA_NR];
|
|
|
-
|
|
|
- #ifdef CONFIG_SERIAL_AMBA_PL010_CONSOLE
|
|
|
-
|
|
|
-@@ -548,10 +547,10 @@ static void pl010_console_putchar(struct
|
|
|
- unsigned int status;
|
|
|
-
|
|
|
- do {
|
|
|
-- status = readb(uap->port.membase + UART01x_FR);
|
|
|
-+ status = __raw_readl(uap->port.membase + UART01x_FR);
|
|
|
- barrier();
|
|
|
- } while (!UART_TX_READY(status));
|
|
|
-- writel(ch, uap->port.membase + UART01x_DR);
|
|
|
-+ __raw_writel(ch, uap->port.membase + UART01x_DR);
|
|
|
- }
|
|
|
-
|
|
|
- static void
|
|
|
-@@ -565,8 +564,8 @@ pl010_console_write(struct console *co,
|
|
|
- /*
|
|
|
- * First save the CR then disable the interrupts
|
|
|
- */
|
|
|
-- old_cr = readb(uap->port.membase + UART010_CR);
|
|
|
-- writel(UART01x_CR_UARTEN, uap->port.membase + UART010_CR);
|
|
|
-+ old_cr = __raw_readl(uap->port.membase + UART010_CR);
|
|
|
-+ __raw_writel(UART01x_CR_UARTEN, uap->port.membase + UART010_CR);
|
|
|
-
|
|
|
- uart_console_write(&uap->port, s, count, pl010_console_putchar);
|
|
|
-
|
|
|
-@@ -575,10 +574,10 @@ pl010_console_write(struct console *co,
|
|
|
- * and restore the TCR
|
|
|
- */
|
|
|
- do {
|
|
|
-- status = readb(uap->port.membase + UART01x_FR);
|
|
|
-+ status = __raw_readl(uap->port.membase + UART01x_FR);
|
|
|
- barrier();
|
|
|
- } while (status & UART01x_FR_BUSY);
|
|
|
-- writel(old_cr, uap->port.membase + UART010_CR);
|
|
|
-+ __raw_writel(old_cr, uap->port.membase + UART010_CR);
|
|
|
-
|
|
|
- clk_disable(uap->clk);
|
|
|
- }
|
|
|
-@@ -587,9 +586,9 @@ static void __init
|
|
|
- pl010_console_get_options(struct uart_amba_port *uap, int *baud,
|
|
|
- int *parity, int *bits)
|
|
|
- {
|
|
|
-- if (readb(uap->port.membase + UART010_CR) & UART01x_CR_UARTEN) {
|
|
|
-+ if (__raw_readl(uap->port.membase + UART010_CR) & UART01x_CR_UARTEN) {
|
|
|
- unsigned int lcr_h, quot;
|
|
|
-- lcr_h = readb(uap->port.membase + UART010_LCRH);
|
|
|
-+ lcr_h = __raw_readl(uap->port.membase + UART010_LCRH);
|
|
|
-
|
|
|
- *parity = 'n';
|
|
|
- if (lcr_h & UART01x_LCRH_PEN) {
|
|
|
-@@ -604,8 +603,8 @@ pl010_console_get_options(struct uart_am
|
|
|
- else
|
|
|
- *bits = 8;
|
|
|
-
|
|
|
-- quot = readb(uap->port.membase + UART010_LCRL) |
|
|
|
-- readb(uap->port.membase + UART010_LCRM) << 8;
|
|
|
-+ quot = __raw_readl(uap->port.membase + UART010_LCRL) |
|
|
|
-+ __raw_readl(uap->port.membase + UART010_LCRM) << 8;
|
|
|
- *baud = uap->port.uartclk / (16 * (quot + 1));
|
|
|
- }
|
|
|
- }
|
|
|
-@@ -623,7 +622,7 @@ static int __init pl010_console_setup(st
|
|
|
- * if so, search for the first available port that does have
|
|
|
- * console support.
|
|
|
- */
|
|
|
-- if (co->index >= UART_NR)
|
|
|
-+ if (co->index >= SERIAL_AMBA_NR)
|
|
|
- co->index = 0;
|
|
|
- uap = amba_ports[co->index];
|
|
|
- if (!uap)
|
|
|
-@@ -641,7 +640,7 @@ static int __init pl010_console_setup(st
|
|
|
-
|
|
|
- static struct uart_driver amba_reg;
|
|
|
- static struct console amba_console = {
|
|
|
-- .name = "ttyAM",
|
|
|
-+ .name = SERIAL_AMBA_NAME,
|
|
|
- .write = pl010_console_write,
|
|
|
- .device = uart_console_device,
|
|
|
- .setup = pl010_console_setup,
|
|
|
-@@ -657,11 +656,11 @@ static struct console amba_console = {
|
|
|
-
|
|
|
- static struct uart_driver amba_reg = {
|
|
|
- .owner = THIS_MODULE,
|
|
|
-- .driver_name = "ttyAM",
|
|
|
-- .dev_name = "ttyAM",
|
|
|
-+ .driver_name = SERIAL_AMBA_NAME,
|
|
|
-+ .dev_name = SERIAL_AMBA_NAME,
|
|
|
- .major = SERIAL_AMBA_MAJOR,
|
|
|
- .minor = SERIAL_AMBA_MINOR,
|
|
|
-- .nr = UART_NR,
|
|
|
-+ .nr = SERIAL_AMBA_NR,
|
|
|
- .cons = AMBA_CONSOLE,
|
|
|
- };
|
|
|
-
|
|
|
---- a/drivers/serial/Kconfig
|
|
|
-+++ b/drivers/serial/Kconfig
|
|
|
-@@ -284,10 +284,25 @@ config SERIAL_AMBA_PL010
|
|
|
- help
|
|
|
- This selects the ARM(R) AMBA(R) PrimeCell PL010 UART. If you have
|
|
|
- an Integrator/AP or Integrator/PP2 platform, or if you have a
|
|
|
-- Cirrus Logic EP93xx CPU, say Y or M here.
|
|
|
-+ Cirrus Logic EP93xx CPU or an Infineon ADM5120 SOC, say Y or M here.
|
|
|
-
|
|
|
- If unsure, say N.
|
|
|
-
|
|
|
-+config SERIAL_AMBA_PL010_NUMPORTS
|
|
|
-+ int "Maximum number of AMBA PL010 serial ports"
|
|
|
-+ depends on SERIAL_AMBA_PL010
|
|
|
-+ default "8"
|
|
|
-+ ---help---
|
|
|
-+ Set this to the number of serial ports you want the AMBA PL010 driver
|
|
|
-+ to support.
|
|
|
-+
|
|
|
-+config SERIAL_AMBA_PL010_PORTNAME
|
|
|
-+ string "Name of the AMBA PL010 serial ports"
|
|
|
-+ depends on SERIAL_AMBA_PL010
|
|
|
-+ default "ttyAM"
|
|
|
-+ ---help---
|
|
|
-+ ::: To be written :::
|
|
|
-+
|
|
|
- config SERIAL_AMBA_PL010_CONSOLE
|
|
|
- bool "Support for console on AMBA serial port"
|
|
|
- depends on SERIAL_AMBA_PL010=y
|
Gabor Juhos