mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
serial: cpm_uart: Don't request IRQ too early for console port
commit30963b2f75
upstream. The following message is seen during boot and the activation of console port gets delayed until normal serial ports activation. [ 0.001346] irq: no irq domain found for pic@930 ! The console port doesn't need irq, perform irq reservation later, during cpm_uart probe. While at it, don't use NO_IRQ but 0 which is the value returned by irq_of_parse_and_map() in case of error. By chance powerpc's NO_IRQ has value 0 but on some architectures it is -1. Fixes:14d893fc68
("powerpc/8xx: Convert CPM1 interrupt controller to platform_device") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Link: https://lore.kernel.org/r/8bed0f30c2e9ef16ae64fb1243a16d54a48eb8da.1664526717.git.christophe.leroy@csgroup.eu Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1680dbf512
commit
5064982437
1 changed files with 11 additions and 13 deletions
|
@ -1214,12 +1214,6 @@ static int cpm_uart_init_port(struct device_node *np,
|
||||||
pinfo->port.fifosize = pinfo->tx_nrfifos * pinfo->tx_fifosize;
|
pinfo->port.fifosize = pinfo->tx_nrfifos * pinfo->tx_fifosize;
|
||||||
spin_lock_init(&pinfo->port.lock);
|
spin_lock_init(&pinfo->port.lock);
|
||||||
|
|
||||||
pinfo->port.irq = irq_of_parse_and_map(np, 0);
|
|
||||||
if (pinfo->port.irq == NO_IRQ) {
|
|
||||||
ret = -EINVAL;
|
|
||||||
goto out_pram;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < NUM_GPIOS; i++) {
|
for (i = 0; i < NUM_GPIOS; i++) {
|
||||||
struct gpio_desc *gpiod;
|
struct gpio_desc *gpiod;
|
||||||
|
|
||||||
|
@ -1229,7 +1223,7 @@ static int cpm_uart_init_port(struct device_node *np,
|
||||||
|
|
||||||
if (IS_ERR(gpiod)) {
|
if (IS_ERR(gpiod)) {
|
||||||
ret = PTR_ERR(gpiod);
|
ret = PTR_ERR(gpiod);
|
||||||
goto out_irq;
|
goto out_pram;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gpiod) {
|
if (gpiod) {
|
||||||
|
@ -1255,8 +1249,6 @@ static int cpm_uart_init_port(struct device_node *np,
|
||||||
|
|
||||||
return cpm_uart_request_port(&pinfo->port);
|
return cpm_uart_request_port(&pinfo->port);
|
||||||
|
|
||||||
out_irq:
|
|
||||||
irq_dispose_mapping(pinfo->port.irq);
|
|
||||||
out_pram:
|
out_pram:
|
||||||
cpm_uart_unmap_pram(pinfo, pram);
|
cpm_uart_unmap_pram(pinfo, pram);
|
||||||
out_mem:
|
out_mem:
|
||||||
|
@ -1436,11 +1428,17 @@ static int cpm_uart_probe(struct platform_device *ofdev)
|
||||||
/* initialize the device pointer for the port */
|
/* initialize the device pointer for the port */
|
||||||
pinfo->port.dev = &ofdev->dev;
|
pinfo->port.dev = &ofdev->dev;
|
||||||
|
|
||||||
ret = cpm_uart_init_port(ofdev->dev.of_node, pinfo);
|
pinfo->port.irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
|
||||||
if (ret)
|
if (!pinfo->port.irq)
|
||||||
return ret;
|
return -EINVAL;
|
||||||
|
|
||||||
return uart_add_one_port(&cpm_reg, &pinfo->port);
|
ret = cpm_uart_init_port(ofdev->dev.of_node, pinfo);
|
||||||
|
if (!ret)
|
||||||
|
return uart_add_one_port(&cpm_reg, &pinfo->port);
|
||||||
|
|
||||||
|
irq_dispose_mapping(pinfo->port.irq);
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cpm_uart_remove(struct platform_device *ofdev)
|
static int cpm_uart_remove(struct platform_device *ofdev)
|
||||||
|
|
Loading…
Reference in a new issue