leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial: sirf: add support for new SiRFmarco SMP SoC

Browse Source 
CSR SiRFmarco's UART IP is same with SiRFprimaII except that
it has two more uart ports.
this patch makes the old driver support new SiRFmarco as well:
1. add .compatible = "sirf,marco-uart" to OF match table
2. add two ports in the port table
3. take spin_lock in isr to avoid the conflict of threads opening
uart on CPU1 and isr running on CPU0.
For 3, we did see some problems on SiRFmarco as SiRFmarco is a
SMP SoC but the old SiRFprimaII is UP.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Barry Song 2012-12-25 17:32:04 +08:00 committed by Greg Kroah-Hartman
parent 92b336f6af
commit 5425e03f97
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/tty/serial/sirfsoc_uart.c
View File

@ -75,6 +75,20 @@ static struct sirfsoc_uart_port sirfsoc_uart_ports[SIRFSOC_UART_NR] = {
.line = 2, .line = 2,
}, },
}, },
[3] = {
.port = {
.iotype = UPIO_MEM,
.flags = UPF_BOOT_AUTOCONF,
.line = 3,
},
},
[4] = {
.port = {
.iotype = UPIO_MEM,
.flags = UPF_BOOT_AUTOCONF,
.line = 4,
},
},
}; };
static inline struct sirfsoc_uart_port *to_sirfport(struct uart_port *port) static inline struct sirfsoc_uart_port *to_sirfport(struct uart_port *port)
@ -245,6 +259,7 @@ static irqreturn_t sirfsoc_uart_isr(int irq, void *dev_id)
struct uart_port *port = &sirfport->port; struct uart_port *port = &sirfport->port;
struct uart_state *state = port->state; struct uart_state *state = port->state;
struct circ_buf *xmit = &port->state->xmit; struct circ_buf *xmit = &port->state->xmit;
spin_lock(&port->lock);
intr_status = rd_regl(port, SIRFUART_INT_STATUS); intr_status = rd_regl(port, SIRFUART_INT_STATUS);
wr_regl(port, SIRFUART_INT_STATUS, intr_status); wr_regl(port, SIRFUART_INT_STATUS, intr_status);
intr_status &= rd_regl(port, SIRFUART_INT_EN); intr_status &= rd_regl(port, SIRFUART_INT_EN);
@ -254,6 +269,7 @@ static irqreturn_t sirfsoc_uart_isr(int irq, void *dev_id)
goto recv_char; goto recv_char;
uart_insert_char(port, intr_status, uart_insert_char(port, intr_status,
SIRFUART_RX_OFLOW, 0, TTY_BREAK); SIRFUART_RX_OFLOW, 0, TTY_BREAK);
spin_unlock(&port->lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
if (intr_status & SIRFUART_RX_OFLOW) if (intr_status & SIRFUART_RX_OFLOW)
@ -286,6 +302,7 @@ recv_char:
sirfsoc_uart_pio_rx_chars(port, SIRFSOC_UART_IO_RX_MAX_CNT); sirfsoc_uart_pio_rx_chars(port, SIRFSOC_UART_IO_RX_MAX_CNT);
if (intr_status & SIRFUART_TX_INT_EN) { if (intr_status & SIRFUART_TX_INT_EN) {
if (uart_circ_empty(xmit) || uart_tx_stopped(port)) { if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
spin_unlock(&port->lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} else { } else {
sirfsoc_uart_pio_tx_chars(sirfport, sirfsoc_uart_pio_tx_chars(sirfport,
@ -296,6 +313,7 @@ recv_char:
sirfsoc_uart_stop_tx(port); sirfsoc_uart_stop_tx(port);
} }
} }
spin_unlock(&port->lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -729,6 +747,7 @@ static int sirfsoc_uart_resume(struct platform_device *pdev)
static struct of_device_id sirfsoc_uart_ids[] = { static struct of_device_id sirfsoc_uart_ids[] = {
{ .compatible = "sirf,prima2-uart", }, { .compatible = "sirf,prima2-uart", },
{ .compatible = "sirf,marco-uart", },
{} {}
}; };
MODULE_DEVICE_TABLE(of, sirfsoc_serial_of_match); MODULE_DEVICE_TABLE(of, sirfsoc_serial_of_match);

2
drivers/tty/serial/sirfsoc_uart.h
View File

@ -139,7 +139,7 @@
#define SIRFSOC_UART_MINOR 0 #define SIRFSOC_UART_MINOR 0
#define SIRFUART_PORT_NAME "sirfsoc-uart" #define SIRFUART_PORT_NAME "sirfsoc-uart"
#define SIRFUART_MAP_SIZE 0x200 #define SIRFUART_MAP_SIZE 0x200
#define SIRFSOC_UART_NR 3 #define SIRFSOC_UART_NR 5
#define SIRFSOC_PORT_TYPE 0xa5 #define SIRFSOC_PORT_TYPE 0xa5
/* Baud Rate Calculation */ /* Baud Rate Calculation */