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

Commit 40e3925b authored by David Brownell's avatar David Brownell Committed by Tony Lindgren
Browse files

ARM: OMAP: switch to gpio_direction_input 



More switchover to the cross-platform GPIO interface:
use gpio_direction_input(), not an OMAP-specific call.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -351,14 +351,14 @@ static void __init palmte_misc_gpio_setup(void) 
		printk(KERN_ERR "Could not reserve PINTDAV GPIO!\n");

		return;

	}

	omap_set_gpio_direction(PALMTE_PINTDAV_GPIO, 1);

	gpio_direction_input(PALMTE_PINTDAV_GPIO);



	/* Set USB-or-DC-IN pin as input (unused) */

	if (omap_request_gpio(PALMTE_USB_OR_DC_GPIO)) {

		printk(KERN_ERR "Could not reserve cable signal GPIO!\n");

		return;

	}

	omap_set_gpio_direction(PALMTE_USB_OR_DC_GPIO, 1);

	gpio_direction_input(PALMTE_USB_OR_DC_GPIO);

}



static void __init omap_palmte_init(void)

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

+2 −2
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ palmz71_gpio_setup(int early) 
			printk(KERN_ERR "Could not reserve WP GPIO!\n");

			return;

		}

		omap_set_gpio_direction(PALMZ71_MMC_WP_GPIO, 1);

		gpio_direction_input(PALMZ71_MMC_WP_GPIO);



		/* Monitor the Power-cable-connected signal */

		if (omap_request_gpio(PALMZ71_USBDETECT_GPIO)) {
@@ -339,7 +339,7 @@ palmz71_gpio_setup(int early) 
				"Could not reserve cable signal GPIO!\n");

			return;

		}

		omap_set_gpio_direction(PALMZ71_USBDETECT_GPIO, 1);

		gpio_direction_input(PALMZ71_USBDETECT_GPIO);

		if (request_irq(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),

				palmz71_powercable, IRQF_SAMPLE_RANDOM,

				"palmz71-cable", 0))

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

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ void voiceblue_wdt_disable(void) 
	gpio_set_value(0, 0);

	gpio_set_value(0, 1);

	gpio_set_value(0, 0);

	omap_set_gpio_direction(0, 1);

	gpio_direction_input(0);

}



void voiceblue_wdt_ping(void)

arch/arm/mach-omap1/fpga.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ void omap1510_fpga_init_irq(void) 
	 * gpio.[ch]

	 */

	omap_request_gpio(13);

	omap_set_gpio_direction(13, 1);

	gpio_direction_input(13);

	set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING);

	set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux);

}

arch/arm/mach-omap1/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr) 
		       gpio_nr);

		return;

	}

	omap_set_gpio_direction(gpio_nr, 1);

	gpio_direction_input(gpio_nr);

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

			  IRQF_TRIGGER_RISING, "serial wakeup", NULL);

	if (ret) {