forked from luck/tmp_suning_uos_patched
Fix for omap1 ams-delta irq
We need to use IRQ_NOTCONNECTED instead of -EINVAL for ams_delta_modem_ports irq. -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlvIw3IRHHRvbnlAYXRv bWlkZS5jb20ACgkQG9Q+yVyrpXNdhhAAn/zKiWJlWJSdOp2cgO3YfTfxIBukW/7Y x9tNjVFYoxuTs280ONg0TcoXs3dC/5D+wybvM+S6AX0oLRpYCn1Yh+MJpqp7XlVE k7bRo8yXv596DLhSgCUc/h7dYWQwH9GsawV5zAEX7O/s42YJLi8gLkk6ziXwY6Vc CxWP0XtO/Qf8ROpWiMoSk0Uz6lAHBtch+Lm0NA2ndR8gZDq/ek/7sBire5r8YR9q HW/pRsCQiXULxlSdEN8C+Yg5eg2S32mCvIKOaoUrkqGjb/RLg6aMbF2ntwEG4NCs g1gYcmmGBkGfisZjH35xj6KjhWC6cPKiijVhJf8bRhqrprYcb5rycHyyube6Eooh O1DCxomNjvKGYSLsgSXM3IMk4AmnAounCV4yWX87L+Cj88te8l17hSPDR2vJgxk9 1QjHokx2yl4eswqioOcTYlkNjqf1zAVk2sPin6gddyRanaOJjI798cfjPii20hXn BaEB3COEcYyuSaQx8umRkTFsTk6qd6kXgAcYmgHdUDffdQ4UVlPkHcsYHNE2db9D NFViYybFrR93MQMcDTwtkgEc5UXpyczdtGB6mENukYGhEQhjKgQH7OhKK4V6v0Mc zmxLtNqDqsNo5chGTL4KOMvoFZNhNA+Sb3dTwYnd27cEdTYalIO3rHcxXR/q2bQm JpkSZFsLI5c= =SgVo -----END PGP SIGNATURE----- Merge tag 'omap-for-v4.20/omap1-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Fix for omap1 ams-delta irq We need to use IRQ_NOTCONNECTED instead of -EINVAL for ams_delta_modem_ports irq. * tag 'omap-for-v4.20/omap1-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP1: ams-delta: Fix impossible .irq < 0 Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
8008cc78d3
|
@ -773,7 +773,7 @@ static struct plat_serial8250_port ams_delta_modem_ports[] = {
|
|||
{
|
||||
.membase = IOMEM(MODEM_VIRT),
|
||||
.mapbase = MODEM_PHYS,
|
||||
.irq = -EINVAL, /* changed later */
|
||||
.irq = IRQ_NOTCONNECTED, /* changed later */
|
||||
.flags = UPF_BOOT_AUTOCONF,
|
||||
.irqflags = IRQF_TRIGGER_RISING,
|
||||
.iotype = UPIO_MEM,
|
||||
|
@ -864,8 +864,7 @@ static int __init modem_nreset_init(void)
|
|||
|
||||
|
||||
/*
|
||||
* This function expects MODEM IRQ number already assigned to the port
|
||||
* and fails if it's not.
|
||||
* This function expects MODEM IRQ number already assigned to the port.
|
||||
* The MODEM device requires its RESET# pin kept high during probe.
|
||||
* That requirement can be fulfilled in several ways:
|
||||
* - with a descriptor of already functional modem_nreset regulator
|
||||
|
@ -888,9 +887,6 @@ static int __init ams_delta_modem_init(void)
|
|||
if (!machine_is_ams_delta())
|
||||
return -ENODEV;
|
||||
|
||||
if (ams_delta_modem_ports[0].irq < 0)
|
||||
return ams_delta_modem_ports[0].irq;
|
||||
|
||||
omap_cfg_reg(M14_1510_GPIO2);
|
||||
|
||||
/* Initialize the modem_nreset regulator consumer before use */
|
||||
|
|
Loading…
Reference in New Issue
Block a user