diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-palmz71.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index e719294250b1..c33766c4dd92 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c | |||
@@ -239,7 +239,7 @@ static struct platform_device *devices[] __initdata = { | |||
239 | static int | 239 | static int |
240 | palmz71_get_pendown_state(void) | 240 | palmz71_get_pendown_state(void) |
241 | { | 241 | { |
242 | return !omap_get_gpio_datain(PALMZ71_PENIRQ_GPIO); | 242 | return !gpio_get_value(PALMZ71_PENIRQ_GPIO); |
243 | } | 243 | } |
244 | 244 | ||
245 | static const struct ads7846_platform_data palmz71_ts_info = { | 245 | static const struct ads7846_platform_data palmz71_ts_info = { |
@@ -295,7 +295,7 @@ static struct omap_board_config_kernel palmz71_config[] __initdata = { | |||
295 | static irqreturn_t | 295 | static irqreturn_t |
296 | palmz71_powercable(int irq, void *dev_id) | 296 | palmz71_powercable(int irq, void *dev_id) |
297 | { | 297 | { |
298 | if (omap_get_gpio_datain(PALMZ71_USBDETECT_GPIO)) { | 298 | if (gpio_get_value(PALMZ71_USBDETECT_GPIO)) { |
299 | printk(KERN_INFO "PM: Power cable connected\n"); | 299 | printk(KERN_INFO "PM: Power cable connected\n"); |
300 | set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), | 300 | set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), |
301 | IRQ_TYPE_EDGE_FALLING); | 301 | IRQ_TYPE_EDGE_FALLING); |
@@ -323,7 +323,7 @@ palmz71_gpio_setup(int early) | |||
323 | { | 323 | { |
324 | if (early) { | 324 | if (early) { |
325 | /* Only set GPIO1 so we have a working serial */ | 325 | /* Only set GPIO1 so we have a working serial */ |
326 | omap_set_gpio_dataout(1, 1); | 326 | gpio_set_value(1, 1); |
327 | omap_set_gpio_direction(1, 0); | 327 | omap_set_gpio_direction(1, 0); |
328 | } else { | 328 | } else { |
329 | /* Set MMC/SD host WP pin as input */ | 329 | /* Set MMC/SD host WP pin as input */ |