Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6: (68 commits)
  power_supply: Mark da9052 driver as broken
  power_supply: Drop usage of nowarn variant of sysfs_create_link()
  s3c_adc_battery: Average over more than one adc sample
  power_supply: Add DA9052 battery driver
  isp1704_charger: Fix missing check
  jz4740-battery: Fix signedness bug
  power_supply: Assume mains power by default
  sbs-battery: Fix devicetree match table
  ARM: rx51: Add bq27200 i2c board info
  sbs-battery: Change power supply name
  devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings
  devicetree-bindings: Add vendor entry for Smart Battery Systems
  sbs-battery: Rename internals to new name
  bq20z75: Rename to sbs-battery
  wm97xx_battery: Use DEFINE_MUTEX() for work_lock
  max8997_charger: Remove duplicate module.h
  lp8727_charger: Some minor fixes for the header
  lp8727_charger: Add header file
  power_supply: Convert drivers/power/* to use module_platform_driver()
  power_supply: Add "unknown" in power supply type
  ...

7 files changed, 223 insertions, 9 deletions

diff --git a/include/linux/lp8727.h b/include/linux/lp8727.h
new file mode 100755
index 000000000000..d21fa2865bf4
--- /dev/null
+++ b/include/linux/lp8727.h
@@ -0,0 +1,51 @@
+/*
+ *                      Copyright (C) 2011 National Semiconductor
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _LP8727_H
+#define _LP8727_H
+
+enum lp8727_eoc_level {
+        EOC_5P,
+        EOC_10P,
+        EOC_16P,
+        EOC_20P,
+        EOC_25P,
+        EOC_33P,
+        EOC_50P,
+};
+
+enum lp8727_ichg {
+        ICHG_90mA,
+        ICHG_100mA,
+        ICHG_400mA,
+        ICHG_450mA,
+        ICHG_500mA,
+        ICHG_600mA,
+        ICHG_700mA,
+        ICHG_800mA,
+        ICHG_900mA,
+        ICHG_1000mA,
+};
+
+struct lp8727_chg_param {
+        /* end of charge level setting */
+        enum lp8727_eoc_level eoc_level;
+        /* charging current */
+        enum lp8727_ichg ichg;
+};
+
+struct lp8727_platform_data {
+        u8 (*get_batt_present)(void);
+        u16 (*get_batt_level)(void);
+        u8 (*get_batt_capacity)(void);
+        u8 (*get_batt_temp)(void);
+        struct lp8727_chg_param ac;
+        struct lp8727_chg_param usb;
+};
+
+#endif
diff --git a/include/linux/mfd/max8925.h b/include/linux/mfd/max8925.h
index 5259dfe8c585..b8e6d9449086 100644
--- a/include/linux/mfd/max8925.h
+++ b/include/linux/mfd/max8925.h
@@ -167,9 +167,6 @@ enum {
         MAX8925_IRQ_VCHG_DC_OVP,
         MAX8925_IRQ_VCHG_DC_F,
         MAX8925_IRQ_VCHG_DC_R,
-        MAX8925_IRQ_VCHG_USB_OVP,
-        MAX8925_IRQ_VCHG_USB_F,
-        MAX8925_IRQ_VCHG_USB_R,
         MAX8925_IRQ_VCHG_THM_OK_R,
         MAX8925_IRQ_VCHG_THM_OK_F,
         MAX8925_IRQ_VCHG_SYSLOW_F,
@@ -223,6 +220,10 @@ struct max8925_power_pdata {
         unsigned        batt_detect:1;
         unsigned        topoff_threshold:2;
         unsigned        fast_charge:3;  /* charge current */
+        unsigned        no_temp_support:1; /* set if no temperature detect */
+        unsigned        no_insert_detect:1; /* set if no ac insert detect */
+        char            **supplied_to;
+        int             num_supplicants;
 };
 
 /*
diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h
index c9e4d814ff77..2bb62bf296ac 100644
--- a/include/linux/pda_power.h
+++ b/include/linux/pda_power.h
@@ -35,6 +35,8 @@ struct pda_power_pdata {
         unsigned int polling_interval; /* msecs, default is 2000 */
 
         unsigned long ac_max_uA; /* current to draw when on AC */
+
+        bool use_otg_notifier;
 };
 
 #endif /* __PDA_POWER_H__ */
diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h
new file mode 100644
index 000000000000..4f75e531c112
--- /dev/null
+++ b/include/linux/power/charger-manager.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics Co., Ltd.
+ * MyungJoo.Ham <myungjoo.ham@samsung.com>
+ *
+ * Charger Manager.
+ * This framework enables to control and multiple chargers and to
+ * monitor charging even in the context of suspend-to-RAM with
+ * an interface combining the chargers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+**/
+
+#ifndef _CHARGER_MANAGER_H
+#define _CHARGER_MANAGER_H
+
+#include <linux/power_supply.h>
+
+enum data_source {
+        CM_FUEL_GAUGE,
+        CM_CHARGER_STAT,
+};
+
+enum polling_modes {
+        CM_POLL_DISABLE = 0,
+        CM_POLL_ALWAYS,
+        CM_POLL_EXTERNAL_POWER_ONLY,
+        CM_POLL_CHARGING_ONLY,
+};
+
+/**
+ * struct charger_global_desc
+ * @rtc_name: the name of RTC used to wake up the system from suspend.
+ * @rtc_only_wakeup:
+ *      If the system is woken up by waekup-sources other than the RTC or
+ *      callbacks, Charger Manager should recognize with
+ *      rtc_only_wakeup() returning false.
+ *      If the RTC given to CM is the only wakeup reason,
+ *      rtc_only_wakeup should return true.
+ */
+struct charger_global_desc {
+        char *rtc_name;
+
+        bool (*rtc_only_wakeup)(void);
+};
+
+/**
+ * struct charger_desc
+ * @psy_name: the name of power-supply-class for charger manager
+ * @polling_mode:
+ *      Determine which polling mode will be used
+ * @fullbatt_uV: voltage in microvolt
+ *      If it is not being charged and VBATT >= fullbatt_uV,
+ *      it is assumed to be full.
+ * @polling_interval_ms: interval in millisecond at which
+ *      charger manager will monitor battery health
+ * @battery_present:
+ *      Specify where information for existance of battery can be obtained
+ * @psy_charger_stat: the names of power-supply for chargers
+ * @num_charger_regulator: the number of entries in charger_regulators
+ * @charger_regulators: array of regulator_bulk_data for chargers
+ * @psy_fuel_gauge: the name of power-supply for fuel gauge
+ * @temperature_out_of_range:
+ *      Determine whether the status is overheat or cold or normal.
+ *      return_value > 0: overheat
+ *      return_value == 0: normal
+ *      return_value < 0: cold
+ * @measure_battery_temp:
+ *      true: measure battery temperature
+ *      false: measure ambient temperature
+ */
+struct charger_desc {
+        char *psy_name;
+
+        enum polling_modes polling_mode;
+        unsigned int polling_interval_ms;
+
+        unsigned int fullbatt_uV;
+
+        enum data_source battery_present;
+
+        char **psy_charger_stat;
+
+        int num_charger_regulators;
+        struct regulator_bulk_data *charger_regulators;
+
+        char *psy_fuel_gauge;
+
+        int (*temperature_out_of_range)(int *mC);
+        bool measure_battery_temp;
+};
+
+#define PSY_NAME_MAX    30
+
+/**
+ * struct charger_manager
+ * @entry: entry for list
+ * @dev: device pointer
+ * @desc: instance of charger_desc
+ * @fuel_gauge: power_supply for fuel gauge
+ * @charger_stat: array of power_supply for chargers
+ * @charger_enabled: the state of charger
+ * @emergency_stop:
+ *      When setting true, stop charging
+ * @last_temp_mC: the measured temperature in milli-Celsius
+ * @psy_name_buf: the name of power-supply-class for charger manager
+ * @charger_psy: power_supply for charger manager
+ * @status_save_ext_pwr_inserted:
+ *      saved status of external power before entering suspend-to-RAM
+ * @status_save_batt:
+ *      saved status of battery before entering suspend-to-RAM
+ */
+struct charger_manager {
+        struct list_head entry;
+        struct device *dev;
+        struct charger_desc *desc;
+
+        struct power_supply *fuel_gauge;
+        struct power_supply **charger_stat;
+
+        bool charger_enabled;
+
+        int emergency_stop;
+        int last_temp_mC;
+
+        char psy_name_buf[PSY_NAME_MAX + 1];
+        struct power_supply charger_psy;
+
+        bool status_save_ext_pwr_inserted;
+        bool status_save_batt;
+};
+
+#ifdef CONFIG_CHARGER_MANAGER
+extern int setup_charger_manager(struct charger_global_desc *gd);
+extern bool cm_suspend_again(void);
+#else
+static void __maybe_unused setup_charger_manager(struct charger_global_desc *gd)
+{ }
+
+static bool __maybe_unused cm_suspend_again(void)
+{
+        return false;
+}
+#endif
+
+#endif /* _CHARGER_MANAGER_H */
diff --git a/include/linux/power/bq20z75.h b/include/linux/power/sbs-battery.h
index 1398eb004e83..2b0a9d9ff57e 100644
--- a/include/linux/power/bq20z75.h
+++ b/include/linux/power/sbs-battery.h
@@ -1,5 +1,5 @@
 /*
- * Gas Gauge driver for TI's BQ20Z75
+ * Gas Gauge driver for SBS Compliant Gas Gauges
  *
  * Copyright (c) 2010, NVIDIA Corporation.
  *
@@ -18,21 +18,21 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __LINUX_POWER_BQ20Z75_H_
-#define __LINUX_POWER_BQ20Z75_H_
+#ifndef __LINUX_POWER_SBS_BATTERY_H_
+#define __LINUX_POWER_SBS_BATTERY_H_
 
 #include <linux/power_supply.h>
 #include <linux/types.h>
 
 /**
- * struct bq20z75_platform_data - platform data for bq20z75 devices
+ * struct sbs_platform_data - platform data for sbs devices
  * @battery_detect:             GPIO which is used to detect battery presence
  * @battery_detect_present:     gpio state when battery is present (0 / 1)
  * @i2c_retry_count:            # of times to retry on i2c IO failure
  * @poll_retry_count:           # of times to retry looking for new status after
  *                              external change notification
  */
