diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-palmte.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index b58043644a6f..df663ba7ea88 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -255,7 +255,7 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery) | |||
255 | { | 255 | { |
256 | int charging, batt, hi, lo, mid; | 256 | int charging, batt, hi, lo, mid; |
257 | 257 | ||
258 | charging = !omap_get_gpio_datain(PALMTE_DC_GPIO); | 258 | charging = !gpio_get_value(PALMTE_DC_GPIO); |
259 | batt = battery[0]; | 259 | batt = battery[0]; |
260 | if (charging) | 260 | if (charging) |
261 | batt -= 60; | 261 | batt -= 60; |
@@ -335,11 +335,11 @@ static void palmte_headphones_detect(void *data, int state) | |||
335 | { | 335 | { |
336 | if (state) { | 336 | if (state) { |
337 | /* Headphones connected, disable speaker */ | 337 | /* Headphones connected, disable speaker */ |
338 | omap_set_gpio_dataout(PALMTE_SPEAKER_GPIO, 0); | 338 | gpio_set_value(PALMTE_SPEAKER_GPIO, 0); |
339 | printk(KERN_INFO "PM: speaker off\n"); | 339 | printk(KERN_INFO "PM: speaker off\n"); |
340 | } else { | 340 | } else { |
341 | /* Headphones unplugged, re-enable speaker */ | 341 | /* Headphones unplugged, re-enable speaker */ |
342 | omap_set_gpio_dataout(PALMTE_SPEAKER_GPIO, 1); | 342 | gpio_set_value(PALMTE_SPEAKER_GPIO, 1); |
343 | printk(KERN_INFO "PM: speaker on\n"); | 343 | printk(KERN_INFO "PM: speaker on\n"); |
344 | } | 344 | } |
345 | } | 345 | } |