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

Commit 15f74b03 authored by David Brownell's avatar David Brownell Committed by Tony Lindgren
Browse files

ARM: OMAP: use gpio_to_irq 



Have most uses of OMAP_GPIO_IRQ() use gpio_to_irq() instead.
Calls used for table initialization are left alone, at least
this time around.

(This patch is for code in both the OMAP tree and mainline.)

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e918edf7

arch/arm/mach-omap1/board-osk.c

+6 −5
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static void __init osk_init_cf(void) 
		return;

	}

	/* the CF I/O IRQ is really active-low */

	set_irq_type(OMAP_GPIO_IRQ(62), IRQ_TYPE_EDGE_FALLING);

	set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_FALLING);

}



static void __init osk_init_irq(void)
@@ -483,7 +483,7 @@ static void __init osk_mistral_init(void) 
	omap_cfg_reg(P20_1610_GPIO4);	/* PENIRQ */

	gpio_request(4, "ts_int");

	gpio_direction_input(4);

	set_irq_type(OMAP_GPIO_IRQ(4), IRQ_TYPE_EDGE_FALLING);

	set_irq_type(gpio_to_irq(4), IRQ_TYPE_EDGE_FALLING);



	spi_register_board_info(mistral_boardinfo,

			ARRAY_SIZE(mistral_boardinfo));
@@ -492,14 +492,15 @@ static void __init osk_mistral_init(void) 
	omap_cfg_reg(N15_1610_MPUIO2);

	if (gpio_request(OMAP_MPUIO(2), "wakeup") == 0) {

		int ret = 0;

		int irq = gpio_to_irq(OMAP_MPUIO(2));



		gpio_direction_input(OMAP_MPUIO(2));

		set_irq_type(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), IRQ_TYPE_EDGE_RISING);

		set_irq_type(irq, IRQ_TYPE_EDGE_RISING);

#ifdef	CONFIG_PM

		/* share the IRQ in case someone wants to use the

		 * button for more than wakeup from system sleep.

		 */

		ret = request_irq(OMAP_GPIO_IRQ(OMAP_MPUIO(2)),

		ret = request_irq(irq,

				&osk_mistral_wake_interrupt,

				IRQF_SHARED, "mistral_wakeup",

				&osk_mistral_wake_interrupt);
@@ -508,7 +509,7 @@ static void __init osk_mistral_init(void) 
			printk(KERN_ERR "OSK+Mistral: no wakeup irq, %d?\n",

				ret);

		} else

			enable_irq_wake(OMAP_GPIO_IRQ(OMAP_MPUIO(2)));

			enable_irq_wake(irq);

#endif

	} else

		printk(KERN_ERR "OSK+Mistral: wakeup button is awol\n");

arch/arm/mach-omap1/board-palmz71.c

+4 −4
Original line number Diff line number Diff line
@@ -297,11 +297,11 @@ palmz71_powercable(int irq, void *dev_id) 
{

	if (gpio_get_value(PALMZ71_USBDETECT_GPIO)) {

		printk(KERN_INFO "PM: Power cable connected\n");

		set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),

		set_irq_type(gpio_to_irq(PALMZ71_USBDETECT_GPIO),

				IRQ_TYPE_EDGE_FALLING);

	} else {

		printk(KERN_INFO "PM: Power cable disconnected\n");

		set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),

		set_irq_type(gpio_to_irq(PALMZ71_USBDETECT_GPIO),

				IRQ_TYPE_EDGE_RISING);

	}

	return IRQ_HANDLED;
@@ -339,12 +339,12 @@ palmz71_gpio_setup(int early) 
			return;

		}

		gpio_direction_input(PALMZ71_USBDETECT_GPIO);

		if (request_irq(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),

		if (request_irq(gpio_to_irq(PALMZ71_USBDETECT_GPIO),

				palmz71_powercable, IRQF_SAMPLE_RANDOM,

				"palmz71-cable", 0))

			printk(KERN_ERR

					"IRQ request for power cable failed!\n");

		palmz71_powercable(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), 0);

		palmz71_powercable(gpio_to_irq(PALMZ71_USBDETECT_GPIO), 0);

	}

}

arch/arm/mach-omap1/board-voiceblue.c

+4 −4
Original line number Diff line number Diff line
@@ -185,10 +185,10 @@ static void __init voiceblue_init(void) 
	omap_request_gpio(13);

	omap_request_gpio(14);

	omap_request_gpio(15);

	set_irq_type(OMAP_GPIO_IRQ(12), IRQ_TYPE_EDGE_RISING);

	set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING);

	set_irq_type(OMAP_GPIO_IRQ(14), IRQ_TYPE_EDGE_RISING);

	set_irq_type(OMAP_GPIO_IRQ(15), IRQ_TYPE_EDGE_RISING);

	set_irq_type(gpio_to_irq(12), IRQ_TYPE_EDGE_RISING);

	set_irq_type(gpio_to_irq(13), IRQ_TYPE_EDGE_RISING);

	set_irq_type(gpio_to_irq(14), IRQ_TYPE_EDGE_RISING);

	set_irq_type(gpio_to_irq(15), IRQ_TYPE_EDGE_RISING);



	platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices));

	omap_board_config = voiceblue_config;

arch/arm/mach-omap1/fpga.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ void omap1510_fpga_init_irq(void) 
	 */

	omap_request_gpio(13);

	gpio_direction_input(13);

	set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING);

	set_irq_type(gpio_to_irq(13), IRQ_TYPE_EDGE_RISING);

	set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux);

}

arch/arm/mach-omap1/serial.c

+2 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr) 
		return;

	}

	gpio_direction_input(gpio_nr);

	ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt,

	ret = request_irq(gpio_to_irq(gpio_nr), &omap_serial_wake_interrupt,

			  IRQF_TRIGGER_RISING, "serial wakeup", NULL);

	if (ret) {

		omap_free_gpio(gpio_nr);
@@ -259,7 +259,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr) 
		       gpio_nr);

		return;

	}

	enable_irq_wake(OMAP_GPIO_IRQ(gpio_nr));

	enable_irq_wake(gpio_to_irq(gpio_nr));

}



static int __init omap_serial_wakeup_init(void)