diff options
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 3b65914b9141..a2914ac4a202 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 = { | |||
250 | #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE) | 250 | #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE) |
251 | static int h2_transceiver_mode(struct device *dev, int state) | 251 | static int h2_transceiver_mode(struct device *dev, int state) |
252 | { | 252 | { |
253 | if (state & IR_SIRMODE) | 253 | /* SIR when low, else MIR/FIR when HIGH */ |
254 | omap_set_gpio_dataout(H2_IRDA_FIRSEL_GPIO_PIN, 0); | 254 | gpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE)); |
255 | else /* MIR/FIR */ | ||
256 | omap_set_gpio_dataout(H2_IRDA_FIRSEL_GPIO_PIN, 1); | ||
257 | |||
258 | return 0; | 255 | return 0; |
259 | } | 256 | } |
260 | #endif | 257 | #endif |
@@ -409,7 +406,7 @@ static struct omap_board_config_kernel h2_config[] __initdata = { | |||
409 | 406 | ||
410 | static int h2_nand_dev_ready(struct omap_nand_platform_data *data) | 407 | static int h2_nand_dev_ready(struct omap_nand_platform_data *data) |
411 | { | 408 | { |
412 | return omap_get_gpio_datain(H2_NAND_RB_GPIO_PIN); | 409 | return gpio_get_value(H2_NAND_RB_GPIO_PIN); |
413 | } | 410 | } |
414 | 411 | ||
415 | static void __init h2_init(void) | 412 | static void __init h2_init(void) |