Commit d5af2778 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Eric Miao

[ARM] pxa/sharpsl_pm: cleanup of gpio-related code.

Replace calls to pxa_gpio_mode with respective gpio_request() /
gpio_direction_input(). In principle these calls can be dropped as
the only use of those GPIO are IRQs and IRQ code does setup GPIO
correctly.
Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 54525372
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/gpio.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/pm.h> #include <mach/pm.h>
...@@ -918,9 +919,12 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev) ...@@ -918,9 +919,12 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev)
sharpsl_pm.machinfo->init(); sharpsl_pm.machinfo->init();
pxa_gpio_mode(sharpsl_pm.machinfo->gpio_acin | GPIO_IN); gpio_request(sharpsl_pm.machinfo->gpio_acin, "AC IN");
pxa_gpio_mode(sharpsl_pm.machinfo->gpio_batfull | GPIO_IN); gpio_direction_input(sharpsl_pm.machinfo->gpio_acin);
pxa_gpio_mode(sharpsl_pm.machinfo->gpio_batlock | GPIO_IN); gpio_request(sharpsl_pm.machinfo->gpio_batfull, "Battery Full");
gpio_direction_input(sharpsl_pm.machinfo->gpio_batfull);
gpio_request(sharpsl_pm.machinfo->gpio_batlock, "Battery Lock");
gpio_direction_input(sharpsl_pm.machinfo->gpio_batlock);
/* Register interrupt handlers */ /* Register interrupt handlers */
if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, "AC Input Detect", sharpsl_ac_isr)) { if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, "AC Input Detect", sharpsl_ac_isr)) {
...@@ -979,6 +983,10 @@ static int sharpsl_pm_remove(struct platform_device *pdev) ...@@ -979,6 +983,10 @@ static int sharpsl_pm_remove(struct platform_device *pdev)
if (sharpsl_pm.machinfo->batfull_irq) if (sharpsl_pm.machinfo->batfull_irq)
free_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr); free_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr);
gpio_free(sharpsl_pm.machinfo->gpio_batlock);
gpio_free(sharpsl_pm.machinfo->gpio_batfull);
gpio_free(sharpsl_pm.machinfo->gpio_acin);
if (sharpsl_pm.machinfo->exit) if (sharpsl_pm.machinfo->exit)
sharpsl_pm.machinfo->exit(); sharpsl_pm.machinfo->exit();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment