Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6

Pull battery updates from Anton Vorontsov:
 "A bunch of fixes for v3.5, nothing extraordinary."

* tag 'for-v3.5' of git://git.infradead.org/battery-2.6: (27 commits)
  smb347-charger: Include missing <linux/err.h>
  smb347-charger: Clean up battery attributes
  max17042_battery: Add support for max17047/50 chip
  sbs-battery.c: Capacity attr = remaining relative capacity
  isp1704_charger: Use after free on probe error
  ds2781_battery: Use DS2781_PARAM_EEPROM_SIZE and DS2781_USER_EEPROM_SIZE
  power_supply: Fix a typo in BATTERY_DS2781 Kconfig entry
  charger-manager: Provide cm_notify_event function for in-kernel use
  charger-manager: Poll battery health in normal state
  smb347-charger: Convert to regmap API
  smb347-charger: Move IRQ enabling to the end of probe
  smb347-charger: Rename few functions to match better what they are doing
  smb347-charger: Convert to use module_i2c_driver()
  smb347_charger: Cleanup power supply registration code in probe
  ab8500: Clean up probe routines
  ab8500_fg: Harden platform data check
  ab8500_btemp: Harden platform data check
  ab8500_charger: Harden platform data check
  MAINTAINERS: Fix 'F' entry for the power supply class
  max17042_battery: Handle irq request failure case
  ...

3 files changed, 62 insertions, 9 deletions

diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h
index 4f75e531c11..241065c9ce5 100644
--- a/include/linux/power/charger-manager.h
+++ b/include/linux/power/charger-manager.h
@@ -18,6 +18,8 @@
 #include <linux/power_supply.h>
 
 enum data_source {
+        CM_BATTERY_PRESENT,
+        CM_NO_BATTERY,
         CM_FUEL_GAUGE,
         CM_CHARGER_STAT,
 };
@@ -29,6 +31,16 @@ enum polling_modes {
         CM_POLL_CHARGING_ONLY,
 };
 
+enum cm_event_types {
+        CM_EVENT_UNKNOWN = 0,
+        CM_EVENT_BATT_FULL,
+        CM_EVENT_BATT_IN,
+        CM_EVENT_BATT_OUT,
+        CM_EVENT_EXT_PWR_IN_OUT,
+        CM_EVENT_CHG_START_STOP,
+        CM_EVENT_OTHERS,
+};
+
 /**
  * struct charger_global_desc
  * @rtc_name: the name of RTC used to wake up the system from suspend.
@@ -38,11 +50,18 @@ enum polling_modes {
  *      rtc_only_wakeup() returning false.
  *      If the RTC given to CM is the only wakeup reason,
  *      rtc_only_wakeup should return true.
+ * @assume_timer_stops_in_suspend:
+ *      Assume that the jiffy timer stops in suspend-to-RAM.
+ *      When enabled, CM does not rely on jiffies value in
+ *      suspend_again and assumes that jiffies value does not
+ *      change during suspend.
  */
 struct charger_global_desc {
         char *rtc_name;
 
         bool (*rtc_only_wakeup)(void);
+
+        bool assume_timer_stops_in_suspend;
 };
 
 /**
@@ -50,6 +69,11 @@ struct charger_global_desc {
  * @psy_name: the name of power-supply-class for charger manager
  * @polling_mode:
  *      Determine which polling mode will be used
+ * @fullbatt_vchkdrop_ms:
+ * @fullbatt_vchkdrop_uV:
+ *      Check voltage drop after the battery is fully charged.
+ *      If it has dropped more than fullbatt_vchkdrop_uV after
+ *      fullbatt_vchkdrop_ms, CM will restart charging.
  * @fullbatt_uV: voltage in microvolt
  *      If it is not being charged and VBATT >= fullbatt_uV,
  *      it is assumed to be full.
@@ -76,6 +100,8 @@ struct charger_desc {
         enum polling_modes polling_mode;
         unsigned int polling_interval_ms;
 
+        unsigned int fullbatt_vchkdrop_ms;
+        unsigned int fullbatt_vchkdrop_uV;
         unsigned int fullbatt_uV;
 
         enum data_source battery_present;
@@ -101,6 +127,11 @@ struct charger_desc {
  * @fuel_gauge: power_supply for fuel gauge
  * @charger_stat: array of power_supply for chargers
  * @charger_enabled: the state of charger
+ * @fullbatt_vchk_jiffies_at:
+ *      jiffies at the time full battery check will occur.
+ * @fullbatt_vchk_uV: voltage in microvolt
+ *      criteria for full battery
+ * @fullbatt_vchk_work: work queue for full battery check
  * @emergency_stop:
  *      When setting true, stop charging
  * @last_temp_mC: the measured temperature in milli-Celsius
@@ -121,6 +152,10 @@ struct charger_manager {
 
         bool charger_enabled;
 
+        unsigned long fullbatt_vchk_jiffies_at;
+        unsigned int fullbatt_vchk_uV;
+        struct delayed_work fullbatt_vchk_work;
+
         int emergency_stop;
         int last_temp_mC;
 
@@ -134,14 +169,13 @@ struct charger_manager {
 #ifdef CONFIG_CHARGER_MANAGER
 extern int setup_charger_manager(struct charger_global_desc *gd);
 extern bool cm_suspend_again(void);
+extern void cm_notify_event(struct power_supply *psy,
+                                enum cm_event_types type, char *msg);
 #else
-static void __maybe_unused setup_charger_manager(struct charger_global_desc *gd)
-{ }
-
-static bool __maybe_unused cm_suspend_again(void)
-{
-        return false;
-}
+static inline int setup_charger_manager(struct charger_global_desc *gd)
+{ return 0; }
+static inline bool cm_suspend_again(void) { return false; }
+static inline void cm_notify_event(struct power_supply *psy,
+                                enum cm_event_types type, char *msg) { }
 #endif
-
 #endif /* _CHARGER_MANAGER_H */
