diff options
| author | Vasily Khoruzhick <anarsoul@gmail.com> | 2010-12-13 13:26:21 +0300 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-12-22 02:39:57 +0300 |
| commit | c66ae9bb4dcaac78cc5e30d0ce7ff2bf3dcb48d9 (patch) | |
| tree | 3d771944bdade9bfa9743680bbfaf7c49b52e836 /drivers/power | |
| parent | bc51e7ff521f28a7f14dc2f25307ad9101d1305a (diff) | |
| download | linux-c66ae9bb4dcaac78cc5e30d0ce7ff2bf3dcb48d9.tar.xz | |
s3c_adc_battery: Add gpio_inverted field to pdata
Add support for inverted gpio_charge_finished values.
This change is necessary for H1940 support.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/s3c_adc_battery.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c index fe16b482e912..7bc5bfe55ce9 100644 --- a/drivers/power/s3c_adc_battery.c +++ b/drivers/power/s3c_adc_battery.c @@ -112,6 +112,13 @@ static int calc_full_volt(int volt_val, int cur_val, int impedance) return volt_val + cur_val * impedance / 1000; } +static int charge_finished(struct s3c_adc_bat *bat) +{ + return bat->pdata->gpio_inverted ? + !gpio_get_value(bat->pdata->gpio_charge_finished) : + gpio_get_value(bat->pdata->gpio_charge_finished); +} + static int s3c_adc_bat_get_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) @@ -140,7 +147,7 @@ static int s3c_adc_bat_get_property(struct power_supply *psy, if (bat->cable_plugged && ((bat->pdata->gpio_charge_finished < 0) || - !gpio_get_value(bat->pdata->gpio_charge_finished))) { + !charge_finished(bat))) { lut = bat->pdata->lut_acin; lut_size = bat->pdata->lut_acin_cnt; } @@ -236,8 +243,7 @@ static void s3c_adc_bat_work(struct work_struct *work) } } else { if ((bat->pdata->gpio_charge_finished >= 0) && is_plugged) { - is_charged = gpio_get_value( - main_bat.pdata->gpio_charge_finished); + is_charged = charge_finished(&main_bat); if (is_charged) { if (bat->pdata->disable_charger) bat->pdata->disable_charger(); |