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

serial: xilinx: Use platform_get_irq to get irq description structure 

For systems with CONFIG_SERIAL_OF_PLATFORM=y and device_type =
"serial"; property in DT of_serial.c driver maps and unmaps IRQ (because
driver probe fails). Then a driver is called but irq mapping is not
created that's why driver is failing again in again on request_irq().
Based on this use platform_get_irq() instead of platform_get_resource()
which is doing irq_desc allocation and driver itself can request IRQ.

Fix both xilinx serial drivers in the tree.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
CC: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michal Simek 2015-04-13 16:34:21 +02:00 committed by Greg Kroah-Hartman
parent 10afbe346b
commit 5c90c07b98
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/tty/serial/uartlite.c
View File

@ -632,7 +632,8 @@ MODULE_DEVICE_TABLE(of, ulite_of_match);
static int ulite_probe(struct platform_device *pdev) static int ulite_probe(struct platform_device *pdev)
{ {
struct resource *res, *res2; struct resource *res;
int irq;
int id = pdev->id; int id = pdev->id;
#ifdef CONFIG_OF #ifdef CONFIG_OF
const __be32 *prop; const __be32 *prop;
@ -646,11 +647,11 @@ static int ulite_probe(struct platform_device *pdev)
if (!res) if (!res)
return -ENODEV; return -ENODEV;
res2 = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq = platform_get_irq(pdev, 0);
if (!res2) if (irq <= 0)
return -ENODEV; return -ENXIO;
return ulite_assign(&pdev->dev, id, res->start, res2->start); return ulite_assign(&pdev->dev, id, res->start, irq);
} }
static int ulite_remove(struct platform_device *pdev) static int ulite_remove(struct platform_device *pdev)

12
drivers/tty/serial/xilinx_uartps.c
View File

@ -1331,9 +1331,9 @@ static SIMPLE_DEV_PM_OPS(cdns_uart_dev_pm_ops, cdns_uart_suspend,
*/ */
static int cdns_uart_probe(struct platform_device *pdev) static int cdns_uart_probe(struct platform_device *pdev)
{ {
int rc, id; int rc, id, irq;
struct uart_port *port; struct uart_port *port;
struct resource *res, *res2; struct resource *res;
struct cdns_uart *cdns_uart_data; struct cdns_uart *cdns_uart_data;
cdns_uart_data = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_data), cdns_uart_data = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_data),
@ -1380,9 +1380,9 @@ static int cdns_uart_probe(struct platform_device *pdev)
goto err_out_clk_disable; goto err_out_clk_disable;
} }
res2 = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq = platform_get_irq(pdev, 0);
if (!res2) { if (irq <= 0) {
rc = -ENODEV; rc = -ENXIO;
goto err_out_clk_disable; goto err_out_clk_disable;
} }
@ -1411,7 +1411,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
* and triggers invocation of the config_port() entry point. * and triggers invocation of the config_port() entry point.
*/ */
port->mapbase = res->start; port->mapbase = res->start;
port->irq = res2->start; port->irq = irq;
port->dev = &pdev->dev; port->dev = &pdev->dev;
port->uartclk = clk_get_rate(cdns_uart_data->uartclk); port->uartclk = clk_get_rate(cdns_uart_data->uartclk);
port->private_data = cdns_uart_data; port->private_data = cdns_uart_data;