diff --git a/include/linux/power/max17042_battery.h b/include/linux/power/max17042_battery.h
index e01b167e66f..89dd84f47c6 100644
--- a/include/linux/power/max17042_battery.h
+++ b/include/linux/power/max17042_battery.h
@@ -116,6 +116,18 @@ enum max17042_register {
         MAX17042_VFSOC          = 0xFF,
 };
 
+/* Registers specific to max17047/50 */
+enum max17047_register {
+        MAX17047_QRTbl00        = 0x12,
+        MAX17047_FullSOCThr     = 0x13,
+        MAX17047_QRTbl10        = 0x22,
+        MAX17047_QRTbl20        = 0x32,
+        MAX17047_V_empty        = 0x3A,
+        MAX17047_QRTbl30        = 0x42,
+};
+
+enum max170xx_chip_type {MAX17042, MAX17047};
+
 /*
  * used for setting a register to a desired value
  * addr : address for a register
@@ -144,6 +156,7 @@ struct max17042_config_data {
         u16     shdntimer;      /* 0x03F */
 
         /* App data */
+        u16     full_soc_thresh;        /* 0x13 */
         u16     design_cap;     /* 0x18 */
         u16     ichgt_term;     /* 0x1E */
 
@@ -162,6 +175,10 @@ struct max17042_config_data {
         u16     lavg_empty;     /* 0x36 */
         u16     dqacc;          /* 0x45 */
         u16     dpacc;          /* 0x46 */
+        u16     qrtbl00;        /* 0x12 */
+        u16     qrtbl10;        /* 0x22 */
+        u16     qrtbl20;        /* 0x32 */
+        u16     qrtbl30;        /* 0x42 */
 
         /* Cell technology from power_supply.h */
         u16     cell_technology;
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index c38c13db883..3b912bee28d 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -96,6 +96,7 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
         POWER_SUPPLY_PROP_VOLTAGE_NOW,
         POWER_SUPPLY_PROP_VOLTAGE_AVG,
+        POWER_SUPPLY_PROP_VOLTAGE_OCV,
         POWER_SUPPLY_PROP_CURRENT_MAX,
         POWER_SUPPLY_PROP_CURRENT_NOW,
         POWER_SUPPLY_PROP_CURRENT_AVG,
@@ -211,7 +212,7 @@ extern void power_supply_changed(struct power_supply *psy);
 extern int power_supply_am_i_supplied(struct power_supply *psy);
 extern int power_supply_set_battery_charged(struct power_supply *psy);
 
-#if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE)
+#ifdef CONFIG_POWER_SUPPLY
 extern int power_supply_is_system_supplied(void);
 #else
 static inline int power_supply_is_system_supplied(void) { return -ENOSYS; }
@@ -261,6 +262,7 @@ static inline bool power_supply_is_watt_property(enum power_supply_property psp)
         case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
         case POWER_SUPPLY_PROP_VOLTAGE_NOW:
         case POWER_SUPPLY_PROP_VOLTAGE_AVG:
+        case POWER_SUPPLY_PROP_VOLTAGE_OCV:
         case POWER_SUPPLY_PROP_POWER_NOW:
                 return 1;
         default: