diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2008-12-10 17:35:25 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-12-10 17:35:25 -0800 |
| commit | 0b84b5ca43a9c86cfad848c135fdbf7c72af68fa (patch) | |
| tree | 9eb6f9cfb74c245bdb68be9c8814778ddc2ff1f4 /arch/arm/mach-omap1/board-h2.c | |
| parent | a007b7096feea2d865ad3e7177eb8be34041bef9 (diff) | |
| download | op-kernel-dev-0b84b5ca43a9c86cfad848c135fdbf7c72af68fa.zip op-kernel-dev-0b84b5ca43a9c86cfad848c135fdbf7c72af68fa.tar.gz | |
ARM: OMAP: switch to standard gpio get/set calls
This patch replaces some legacy OMAP GPIO calls with the "new" (not
really, any more!) calls that work on most platforms.
The calls addressed by this patch are the simple ones to get and set
values ... for code that's in mainline, including the implementations
of those calls.
Except for the declarations and definitions of those calls, all of
these changes were performed by a simple SED script. Plus, a few
"if() set() else set()" branches were merged by hand.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-h2.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 3b65914..a2914ac 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@ -250,11 +250,8 @@ static struct platform_device h2_kp_device = { #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE) static int h2_transceiver_mode(struct device *dev, int state) { - if (state & IR_SIRMODE) - omap_set_gpio_dataout(H2_IRDA_FIRSEL_GPIO_PIN, 0); - else /* MIR/FIR */ - omap_set_gpio_dataout(H2_IRDA_FIRSEL_GPIO_PIN, 1); - + /* SIR when low, else MIR/FIR when HIGH */ + gpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE)); return 0; } #endif @@ -409,7 +406,7 @@ static struct omap_board_config_kernel h2_config[] __initdata = { static int h2_nand_dev_ready(struct omap_nand_platform_data *data) { - return omap_get_gpio_datain(H2_NAND_RB_GPIO_PIN); + return gpio_get_value(H2_NAND_RB_GPIO_PIN); } static void __init h2_init(void) |
