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

Pull battery updates from Anton Vorontsov:
 "Highlights:
   - A new driver for TI BQ24735 Battery Chargers, courtesy of NVidia.
   - Device tree bindings for TWL4030 chips.
   - Random fixes and cleanups"

* tag 'for-v3.13' of git://git.infradead.org/battery-2.6:
  pm2301-charger: Remove unneeded NULL checks
  twl4030_charger: Add devicetree support
  power_supply: Fix documentation for TEMP_*ALERT* properties
  max17042_battery: Support regmap to access device's registers
  max17042_battery: Use SIMPLE_DEV_PM_OPS
  charger-manager : Replace kzalloc to devm_kzalloc and remove uneccessary code
  bq2415x_charger: Fix max battery regulation voltage
  tps65090-charger: Use "IS_ENABLED(CONFIG_OF)" for DT code
  tps65090-charger: Drop devm_free_irq of devm_ allocated irq
  power_supply: Add support for bq24735 charger
  pm2301-charger: Staticize pm2xxx_charger_die_therm_mngt
  pm2301-charger: Check return value of regulator_enable
  ab8500-charger: Remove redundant break
  ab8500-charger: Check return value of regulator_enable
  isp1704_charger: Fix driver to work with changes introduced in v3.5

11 files changed, 751 insertions, 351 deletions

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index e6f92b450913..5e2054afe840 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -346,6 +346,12 @@ config CHARGER_BQ24190
         help
           Say Y to enable support for the TI BQ24190 battery charger.
 
+config CHARGER_BQ24735
+        tristate "TI BQ24735 battery charger support"
+        depends on I2C && GPIOLIB
+        help
+          Say Y to enable support for the TI BQ24735 battery charger.
+
 config CHARGER_SMB347
         tristate "Summit Microelectronics SMB347 Battery Charger"
         depends on I2C
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index a4b74177706f..372b4e8ab598 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o
 obj-$(CONFIG_CHARGER_MAX8998)   += max8998_charger.o
 obj-$(CONFIG_CHARGER_BQ2415X)   += bq2415x_charger.o
 obj-$(CONFIG_CHARGER_BQ24190)   += bq24190_charger.o
+obj-$(CONFIG_CHARGER_BQ24735)   += bq24735-charger.o
 obj-$(CONFIG_POWER_AVS)         += avs/
 obj-$(CONFIG_CHARGER_SMB347)    += smb347-charger.o
 obj-$(CONFIG_CHARGER_TPS65090)  += tps65090-charger.o
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index a4c4a10b3a41..19110aa613a1 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -766,7 +766,6 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di,
                         ret = -ENXIO;
                         break;
                 }
-                break;
         case USB_STAT_CARKIT_1:
         case USB_STAT_CARKIT_2:
         case USB_STAT_ACA_DOCK_CHARGER:
@@ -1387,8 +1386,12 @@ static int ab8500_charger_ac_en(struct ux500_charger *charger,
                  * the GPADC module independant of the AB8500 chargers
                  */
                 if (!di->vddadc_en_ac) {
-                        regulator_enable(di->regu);
-                        di->vddadc_en_ac = true;
+                        ret = regulator_enable(di->regu);
+                        if (ret)
+                                dev_warn(di->dev,
+                                        "Failed to enable regulator\n");
+                        else
+                                di->vddadc_en_ac = true;
                 }
 
                 /* Check if the requested voltage or current is valid */
@@ -1556,8 +1559,12 @@ static int ab8500_charger_usb_en(struct ux500_charger *charger,
                  * the GPADC module independant of the AB8500 chargers
                  */
                 if (!di->vddadc_en_usb) {
-                        regulator_enable(di->regu);
-                        di->vddadc_en_usb = true;
+                        ret = regulator_enable(di->regu);
+                        if (ret)
+                                dev_warn(di->dev,
+                                        "Failed to enable regulator\n");
+                        else
+                                di->vddadc_en_usb = true;
                 }
 
                 /* Enable USB charging */
diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c
index 0727f9256138..df893dd1447d 100644
--- a/drivers/power/bq2415x_charger.c
+++ b/drivers/power/bq2415x_charger.c
@@ -605,9 +605,13 @@ static int bq2415x_set_battery_regulation_voltage(struct bq2415x_device *bq,
 {
         int val = (mV/10 - 350) / 2;
 
+        /*
+         * According to datasheet, maximum battery regulation voltage is
+         * 4440mV which is b101111 = 47.
+         */
         if (val < 0)
                 val = 0;
-        else if (val > 94) /* FIXME: Max is 94 or 122 ? Set max value ? */
+        else if (val > 47)
                 return -EINVAL;
 
         return bq2415x_i2c_write_mask(bq, BQ2415X_REG_VOLTAGE, val,
diff --git a/drivers/power/bq24735-charger.c b/drivers/power/bq24735-charger.c
new file mode 100644
index 000000000000..d022b823305b
--- /dev/null
+++ b/drivers/power/bq24735-charger.c
@@ -0,0 +1,419 @@
+/*
+ * Battery charger driver for TI BQ24735
+ *
+ * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include <linux/err.h>
+#include <linux/gpio.h>
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/power_supply.h>
+#include <linux/slab.h>
+
+#include <linux/power/bq24735-charger.h>
+
+#define BQ24735_CHG_OPT                 0x12
+#define BQ24735_CHG_OPT_CHARGE_DISABLE  (1 << 0)
+#define BQ24735_CHG_OPT_AC_PRESENT      (1 << 4)
+#define BQ24735_CHARGE_CURRENT          0x14
+#define BQ24735_CHARGE_CURRENT_MASK     0x1fc0
+#define BQ24735_CHARGE_VOLTAGE          0x15
+#define BQ24735_CHARGE_VOLTAGE_MASK     0x7ff0
+#define BQ24735_INPUT_CURRENT           0x3f
+#define BQ24735_INPUT_CURRENT_MASK      0x1f80
+#define BQ24735_MANUFACTURER_ID         0xfe
+#define BQ24735_DEVICE_ID               0xff
+
+struct bq24735 {
+        struct power_supply     charger;
+        struct i2c_client       *client;
+        struct bq24735_platform *pdata;
+};
+
+static inline struct bq24735 *to_bq24735(struct power_supply *psy)
+{
+        return container_of(psy, struct bq24735, charger);
+}
+
+static enum power_supply_property bq24735_charger_properties[] = {
+        POWER_SUPPLY_PROP_ONLINE,
+};
+
+static inline int bq24735_write_word(struct i2c_client *client, u8 reg,
+                                     u16 value)
+{
+        return i2c_smbus_write_word_data(client, reg, le16_to_cpu(value));
+}
+
+static inline int bq24735_read_word(struct i2c_client *client, u8 reg)
+{
+        s32 ret = i2c_smbus_read_word_data(client, reg);
+