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

* git://git.infradead.org/battery-2.6:
  PXA: Use dev_pm_ops in z2_battery
  ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery
  ds2760_battery: Fix indexing of the 4 active full EEPROM registers
  power: Make test_power driver more dynamic.
  bq27x00_battery: Name of cycle count property
  max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build)
  ARM: RX-51: Enable isp1704 power on/off
  isp1704_charger: Allow board specific powering routine
  gpio-charger: Add gpio_charger_resume
  power_supply: Add driver for MAX8903 charger

9 files changed, 729 insertions, 22 deletions

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index dc8c531ed276..e57b50b38565 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -210,6 +210,15 @@ config CHARGER_ISP1704
           Say Y to enable support for USB Charger Detection with
           ISP1707/ISP1704 USB transceivers.
 
+config CHARGER_MAX8903
+        tristate "MAX8903 Battery DC-DC Charger for USB and Adapter Power"
+        depends on GENERIC_HARDIRQS
+        help
+          Say Y to enable support for the MAX8903 DC-DC charger and sysfs.
+          The driver supports controlling charger-enable and current-limit
+          pins based on the status of charger connections with interrupt
+          handlers.
+
 config CHARGER_TWL4030
         tristate "OMAP TWL4030 BCI charger driver"
         depends on TWL4030_CORE
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 8224990b933d..009a90fa8ac9 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -33,5 +33,6 @@ obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
 obj-$(CONFIG_BATTERY_JZ4740)    += jz4740-battery.o
 obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o
 obj-$(CONFIG_CHARGER_ISP1704)   += isp1704_charger.o
+obj-$(CONFIG_CHARGER_MAX8903)   += max8903_charger.o
 obj-$(CONFIG_CHARGER_TWL4030)   += twl4030_charger.o
 obj-$(CONFIG_CHARGER_GPIO)      += gpio-charger.o
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 59e68dbd028b..bb16f5b7e167 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2008 Rodolfo Giometti <giometti@linux.it>
  * Copyright (C) 2008 Eurotech S.p.A. <info@eurotech.it>
  * Copyright (C) 2010-2011 Lars-Peter Clausen <lars@metafoo.de>
+ * Copyright (C) 2011 Pali Rohár <pali.rohar@gmail.com>
  *
  * Based on a previous work by Copyright (C) 2008 Texas Instruments, Inc.
  *
@@ -76,7 +77,7 @@ struct bq27x00_reg_cache {
         int time_to_empty_avg;
         int time_to_full;
         int charge_full;
-        int charge_counter;
+        int cycle_count;
         int capacity;
         int flags;
 
@@ -115,7 +116,7 @@ static enum power_supply_property bq27x00_battery_props[] = {
         POWER_SUPPLY_PROP_CHARGE_FULL,
         POWER_SUPPLY_PROP_CHARGE_NOW,
         POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
-        POWER_SUPPLY_PROP_CHARGE_COUNTER,
+        POWER_SUPPLY_PROP_CYCLE_COUNT,
         POWER_SUPPLY_PROP_ENERGY_NOW,
 };
 
@@ -267,7 +268,7 @@ static void bq27x00_update(struct bq27x00_device_info *di)
                 cache.time_to_empty_avg = bq27x00_battery_read_time(di, BQ27x00_REG_TTECP);
                 cache.time_to_full = bq27x00_battery_read_time(di, BQ27x00_REG_TTF);
                 cache.charge_full = bq27x00_battery_read_lmd(di);
-                cache.charge_counter = bq27x00_battery_read_cyct(di);
+                cache.cycle_count = bq27x00_battery_read_cyct(di);
 
                 if (!is_bq27500)
                         cache.current_now = bq27x00_read(di, BQ27x00_REG_AI, false);
@@ -496,8 +497,8 @@ static int bq27x00_battery_get_property(struct power_supply *psy,
         case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
                 ret = bq27x00_simple_value(di->charge_design_full, val);
                 break;
-        case POWER_SUPPLY_PROP_CHARGE_COUNTER:
-                ret = bq27x00_simple_value(di->cache.charge_counter, val);
+        case POWER_SUPPLY_PROP_CYCLE_COUNT:
+                ret = bq27x00_simple_value(di->cache.cycle_count, val);
                 break;
         case POWER_SUPPLY_PROP_ENERGY_NOW:
                 ret = bq27x00_battery_energy(di, val);
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c
index e534290f3256..f2c9cc33c0f9 100644
--- a/drivers/power/ds2760_battery.c
+++ b/drivers/power/ds2760_battery.c
@@ -86,7 +86,11 @@ static int rated_capacities[] = {
         920,    /* NEC */
         1440,   /* Samsung */
         1440,   /* BYD */
+#ifdef CONFIG_MACH_H4700
+        1800,   /* HP iPAQ hx4700 3.7V 1800mAh (359113-001) */
+#else
         1440,   /* Lishen */
+#endif
         1440,   /* NEC */
         2880,   /* Samsung */
         2880,   /* BYD */
@@ -186,7 +190,7 @@ static int ds2760_battery_read_status(struct ds2760_device_info *di)
 
         scale[0] = di->full_active_uAh;
         for (i = 1; i < 5; i++)
-                scale[i] = scale[i - 1] + di->raw[DS2760_ACTIVE_FULL + 2 + i];
+                scale[i] = scale[i - 1] + di->raw[DS2760_ACTIVE_FULL + 1 + i];
 
         di->full_active_uAh = battery_interpolate(scale, di->temp_C / 10);
         di->full_active_uAh *= 1000; /* convert to µAh */
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index 25b88ac1d44c..718f2c537827 100644
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -161,12 +161,27 @@ static int __devexit gpio_charger_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int gpio_charger_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct gpio_charger *gpio_charger = platform_get_drvdata(pdev);
+
+        power_supply_changed(&gpio_charger->charger);
+
+        return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(gpio_charger_pm_ops, NULL, gpio_charger_resume);
+
 static struct platform_driver gpio_charger_driver = {
         .probe = gpio_charger_probe,
         .remove = __devexit_p(gpio_charger_remove),
         .driver = {
                 .name = "gpio-charger",
                 .owner = THIS_MODULE,
+                .pm = &gpio_charger_pm_ops,
         },
 };
 
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index 2ad9b14a5ce3..f6d72b402a8e 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -33,6 +33,7 @@
 #include <linux/usb/ulpi.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/power/isp1704_charger.h>
 
 /* Vendor specific Power Control register */
 #define ISP1704_PWR_CTRL                0x3d
@@ -71,6 +72,18 @@ struct isp1704_charger {
 };
 
 /*
+ * Disable/enable the power from the isp1704 if a function for it
+ * has been provided with platform data.
+ */
+static void isp1704_charger_set_power(struct isp1704_charger *isp, bool on)
+{
+        struct isp1704_charger_data     *board = isp->dev->platform_data;
+
+        if (board->set_power)
+                board->set_power(on);
+}
+
+/*
  * Determine is the charging port DCP (dedicated charger) or CDP (Host/HUB
  * chargers).
  *
@@ -222,6 +235,9 @@ static void isp1704_charger_work(struct work_struct *data)
 
         mutex_lock(&lock);
 
+        if (event != USB_EVENT_NONE)
+                isp1704_charger_set_power(isp, 1);
+
         switch (event) {
         case USB_EVENT_VBUS:
                 isp->online = true;
@@ -269,6 +285,8 @@ static void isp1704_charger_work(struct work_struct *data)
                  */
                 if (isp->otg->gadget)
                         usb_gadget_disconnect(isp->otg->gadget);
+
+                isp1704_charger_set_power(isp, 0);
                 break;
         case USB_EVENT_ENUMERATED:
                 if (isp->present)
@@ -394,6 +412,8 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
         isp->dev = &pdev->dev;
         platform_set_drvdata(pdev, isp);
 
+        isp1704_charger_set_power(isp, 1);
+
         ret = isp1704_test_ulpi(isp);
         if (ret < 0)
                 goto fail1;
@@ -434,6 +454,7 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
 
         /* Detect charger if VBUS is valid (the cable was already plugged). */
         ret = otg_io_read(isp->otg, ULPI_USB_INT_STS);
+        isp1704_charger_set_power(isp, 0);
         if ((ret & ULPI_INT_VBUS_VALID) && !isp->otg->default_a) {
                 isp->event = USB_EVENT_VBUS;
                 schedule_work(&isp->work);
@@ -459,6 +480,7 @@ static int __devexit isp1704_charger_remove(struct platform_device *pdev)
         otg_unregister_notifier(isp->otg, &isp->nb);
         power_supply_unregister(&isp->psy);
         otg_put_transceiver(isp->otg);
+        isp1704_charger_set_power(isp, 0);
         kfree(isp);
 
         return 0;
diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
new file mode 100644
index 000000000000..33ff0e37809e
--- /dev/null
+++ b/drivers/power/max8903_charger.c
@@ -0,0 +1,391 @@
+/*
+ * max8903_charger.c - Maxim 8903 USB/Adapter Charger Driver
+ *
+ * Copyright (C) 2011 Samsung Electronics
+ * MyungJoo Ham <myungjoo.ham@samsung.com>
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <linux/gpio.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+#include <linux/power_supply.h>
+#include <linux/platform_device.h>
+#include <linux/power/max8903_charger.h>
+
+struct max8903_data {
+        struct max8903_pdata *pdata;
+        struct device *dev;
+        struct power_supply psy;
+        bool fault;
+        bool usb_in;
+        bool ta_in;
+};
+
+static enum power_supply_property max8903_charger_props[] = {
+        POWER_SUPPLY_PROP_STATUS, /* Charger status output */
+        POWER_SUPPLY_PROP_ONLINE, /* External power source */
+        POWER_SUPPLY_PROP_HEALTH, /* Fault or OK */
+};
+
+static int max8903_get_property(struct power_supply *psy,
+                enum power_supply_property psp,
+                union power_supply_propval *val)
+{
+        struct max8903_data *data = container_of(psy,
+                        struct max8903_data, psy);
+
+        switch (psp) {
+        case POWER_SUPPLY_PROP_STATUS:
+                val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
+                if (data->pdata->chg) {
+                        if (gpio_get_value(data->pdata->chg) == 0)
+                                val->intval = POWER_SUPPLY_STATUS_CHARGING;
+                        else if (data->usb_in || data->ta_in)
+                                val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+                        else
+                                val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+                }
+                break;
+        case POWER_SUPPLY_PROP_ONLINE:
+                val->intval = 0;
+                if (data->usb_in || data->ta_in)
+                        val->intval = 1;
+                break;
+        case POWER_SUPPLY_PROP_HEALTH:
+                val->intval = POWER_SUPPLY_HEALTH_GOOD;
+                if (data->fault)
+                        val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static irqreturn_t max8903_dcin(int irq, void *_data)
+{
+        struct max8903_data *data = _data;
+        struct max8903_pdata *pdata = data->pdata;
+        bool ta_in;
+        enum power_supply_type old_type;
+
+        ta_in = gpio_get_value(pdata->dok) ? false : true;
+
+        if (ta_in == data->ta_in)
+                return IRQ_HANDLED;
+
+        data->ta_in = ta_in;
+
+        /* Set Current-Limit-Mode 1:DC 0:USB */
+        if (pdata->dcm)
+                gpio_set_value(pdata->dcm, ta_in ? 1 : 0);
+
+        /* Charger Enable / Disable (cen is negated) */
+        if (pdata->cen)
+                gpio_set_value(pdata->cen, ta_in ? 0 :
+                                (data->usb_in ? 0 : 1));
+
+        dev_dbg(data->dev, "TA(DC-IN) Charger %s.\n", ta_in ?
+                        "Connected" : "Disconnected");
+
+        old_type = data->psy.type;
+
+        if (data->ta_in)
+                data->psy.type = POWER_SUPPLY_TYPE_MAINS;
+        else if (data->usb_in)
+                data->psy.type = POWER_SUPPLY_TYPE_USB;
+        else
+                data->psy.type = POWER_SUPPLY_TYPE_BATTERY;
+
+        if (old_type != data->psy.type)
+                power_supply_changed(&data->psy);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t max8903_usbin(int irq, void *_data)
+{
+        struct max8903_data *data = _data;
+        struct max8903_pdata *pdata = data->pdata;
+        bool usb_in;
+        enum power_supply_type old_type;
+
+        usb_in = gpio_get_value(pdata->uok) ? false : true;
+
+        if (usb_in == data->usb_in)
+                return IRQ_HANDLED;
+
+        data->usb_in = usb_in;
+
+        /* Do not touch Current-Limit-Mode */
+
+        /* Charger Enable / Disable (cen is negated) */
+        if (pdata->cen)
+                gpio_set_value(pdata->cen, usb_in ? 0 :
+                                (data->ta_in ? 0 : 1));
+
+        dev_dbg(data->dev, "USB Charger %s.\n", usb_in ?
+                        "Connected" : "Disconnected");
+
+        old_type = data->psy.type;
+
+        if (data->ta_in)
+                data->psy.type = POWER_SUPPLY_TYPE_MAINS;
+        else if (data->usb_in)
+                data->psy.type = POWER_SUPPLY_TYPE_USB;
+        else
+                data->psy.type = POWER_SUPPLY_TYPE_BATTERY;
+
+        if (old_type != data->psy.type)
+                power_supply_changed(&data->psy);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t max8903_fault(int irq, void *_data)
+{
+        struct max8903_data *data = _data;
+        struct max8903_pdata *pdata = data->pdata;
+        bool fault;
+
+        fault = gpio_get_value(pdata->flt) ? false : true;
+
+        if (fault == data->fault)
+                return IRQ_HANDLED;
+
+        data->fault = fault;
+
+        if (fault)
+                dev_err(data->dev, "Charger suffers a fault and stops.\n");
+        else
+                dev_err(data->dev, "Charger recovered from a fault.\n");
+
+        return IRQ_HANDLED;
+}
+
+static __devinit int max8903_probe(struct platform_device *pdev)
+{
+        struct max8903_data *data;
+        struct device *dev = &pdev->dev;
+        struct max8903_pdata *pdata = pdev->dev.platform_data;
+        int ret = 0;
+        int gpio;
+        int ta_in = 0;
+        int usb_in = 0;
+
+        data = kzalloc(sizeof(struct max8903_data), GFP_KERNEL);
+        if (data == NULL) {
+                dev_err(dev, "Cannot allocate memory.\n");
+                return -ENOMEM;
+        }
+        data->pdata = pdata;
+        data->dev = dev;
+        platform_set_drvdata(pdev, data);
+
+        if (pdata->dc_valid == false && pdata->usb_valid == false) {
+                dev_err(dev, "No valid power sources.\n");
+                ret = -EINVAL;
+                goto err;
+        }
+
+        if (pdata->dc_valid) {
+                if (pdata->dok && gpio_is_valid(pdata->dok) &&
+                                pdata->dcm && gpio_is_valid(pdata->dcm)) {
+                        gpio = pdata->dok; /* PULL_UPed Interrupt */
+                        ta_in = gpio_get_value(gpio) ? 0 : 1;
+
+                        gpio = pdata->dcm; /* Output */
+                        gpio_set_value(gpio, ta_in);
+                } else {
+                        dev_err(dev, "When DC is wired, DOK and DCM should"
+                                        " be wired as well.\n");
+                        ret = -EINVAL;
+                        goto err;
+                }
+        } else {
+                if (pdata->dcm) {
+                        if (gpio_is_valid(pdata->dcm))
+                                gpio_set_value(pdata->dcm, 0);
+                        else {
+                                dev_err(dev, "Invalid pin: dcm.\n");
+                                ret = -EINVAL;
+                                goto err;
+                        }
+                }
+        }
+
+        if (pdata->usb_valid) {
+                if (pdata->uok && gpio_is_valid(pdata->uok)) {
+                        gpio = pdata->uok;
+                        usb_in = gpio_get_value(gpio) ? 0 : 1;
+                } else {
+                        dev_err(dev, "When USB is wired, UOK should be wired."
+                                        "as well.\n");
+                        ret = -EINVAL;
+                        goto err;
+                }
+        }
+
+        if (pdata->cen) {
+                if (gpio_is_valid(pdata->cen)) {
+                        gpio_set_value(pdata->cen, (ta_in || usb_in) ? 0 : 1);
+                } else {
+                        dev_err(dev, "Invalid pin: cen.\n");
+                        ret = -EINVAL;
+                        goto err;
+                }
+        }
+
+        if (pdata->chg) {
+                if (!gpio_is_valid(pdata->chg)) {
+                        dev_err(dev, "Invalid pin: chg.\n");
+                        ret = -EINVAL;
+                        goto err;
+                }
+        }
+
+        if (pdata->flt) {
+                if (!gpio_is_valid(pdata->flt)) {
+                        dev_err(dev, "Invalid pin: flt.\n");
+                        ret = -EINVAL;
+                        goto err;
+                }
+        }
+
+        if (pdata->usus) {
+                if (!gpio_is_valid(pdata->usus)) {
+                        dev_err(dev, "Invalid pin: usus.\n");
+                        ret = -EINVAL;
+                        goto err;
+                }
+        }
+
+        data->fault = false;
+        data->ta_in = ta_in;
+        data->usb_in = usb_in;
+
+        data->psy.name = "max8903_charger";
+        data->psy.type = (ta_in) ? POWER_SUPPLY_TYPE_MAINS :
+                        ((usb_in) ? POWER_SUPPLY_TYPE_USB :
+                         POWER_SUPPLY_TYPE_BATTERY);
+        data->psy.get_property = max8903_get_property;
+        data->psy.properties = max8903_charger_props;
+        data->psy.num_properties = ARRAY_SIZE(max8903_charger_props);
+
+        ret = power_supply_register(dev, &data->psy);
+        if (ret) {
+                dev_err(dev, "failed: power supply register.\n");
+                goto err;
+        }
+
+        if (pdata->dc_valid) {
+                ret = request_threaded_irq(gpio_to_irq(pdata->dok),
+                                NULL, max8903_dcin,
+                                IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
+                                "MAX8903 DC IN", data);
+                if (ret) {
+                        dev_err(dev, "Cannot request irq %d for DC (%d)\n",
+                                        gpio_to_irq(pdata->dok), ret);
+                        goto err_psy;
+                }
+        }
+
+        if (pdata->usb_valid) {
+                ret = request_threaded_irq(gpio_to_irq(pdata->uok),
+                                NULL, max8903_usbin,
+                                IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
+                                "MAX8903 USB IN", data);
+                if (ret) {
+                        dev_err(dev, "Cannot request irq %d for USB (%d)\n",
+                                        gpio_to_irq(pdata->uok), ret);
+                        goto err_dc_irq;
+                }
+        }
+
+        if (pdata->flt) {
+                ret = request_threaded_irq(gpio_to_irq(pdata->flt),
+                                NULL, max8903_fault,
+                                IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
+                                "MAX8903 Fault", data);
+                if (ret) {
+                        dev_err(dev, "Cannot request irq %d for Fault (%d)\n",
+                                        gpio_to_irq(pdata->flt), ret);
+                        goto err_usb_irq;
+                }
+        }
+
+        return 0;
+
+err_usb_irq:
+        if (pdata->usb_valid)
+                free_irq(gpio_to_irq(pdata->uok), data);
+err_dc_irq:
+        if (pdata->dc_valid)
+                free_irq(gpio_to_irq(pdata->dok), data);
+err_psy:
+        power_supply_unregister(&data->psy);
+err:
+        kfree(data);
+        return ret;
+}
+
+static __devexit int max8903_remove(struct platform_device *pdev)
+{
+        struct max8903_data *data = platform_get_drvdata(pdev);
+
+        if (data) {
+                struct max8903_pdata *pdata = data->pdata;
+
+                if (pdata->flt)
+                        free_irq(gpio_to_irq(pdata->flt), data);
+                if (pdata->usb_valid)
+                        free_irq(gpio_to_irq(pdata->uok), data);
+                if (pdata->dc_valid)
+                        free_irq(gpio_to_irq(pdata->dok), data);
+                power_supply_unregister(&data->psy);
+                kfree(data);
+        }
+
+        return 0;
+}
+
+static struct platform_driver max8903_driver = {
+        .probe  = max8903_probe,
+        .remove = __devexit_p(max8903_remove),
+        .driver = {
+                .name   = "max8903-charger",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init max8903_init(void)
+{
+        return platform_driver_register(&max8903_driver);
+}
+module_init(max8903_init);
+
+static void __exit max8903_exit(void)
+{
+        platform_driver_unregister(&max8903_driver);
+}
+module_exit(max8903_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("MAX8903 Charger Driver");
+MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
+MODULE_ALIAS("max8903-charger");
diff --git a/drivers/power/test_power.c b/drivers/power/test_power.c
index 0cd9f67d33e5..b527c93bf2f3 100644
--- a/drivers/power/test_power.c
+++ b/drivers/power/test_power.c
@@ -3,6 +3,12 @@
  *
  * Copyright 2010  Anton Vorontsov <cbouatmailru@gmail.com>
  *
+ * Dynamic module parameter code from the Virtual Battery Driver
+ * Copyright (C) 2008 Pylone, Inc.
+ * By: Masashi YOKOTA <yokota@pylone.jp>
+ * Originally found here:
+ * http://downloads.pylone.jp/src/virtual_battery/virtual_battery-0.0.1.tar.bz2
+ *
  * 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.
@@ -15,8 +21,12 @@
 #include <linux/delay.h>
 #include <linux/vermagic.h>
 
-static int test_power_ac_online = 1;
-static int test_power_battery_status = POWER_SUPPLY_STATUS_CHARGING;
+static int ac_online                    = 1;
+static int battery_status               = POWER_SUPPLY_STATUS_DISCHARGING;
+static int battery_health               = POWER_SUPPLY_HEALTH_GOOD;
+static int battery_present              = 1; /* true */
+static int battery_technology           = POWER_SUPPLY_TECHNOLOGY_LION;
+static int battery_capacity             = 50;
 
 static int test_power_get_ac_property(struct power_supply *psy,
                                       enum power_supply_property psp,
@@ -24,7 +34,7 @@ static int test_power_get_ac_property(struct power_supply *psy,
 {
         switch (psp) {
         case POWER_SUPPLY_PROP_ONLINE:
-                val->intval = test_power_ac_online;
+                val->intval = ac_online;
                 break;
         default:
                 return -EINVAL;
@@ -47,22 +57,30 @@ static int test_power_get_battery_property(struct power_supply *psy,
                 val->strval = UTS_RELEASE;
                 break;
         case POWER_SUPPLY_PROP_STATUS:
-                val->intval = test_power_battery_status;
+                val->intval = battery_status;
                 break;
         case POWER_SUPPLY_PROP_CHARGE_TYPE:
                 val->intval = POWER_SUPPLY_CHARGE_TYPE_FAST;
                 break;
         case POWER_SUPPLY_PROP_HEALTH:
-                val->intval = POWER_SUPPLY_HEALTH_GOOD;
+                val->intval = battery_health;
+                break;
+        case POWER_SUPPLY_PROP_PRESENT:
+                val->intval = battery_present;
                 break;
         case POWER_SUPPLY_PROP_TECHNOLOGY:
-                val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
+                val->intval = battery_technology;
                 break;
         case POWER_SUPPLY_PROP_CAPACITY_LEVEL:
                 val->intval = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
                 break;
         case POWER_SUPPLY_PROP_CAPACITY:
-                val->intval = 50;
+        case POWER_SUPPLY_PROP_CHARGE_NOW:
+                val->intval = battery_capacity;
+                break;
+        case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
+        case POWER_SUPPLY_PROP_CHARGE_FULL:
+                val->intval = 100;
                 break;
         case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:
         case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:
@@ -84,9 +102,11 @@ static enum power_supply_property test_power_battery_props[] = {
         POWER_SUPPLY_PROP_STATUS,
         POWER_SUPPLY_PROP_CHARGE_TYPE,
         POWER_SUPPLY_PROP_HEALTH,
+        POWER_SUPPLY_PROP_PRESENT,
         POWER_SUPPLY_PROP_TECHNOLOGY,
+        POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
         POWER_SUPPLY_PROP_CHARGE_FULL,
-        POWER_SUPPLY_PROP_CHARGE_EMPTY,
+        POWER_SUPPLY_PROP_CHARGE_NOW,
         POWER_SUPPLY_PROP_CAPACITY,
         POWER_SUPPLY_PROP_CAPACITY_LEVEL,
         POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,
@@ -118,6 +138,7 @@ static struct power_supply test_power_supplies[] = {
         },
 };
 
+
 static int __init test_power_init(void)
 {
         int i;
@@ -145,8 +166,8 @@ static void __exit test_power_exit(void)
         int i;
 
         /* Let's see how we handle changes... */
-        test_power_ac_online = 0;
-        test_power_battery_status = POWER_SUPPLY_STATUS_DISCHARGING;
+        ac_online = 0;
+        battery_status = POWER_SUPPLY_STATUS_DISCHARGING;
         for (i = 0; i < ARRAY_SIZE(test_power_supplies); i++)
                 power_supply_changed(&test_power_supplies[i]);
         pr_info("%s: 'changed' event sent, sleeping for 10 seconds...\n",
@@ -158,6 +179,241 @@ static void __exit test_power_exit(void)
 }
 module_exit(test_power_exit);
 
+
+
+#define MAX_KEYLENGTH 256
+struct battery_property_map {
+        int value;
+        char const *key;
+};
+
+static struct battery_property_map map_ac_online[] = {
+        { 0,  "on"  },
+        { 1,  "off" },
+        { -1, NULL  },
+};
+
+static struct battery_property_map map_status[] = {
+        { POWER_SUPPLY_STATUS_CHARGING,     "charging"     },
+        { POWER_SUPPLY_STATUS_DISCHARGING,  "discharging"  },
+        { POWER_SUPPLY_STATUS_NOT_CHARGING, "not-charging" },
+        { POWER_SUPPLY_STATUS_FULL,         "full"         },
+        { -1,                               NULL           },
+};
+
+static struct battery_property_map map_health[] = {
+        { POWER_SUPPLY_HEALTH_GOOD,           "good"        },
+        { POWER_SUPPLY_HEALTH_OVERHEAT,       "overheat"    },
+        { POWER_SUPPLY_HEALTH_DEAD,           "dead"        },
+        { POWER_SUPPLY_HEALTH_OVERVOLTAGE,    "overvoltage" },
+        { POWER_SUPPLY_HEALTH_UNSPEC_FAILURE, "failure"     },
+        { -1,                                 NULL          },
+};
+
+static struct battery_property_map map_present[] = {
+        { 0,  "false" },
+        { 1,  "true"  },
+        { -1, NULL    },
+};
+
+static struct battery_property_map map_technology[] = {
+        { POWER_SUPPLY_TECHNOLOGY_NiMH, "NiMH" },
+        { POWER_SUPPLY_TECHNOLOGY_LION, "LION" },
+        { POWER_SUPPLY_TECHNOLOGY_LIPO, "LIPO" },
+        { POWER_SUPPLY_TECHNOLOGY_LiFe, "LiFe" },
+        { POWER_SUPPLY_TECHNOLOGY_NiCd, "NiCd" },
+        { POWER_SUPPLY_TECHNOLOGY_LiMn, "LiMn" },
+        { -1,                           NULL   },
+};
+
+
+static int map_get_value(struct battery_property_map *map, const char *key,
+                                int def_val)
+{
+        char buf[MAX_KEYLENGTH];
+        int cr;
+
+        strncpy(buf, key, MAX_KEYLENGTH);
+        buf[MAX_KEYLENGTH-1] = '\0';
+
+        cr = strnlen(buf, MAX_KEYLENGTH) - 1;
+        if (buf[cr] == '\n')
+                buf[cr] = '\0';
+
+        while (map->key) {
+                if (strncasecmp(map->key, buf, MAX_KEYLENGTH) == 0)
+                        return map->value;
+                map++;
+        }
+
+        return def_val;
+}
+
+
+static const char *map_get_key(struct battery_property_map *map, int value,
+                                const char *def_key)
+{
+        while (map->key) {
+                if (map->value == value)
+                        return map->key;
+                map++;
+        }
+
+        return def_key;
+}
+
+static int param_set_ac_online(const char *key, const struct kernel_param *kp)
+{
+        ac_online = map_get_value(map_ac_online, key, ac_online);
+        power_supply_changed(&test_power_supplies[0]);
+        return 0;
+}
+
+static int param_get_ac_online(char *buffer, const struct kernel_param *kp)
+{
+        strcpy(buffer, map_get_key(map_ac_online, ac_online, "unknown"));
+        return strlen(buffer);
+}
+
+static int param_set_battery_status(const char *key,
+                                        const struct kernel_param *kp)
+{
+        battery_status = map_get_value(map_status, key, battery_status);
+        power_supply_changed(&test_power_supplies[1]);
+        return 0;
+}
+
+static int param_get_battery_status(char *buffer, const struct kernel_param *kp)
+{
+        strcpy(buffer, map_get_key(map_status, battery_status, "unknown"));
+        return strlen(buffer);
+}
+
+static int param_set_battery_health(const char *key,
+                                        const struct kernel_param *kp)
+{
+        battery_health = map_get_value(map_health, key, battery_health);
+        power_supply_changed(&test_power_supplies[1]);
+        return 0;
+}
+
+static int param_get_battery_health(char *buffer, const struct kernel_param *kp)
+{
+        strcpy(buffer, map_get_key(map_health, battery_health, "unknown"));
+        return strlen(buffer);
+}
+
+static int param_set_battery_present(const char *key,
+                                        const struct kernel_param *kp)
+{
+        battery_present = map_get_value(map_present, key, battery_present);
+        power_supply_changed(&test_power_supplies[0]);
+        return 0;
+}
+
+static int param_get_battery_present(char *buffer,
+                                        const struct kernel_param *kp)
+{
+        strcpy(buffer, map_get_key(map_present, battery_present, "unknown"));
+        return strlen(buffer);
+}
+
+static int param_set_battery_technology(const char *key,
+                                        const struct kernel_param *kp)
+{
+        battery_technology = map_get_value(map_technology, key,
+                                                battery_technology);
+        power_supply_changed(&test_power_supplies[1]);
+        return 0;
+}
+
+static int param_get_battery_technology(char *buffer,
+                                        const struct kernel_param *kp)
+{
+        strcpy(buffer,
+                map_get_key(map_technology, battery_technology, "unknown"));
+        return strlen(buffer);
+}
+
+static int param_set_battery_capacity(const char *key,
+                                        const struct kernel_param *kp)
+{
+        int tmp;
+
+        if (1 != sscanf(key, "%d", &tmp))
+                return -EINVAL;
+
+        battery_capacity = tmp;
+        power_supply_changed(&test_power_supplies[1]);
+        return 0;
+}
+
+#define param_get_battery_capacity param_get_int
+
+
+
+static struct kernel_param_ops param_ops_ac_online = {
+        .set = param_set_ac_online,
+        .get = param_get_ac_online,
+};
+
+static struct kernel_param_ops param_ops_battery_status = {
+        .set = param_set_battery_status,
+        .get = param_get_battery_status,
+};
+
+static struct kernel_param_ops param_ops_battery_present = {
+        .set = param_set_battery_present,
+        .get = param_get_battery_present,
+};
+
+static struct kernel_param_ops param_ops_battery_technology = {
+        .set = param_set_battery_technology,
+        .get = param_get_battery_technology,
+};
+
+static struct kernel_param_ops param_ops_battery_health = {
+        .set = param_set_battery_health,
+        .get = param_get_battery_health,
+};
+
+static struct kernel_param_ops param_ops_battery_capacity = {
+        .set = param_set_battery_capacity,
+        .get = param_get_battery_capacity,
+};
+
+
+#define param_check_ac_online(name, p) __param_check(name, p, void);
+#define param_check_battery_status(name, p) __param_check(name, p, void);
+#define param_check_battery_present(name, p) __param_check(name, p, void);
+#define param_check_battery_technology(name, p) __param_check(name, p, void);
+#define param_check_battery_health(name, p) __param_check(name, p, void);
+#define param_check_battery_capacity(name, p) __param_check(name, p, void);
+
+
+module_param(ac_online, ac_online, 0644);
+MODULE_PARM_DESC(ac_online, "AC charging state <on|off>");
+
+module_param(battery_status, battery_status, 0644);
+MODULE_PARM_DESC(battery_status,
+        "battery status <charging|discharging|not-charging|full>");
+
+module_param(battery_present, battery_present, 0644);
+MODULE_PARM_DESC(battery_present,
+        "battery presence state <good|overheat|dead|overvoltage|failure>");
+
+module_param(battery_technology, battery_technology, 0644);
+MODULE_PARM_DESC(battery_technology,
+        "battery technology <NiMH|LION|LIPO|LiFe|NiCd|LiMn>");
+
+module_param(battery_health, battery_health, 0644);
+MODULE_PARM_DESC(battery_health,
+        "battery health state <good|overheat|dead|overvoltage|failure>");
+
+module_param(battery_capacity, battery_capacity, 0644);
+MODULE_PARM_DESC(battery_capacity, "battery capacity (percentage)");
+
+
 MODULE_DESCRIPTION("Power supply driver for testing");
 MODULE_AUTHOR("Anton Vorontsov <cbouatmailru@gmail.com>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c
index e5ced3a4c1ed..d119c38b3ff6 100644
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
@@ -271,24 +271,33 @@ static int __devexit z2_batt_remove(struct i2c_client *client)
 }
 
 #ifdef CONFIG_PM
-static int z2_batt_suspend(struct i2c_client *client, pm_message_t state)
+static int z2_batt_suspend(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct z2_charger *charger = i2c_get_clientdata(client);
 
         flush_work_sync(&charger->bat_work);
         return 0;
 }
 
-static int z2_batt_resume(struct i2c_client *client)
+static int z2_batt_resume(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct z2_charger *charger = i2c_get_clientdata(client);
 
         schedule_work(&charger->bat_work);
         return 0;
 }
+
+static const struct dev_pm_ops z2_battery_pm_ops = {
+        .suspend        = z2_batt_suspend,
+        .resume         = z2_batt_resume,
+};
+
+#define Z2_BATTERY_PM_OPS       (&z2_battery_pm_ops)
+
 #else
-#define z2_batt_suspend NULL
-#define z2_batt_resume NULL
+#define Z2_BATTERY_PM_OPS       (NULL)
 #endif
 
 static const struct i2c_device_id z2_batt_id[] = {
@@ -301,11 +310,10 @@ static struct i2c_driver z2_batt_driver = {
         .driver = {
                 .name   = "z2-battery",
                 .owner  = THIS_MODULE,
+                .pm     = Z2_BATTERY_PM_OPS
         },
         .probe          = z2_batt_probe,
         .remove         = z2_batt_remove,
-        .suspend        = z2_batt_suspend,
-        .resume         = z2_batt_resume,
         .id_table       = z2_batt_id,
 };