-struct bq20z75_platform_data {
+struct sbs_platform_data {
         int battery_detect;
         int battery_detect_present;
         int i2c_retry_count;
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 204c18dfdc9e..fa9b962aec12 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -74,6 +74,12 @@ enum {
         POWER_SUPPLY_CAPACITY_LEVEL_FULL,
 };
 
+enum {
+        POWER_SUPPLY_SCOPE_UNKNOWN = 0,
+        POWER_SUPPLY_SCOPE_SYSTEM,
+        POWER_SUPPLY_SCOPE_DEVICE,
+};
+
 enum power_supply_property {
         /* Properties of type `int' */
         POWER_SUPPLY_PROP_STATUS = 0,
@@ -116,6 +122,7 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
         POWER_SUPPLY_PROP_TIME_TO_FULL_AVG,
         POWER_SUPPLY_PROP_TYPE, /* use power_supply.type instead */
+        POWER_SUPPLY_PROP_SCOPE,
         /* Properties of type `const char *' */
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
@@ -123,7 +130,8 @@ enum power_supply_property {
 };
 
 enum power_supply_type {
-        POWER_SUPPLY_TYPE_BATTERY = 0,
+        POWER_SUPPLY_TYPE_UNKNOWN = 0,
+        POWER_SUPPLY_TYPE_BATTERY,
         POWER_SUPPLY_TYPE_UPS,
         POWER_SUPPLY_TYPE_MAINS,
         POWER_SUPPLY_TYPE_USB,          /* Standard Downstream Port */
@@ -211,6 +219,7 @@ static inline int power_supply_is_system_supplied(void) { return -ENOSYS; }
 extern int power_supply_register(struct device *parent,
                                  struct power_supply *psy);
 extern void power_supply_unregister(struct power_supply *psy);
+extern int power_supply_powers(struct power_supply *psy, struct device *dev);
 
 /* For APM emulation, think legacy userspace. */
 extern struct class *power_supply_class;
diff --git a/include/linux/s3c_adc_battery.h b/include/linux/s3c_adc_battery.h
index fbe58b7e63eb..99dadbffdd4f 100644
--- a/include/linux/s3c_adc_battery.h
+++ b/include/linux/s3c_adc_battery.h
@@ -25,6 +25,10 @@ struct s3c_adc_bat_pdata {
         const unsigned int current_channel;
         const unsigned int backup_volt_channel;
 
+        const unsigned int volt_samples;
+        const unsigned int current_samples;
+        const unsigned int backup_volt_samples;
+
         const unsigned int volt_mult;
         const unsigned int current_mult;
         const unsigned int backup_volt_mult;