Commit 47918f05 authored by Sonic Zhang's avatar Sonic Zhang Committed by Greg Kroah-Hartman

serial:bfin_uart: Put TX IRQ in individual platform resource.

Serial TX IRQ is not RX IRQ plus 1 in some blackfin chips.
Give individual platform resources to both TX and RX irqs.
Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 502fcb79
...@@ -667,17 +667,17 @@ static int bfin_serial_startup(struct uart_port *port) ...@@ -667,17 +667,17 @@ static int bfin_serial_startup(struct uart_port *port)
kgdboc_break_enabled = 0; kgdboc_break_enabled = 0;
else { else {
# endif # endif
if (request_irq(uart->port.irq, bfin_serial_rx_int, IRQF_DISABLED, if (request_irq(uart->rx_irq, bfin_serial_rx_int, IRQF_DISABLED,
"BFIN_UART_RX", uart)) { "BFIN_UART_RX", uart)) {
printk(KERN_NOTICE "Unable to attach BlackFin UART RX interrupt\n"); printk(KERN_NOTICE "Unable to attach BlackFin UART RX interrupt\n");
return -EBUSY; return -EBUSY;
} }
if (request_irq if (request_irq
(uart->port.irq+1, bfin_serial_tx_int, IRQF_DISABLED, (uart->tx_irq, bfin_serial_tx_int, IRQF_DISABLED,
"BFIN_UART_TX", uart)) { "BFIN_UART_TX", uart)) {
printk(KERN_NOTICE "Unable to attach BlackFin UART TX interrupt\n"); printk(KERN_NOTICE "Unable to attach BlackFin UART TX interrupt\n");
free_irq(uart->port.irq, uart); free_irq(uart->rx_irq, uart);
return -EBUSY; return -EBUSY;
} }
...@@ -692,7 +692,7 @@ static int bfin_serial_startup(struct uart_port *port) ...@@ -692,7 +692,7 @@ static int bfin_serial_startup(struct uart_port *port)
*/ */
unsigned uart_dma_ch_rx, uart_dma_ch_tx; unsigned uart_dma_ch_rx, uart_dma_ch_tx;
switch (uart->port.irq) { switch (uart->rx_irq) {
case IRQ_UART3_RX: case IRQ_UART3_RX:
uart_dma_ch_rx = CH_UART3_RX; uart_dma_ch_rx = CH_UART3_RX;
uart_dma_ch_tx = CH_UART3_TX; uart_dma_ch_tx = CH_UART3_TX;
...@@ -709,16 +709,16 @@ static int bfin_serial_startup(struct uart_port *port) ...@@ -709,16 +709,16 @@ static int bfin_serial_startup(struct uart_port *port)
if (uart_dma_ch_rx && if (uart_dma_ch_rx &&
request_dma(uart_dma_ch_rx, "BFIN_UART_RX") < 0) { request_dma(uart_dma_ch_rx, "BFIN_UART_RX") < 0) {
printk(KERN_NOTICE"Fail to attach UART interrupt\n"); printk(KERN_NOTICE"Fail to attach UART interrupt\n");
free_irq(uart->port.irq, uart); free_irq(uart->rx_irq, uart);
free_irq(uart->port.irq + 1, uart); free_irq(uart->tx_irq, uart);
return -EBUSY; return -EBUSY;
} }
if (uart_dma_ch_tx && if (uart_dma_ch_tx &&
request_dma(uart_dma_ch_tx, "BFIN_UART_TX") < 0) { request_dma(uart_dma_ch_tx, "BFIN_UART_TX") < 0) {
printk(KERN_NOTICE "Fail to attach UART interrupt\n"); printk(KERN_NOTICE "Fail to attach UART interrupt\n");
free_dma(uart_dma_ch_rx); free_dma(uart_dma_ch_rx);
free_irq(uart->port.irq, uart); free_irq(uart->rx_irq, uart);
free_irq(uart->port.irq + 1, uart); free_irq(uart->tx_irq, uart);
return -EBUSY; return -EBUSY;
} }
} }
...@@ -785,8 +785,8 @@ static void bfin_serial_shutdown(struct uart_port *port) ...@@ -785,8 +785,8 @@ static void bfin_serial_shutdown(struct uart_port *port)
break; break;
}; };
#endif #endif
free_irq(uart->port.irq, uart); free_irq(uart->rx_irq, uart);
free_irq(uart->port.irq+1, uart); free_irq(uart->tx_irq, uart);
#endif #endif
#ifdef CONFIG_SERIAL_BFIN_CTSRTS #ifdef CONFIG_SERIAL_BFIN_CTSRTS
...@@ -1319,14 +1319,22 @@ static int bfin_serial_probe(struct platform_device *pdev) ...@@ -1319,14 +1319,22 @@ static int bfin_serial_probe(struct platform_device *pdev)
} }
uart->port.mapbase = res->start; uart->port.mapbase = res->start;
uart->port.irq = platform_get_irq(pdev, 0); uart->tx_irq = platform_get_irq(pdev, 0);
if (uart->port.irq < 0) { if (uart->tx_irq < 0) {
dev_err(&pdev->dev, "No uart RX/TX IRQ specified\n"); dev_err(&pdev->dev, "No uart TX IRQ specified\n");
ret = -ENOENT; ret = -ENOENT;
goto out_error_unmap; goto out_error_unmap;
} }
uart->status_irq = platform_get_irq(pdev, 1); uart->rx_irq = platform_get_irq(pdev, 1);
if (uart->rx_irq < 0) {
dev_err(&pdev->dev, "No uart RX IRQ specified\n");
ret = -ENOENT;
goto out_error_unmap;
}
uart->port.irq = uart->rx_irq;
uart->status_irq = platform_get_irq(pdev, 2);
if (uart->status_irq < 0) { if (uart->status_irq < 0) {
dev_err(&pdev->dev, "No uart status IRQ specified\n"); dev_err(&pdev->dev, "No uart status IRQ specified\n");
ret = -ENOENT; ret = -ENOENT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment