diff options
| author | Dorian Snyder <dastin1015@gmail.com> | 2013-06-12 02:24:45 -0700 |
|---|---|---|
| committer | Dorian Snyder <dastin1015@gmail.com> | 2013-06-20 00:06:04 -0700 |
| commit | 4b2308ce699b9c599dd6e6acf57ac11f483381d9 (patch) | |
| tree | 4c31179b06d094887b1c8ca70264cf8f184a5981 /drivers/power | |
| parent | 855d6a6c1f7c54ef073caac3f6c5f9b1ed72eb4d (diff) | |
| download | kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.zip kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.tar.gz kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.tar.bz2 | |
d710: initial support for the Epic 4G Touch (SPH-D710)
Change-Id: Iafbd9fb45253b02d539ac0ba114f57b3bf9eeed4
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/power_supply_sysfs.c | 7 | ||||
| -rw-r--r-- | drivers/power/sec_battery_u1.c | 16 |
2 files changed, 11 insertions, 12 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 009e905..a647e74 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c @@ -42,14 +42,15 @@ static ssize_t power_supply_show_property(struct device *dev, struct device_attribute *attr, char *buf) { static char *type_text[] = { - "Battery", "UPS", "Mains", "USB", - "USB_DCP", "USB_CDP", "USB_ACA" + "Unknown", "Battery", "UPS", "Mains", "USB", + "USB_DCP", "USB_CDP", "USB_ACA", + "DOCK", "MISC", "WIRELESS", "OTG" }; static char *status_text[] = { "Unknown", "Charging", "Discharging", "Not charging", "Full" }; static char *charge_type[] = { - "Unknown", "N/A", "Trickle", "Fast" + "Unknown", "N/A", "Trickle", "Fast", "Slow" }; static char *health_text[] = { "Unknown", "Good", "Overheat", "Dead", "Over voltage", diff --git a/drivers/power/sec_battery_u1.c b/drivers/power/sec_battery_u1.c index 3dcd150..112a55d 100644 --- a/drivers/power/sec_battery_u1.c +++ b/drivers/power/sec_battery_u1.c @@ -214,7 +214,7 @@ #endif #ifdef CONFIG_TARGET_LOCALE_NA -#define FULL_CHARGE_COND_VOLTAGE (4000 * 1000) /* 4.00 V */ +#define FULL_CHARGE_COND_VOLTAGE (4150 * 1000) /* 4.15 V */ #else #define FULL_CHARGE_COND_VOLTAGE (4150 * 1000) /* 4.15 V */ #endif @@ -527,14 +527,6 @@ static int sec_bat_get_property(struct power_supply *ps, break; #endif case POWER_SUPPLY_PROP_CAPACITY: -#ifdef CONFIG_TARGET_LOCALE_NA - if (info->charging_status != POWER_SUPPLY_STATUS_FULL - && info->batt_soc == 100) { - val->intval = 99; - break; - } -#endif /*CONFIG_TARGET_LOCALE_NA */ - if (info->charging_status == POWER_SUPPLY_STATUS_FULL) { val->intval = 100; break; @@ -1993,6 +1985,9 @@ static bool sec_bat_check_ing_level_trigger(struct sec_bat_info *info) #endif if (info->batt_vcell >= FULL_CHARGE_COND_VOLTAGE) { +#if defined(CONFIG_TARGET_LOCALE_NA) + if (info->batt_soc > 99){ +#endif /* USB full charged */ info->charging_int_full_count++; if (info-> @@ -2010,6 +2005,9 @@ static bool sec_bat_check_ing_level_trigger(struct sec_bat_info *info) __func__, info-> charging_int_full_count); +#if defined(CONFIG_TARGET_LOCALE_NA) + } +#endif } else { info->charging_int_full_count = 0; |