Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8008cc78 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.20/omap1-fix-signed' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 00a6a845 ab6ead7d

arch/arm/mach-omap1/board-ams-delta.c

+2 −6
Original line number Diff line number Diff line
@@ -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 */