p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial: atmel: convert to irq handling provided mctrl-gpio 

Tested-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Uwe Kleine-König 2015-10-18 21:34:45 +02:00 committed by Greg Kroah-Hartman
parent 456ad4a138
commit 18dfef9c7f
1 changed files with 18 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
drivers/tty/serial/atmel_serial.c
View File

@ -155,7 +155,6 @@ struct atmel_uart_port {
struct circ_buf rx_ring; struct circ_buf rx_ring;
struct mctrl_gpios *gpios; struct mctrl_gpios *gpios;
int gpio_irq[UART_GPIO_MAX];
unsigned int tx_done_mask; unsigned int tx_done_mask;
u32 fifo_size; u32 fifo_size;
u32 rts_high; u32 rts_high;
@ -550,27 +549,21 @@ static void atmel_enable_ms(struct uart_port *port)
atmel_port->ms_irq_enabled = true; atmel_port->ms_irq_enabled = true;
if (atmel_port->gpio_irq[UART_GPIO_CTS] >= 0) if (!mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_CTS))
enable_irq(atmel_port->gpio_irq[UART_GPIO_CTS]);
else
ier |= ATMEL_US_CTSIC; ier |= ATMEL_US_CTSIC;
if (atmel_port->gpio_irq[UART_GPIO_DSR] >= 0) if (!mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_DSR))
enable_irq(atmel_port->gpio_irq[UART_GPIO_DSR]);
else
ier |= ATMEL_US_DSRIC; ier |= ATMEL_US_DSRIC;
if (atmel_port->gpio_irq[UART_GPIO_RI] >= 0) if (!mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_RI))
enable_irq(atmel_port->gpio_irq[UART_GPIO_RI]);
else
ier |= ATMEL_US_RIIC; ier |= ATMEL_US_RIIC;
if (atmel_port->gpio_irq[UART_GPIO_DCD] >= 0) if (!mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_DCD))
enable_irq(atmel_port->gpio_irq[UART_GPIO_DCD]);
else
ier |= ATMEL_US_DCDIC; ier |= ATMEL_US_DCDIC;
atmel_uart_writel(port, ATMEL_US_IER, ier); atmel_uart_writel(port, ATMEL_US_IER, ier);
mctrl_gpio_enable_ms(atmel_port->gpios);
} }
/* /*
@ -589,24 +582,18 @@ static void atmel_disable_ms(struct uart_port *port)
atmel_port->ms_irq_enabled = false; atmel_port->ms_irq_enabled = false;
if (atmel_port->gpio_irq[UART_GPIO_CTS] >= 0) mctrl_gpio_disable_ms(atmel_port->gpios);
disable_irq(atmel_port->gpio_irq[UART_GPIO_CTS]);
else if (!mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_CTS))
idr |= ATMEL_US_CTSIC; idr |= ATMEL_US_CTSIC;
if (atmel_port->gpio_irq[UART_GPIO_DSR] >= 0) if (!mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_DSR))
disable_irq(atmel_port->gpio_irq[UART_GPIO_DSR]);
else
idr |= ATMEL_US_DSRIC; idr |= ATMEL_US_DSRIC;
if (atmel_port->gpio_irq[UART_GPIO_RI] >= 0) if (!mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_RI))
disable_irq(atmel_port->gpio_irq[UART_GPIO_RI]);
else
idr |= ATMEL_US_RIIC; idr |= ATMEL_US_RIIC;
if (atmel_port->gpio_irq[UART_GPIO_DCD] >= 0) if (!mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_DCD))
disable_irq(atmel_port->gpio_irq[UART_GPIO_DCD]);
else
idr |= ATMEL_US_DCDIC; idr |= ATMEL_US_DCDIC;
atmel_uart_writel(port, ATMEL_US_IDR, idr); atmel_uart_writel(port, ATMEL_US_IDR, idr);
@ -1264,7 +1251,6 @@ static irqreturn_t atmel_interrupt(int irq, void *dev_id)
struct uart_port *port = dev_id; struct uart_port *port = dev_id;
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
unsigned int status, pending, mask, pass_counter = 0; unsigned int status, pending, mask, pass_counter = 0;
bool gpio_handled = false;
spin_lock(&atmel_port->lock_suspended); spin_lock(&atmel_port->lock_suspended);
@ -1272,24 +1258,6 @@ static irqreturn_t atmel_interrupt(int irq, void *dev_id)
status = atmel_get_lines_status(port); status = atmel_get_lines_status(port);
mask = atmel_uart_readl(port, ATMEL_US_IMR); mask = atmel_uart_readl(port, ATMEL_US_IMR);
pending = status & mask; pending = status & mask;
if (!gpio_handled) {
/*
* Dealing with GPIO interrupt
*/
if (irq == atmel_port->gpio_irq[UART_GPIO_CTS])
pending |= ATMEL_US_CTSIC;
if (irq == atmel_port->gpio_irq[UART_GPIO_DSR])
pending |= ATMEL_US_DSRIC;
if (irq == atmel_port->gpio_irq[UART_GPIO_RI])
pending |= ATMEL_US_RIIC;
if (irq == atmel_port->gpio_irq[UART_GPIO_DCD])
pending |= ATMEL_US_DCDIC;
gpio_handled = true;
}
if (!pending) if (!pending)
break; break;
@ -1778,45 +1746,6 @@ static void atmel_get_ip_name(struct uart_port *port)
} }
} }
static void atmel_free_gpio_irq(struct uart_port *port)
{
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
enum mctrl_gpio_idx i;
for (i = 0; i < UART_GPIO_MAX; i++)
if (atmel_port->gpio_irq[i] >= 0)
free_irq(atmel_port->gpio_irq[i], port);
}
static int atmel_request_gpio_irq(struct uart_port *port)
{
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
int *irq = atmel_port->gpio_irq;
enum mctrl_gpio_idx i;
int err = 0;
for (i = 0; (i < UART_GPIO_MAX) && !err; i++) {
if (irq[i] < 0)
continue;
irq_set_status_flags(irq[i], IRQ_NOAUTOEN);
err = request_irq(irq[i], atmel_interrupt, IRQ_TYPE_EDGE_BOTH,
"atmel_serial", port);
if (err)
dev_err(port->dev, "atmel_startup - Can't get %d irq\n",
irq[i]);
}
/*
* If something went wrong, rollback.
*/
while (err && (--i >= 0))
if (irq[i] >= 0)
free_irq(irq[i], port);
return err;
}
/* /*
* Perform initialization and enable port for reception * Perform initialization and enable port for reception
*/ */
@ -1846,13 +1775,6 @@ static int atmel_startup(struct uart_port *port)
return retval; return retval;
} }
/*
* Get the GPIO lines IRQ
*/
retval = atmel_request_gpio_irq(port);
if (retval)
goto free_irq;
tasklet_enable(&atmel_port->tasklet); tasklet_enable(&atmel_port->tasklet);
/* /*
@ -1948,11 +1870,6 @@ static int atmel_startup(struct uart_port *port)
} }
return 0; return 0;
free_irq:
free_irq(port->irq, port);
return retval;
} }
/* /*
@ -2018,7 +1935,6 @@ static void atmel_shutdown(struct uart_port *port)
* Free the interrupts * Free the interrupts
*/ */
free_irq(port->irq, port); free_irq(port->irq, port);
atmel_free_gpio_irq(port);
atmel_port->ms_irq_enabled = false; atmel_port->ms_irq_enabled = false;
@ -2686,26 +2602,6 @@ static int atmel_serial_resume(struct platform_device *pdev)
#define atmel_serial_resume NULL #define atmel_serial_resume NULL
#endif #endif
static int atmel_init_gpios(struct atmel_uart_port *p, struct device *dev)
{
enum mctrl_gpio_idx i;
struct gpio_desc *gpiod;
p->gpios = mctrl_gpio_init_noauto(dev, 0);
if (IS_ERR(p->gpios))
return PTR_ERR(p->gpios);
for (i = 0; i < UART_GPIO_MAX; i++) {
gpiod = mctrl_gpio_to_gpiod(p->gpios, i);
if (gpiod && (gpiod_get_direction(gpiod) == GPIOF_DIR_IN))
p->gpio_irq[i] = gpiod_to_irq(gpiod);
else
p->gpio_irq[i] = -EINVAL;
}
return 0;
}
static void atmel_serial_probe_fifos(struct atmel_uart_port *port, static void atmel_serial_probe_fifos(struct atmel_uart_port *port,
struct platform_device *pdev) struct platform_device *pdev)
{ {
@ -2788,16 +2684,16 @@ static int atmel_serial_probe(struct platform_device *pdev)
spin_lock_init(&port->lock_suspended); spin_lock_init(&port->lock_suspended);
ret = atmel_init_gpios(port, &pdev->dev);
if (ret < 0) {
dev_err(&pdev->dev, "Failed to initialize GPIOs.");
goto err_clear_bit;
}
ret = atmel_init_port(port, pdev); ret = atmel_init_port(port, pdev);
if (ret) if (ret)
goto err_clear_bit; goto err_clear_bit;
port->gpios = mctrl_gpio_init(&port->uart, 0);
if (IS_ERR(port->gpios)) {
ret = PTR_ERR(port->gpios);
goto err_clear_bit;
}
if (!atmel_use_pdc_rx(&port->uart)) { if (!atmel_use_pdc_rx(&port->uart)) {
ret = -ENOMEM; ret = -ENOMEM;
data = kmalloc(sizeof(struct atmel_uart_char) data = kmalloc(sizeof(struct atmel_uart_char)