Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/power/wm97xx_battery.c

diff --combined drivers/input/touchscreen/wm97xx-core.c
index cf8cbc6,252eb11..f944918
--- 1/drivers/input/touchscreen/wm97xx-core.c
--- 2/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@@ -204,7 -204,7 +204,7 @@@ void wm97xx_set_gpio(struct wm97xx *wm
        else
                reg &= ~gpio;
  
-       if (wm->id == WM9712_ID2)
+       if (wm->id == WM9712_ID2 && wm->variant != WM97xx_WM1613)
                wm97xx_reg_write(wm, AC97_GPIO_STATUS, reg << 1);
        else
                wm97xx_reg_write(wm, AC97_GPIO_STATUS, reg);
@@@ -307,7 -307,7 +307,7 @@@ static void wm97xx_pen_irq_worker(struc
                                         WM97XX_GPIO_13);
                }
  
-               if (wm->id == WM9712_ID2)
+               if (wm->id == WM9712_ID2 && wm->variant != WM97xx_WM1613)
                        wm97xx_reg_write(wm, AC97_GPIO_STATUS, (status &
                                                ~WM97XX_GPIO_13) << 1);
                else
@@@ -561,7 -561,6 +561,7 @@@ static void wm97xx_ts_input_close(struc
  static int wm97xx_probe(struct device *dev)
  {
        struct wm97xx *wm;
 +      struct wm97xx_pdata *pdata = dev->platform_data;
        int ret = 0, id = 0;
  
        wm = kzalloc(sizeof(struct wm97xx), GFP_KERNEL);
@@@ -583,6 -582,8 +583,8 @@@
  
        wm->id = wm97xx_reg_read(wm, AC97_VENDOR_ID2);
  
+       wm->variant = WM97xx_GENERIC;
+ 
        dev_info(wm->dev, "detected a wm97%02x codec\n", wm->id & 0xff);
  
        switch (wm->id & 0xff) {
@@@ -657,7 -658,6 +659,7 @@@
        }
        platform_set_drvdata(wm->battery_dev, wm);
        wm->battery_dev->dev.parent = dev;
 +      wm->battery_dev->dev.platform_data = pdata;
        ret = platform_device_add(wm->battery_dev);
        if (ret < 0)
                goto batt_reg_err;
@@@ -671,7 -671,6 +673,7 @@@
        }
        platform_set_drvdata(wm->touch_dev, wm);
        wm->touch_dev->dev.parent = dev;
 +      wm->touch_dev->dev.platform_data = pdata;
        ret = platform_device_add(wm->touch_dev);
        if (ret < 0)
                goto touch_reg_err;

diff --combined drivers/power/wm97xx_battery.c
index c552082,b787335..f2bfd29
--- 1/drivers/power/wm97xx_battery.c
--- 2/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@@ -22,31 -22,25 +22,31 @@@
  #include <linux/spinlock.h>
  #include <linux/interrupt.h>
  #include <linux/gpio.h>
 -#include <linux/wm97xx_batt.h>
 +#include <linux/irq.h>
  
  static DEFINE_MUTEX(bat_lock);
  static struct work_struct bat_work;
  struct mutex work_lock;
  static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;
 -static struct wm97xx_batt_info *pdata;
 +static struct wm97xx_batt_info *gpdata;
  static enum power_supply_property *prop;
  
  static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)
  {
-       return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
 +      struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
 +      struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
 +
+       return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
                                        pdata->batt_aux) * pdata->batt_mult /
                                        pdata->batt_div;
  }
  
  static unsigned long wm97xx_read_temp(struct power_supply *bat_ps)
  {
-       return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
 +      struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
 +      struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
 +
+       return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
                                        pdata->temp_aux) * pdata->temp_mult /
                                        pdata->temp_div;
  }
@@@ -55,9 -49,6 +55,9 @@@ static int wm97xx_bat_get_property(stru
                            enum power_supply_property psp,
                            union power_supply_propval *val)
  {
 +      struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
 +      struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
 +
        switch (psp) {
        case POWER_SUPPLY_PROP_STATUS:
                val->intval = bat_status;
@@@ -106,8 -97,6 +106,8 @@@ static void wm97xx_bat_external_power_c
  static void wm97xx_bat_update(struct power_supply *bat_ps)
  {
        int old_status = bat_status;
 +      struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
 +      struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
  
        mutex_lock(&work_lock);
  
@@@ -138,29 -127,21 +138,29 @@@ static void wm97xx_bat_work(struct work
        wm97xx_bat_update(&bat_ps);
  }
  
 +static irqreturn_t wm97xx_chrg_irq(int irq, void *data)
 +{
 +      schedule_work(&bat_work);
 +      return IRQ_HANDLED;
 +}
 +
  #ifdef CONFIG_PM
 -static int wm97xx_bat_suspend(struct platform_device *dev, pm_message_t state)
 +static int wm97xx_bat_suspend(struct device *dev)
  {
        flush_scheduled_work();
        return 0;
  }
  
 -static int wm97xx_bat_resume(struct platform_device *dev)
 +static int wm97xx_bat_resume(struct device *dev)
  {
        schedule_work(&bat_work);
        return 0;
  }
 -#else
 -#define wm97xx_bat_suspend NULL
 -#define wm97xx_bat_resume NULL
 +
 +static struct dev_pm_ops wm97xx_bat_pm_ops = {
 +      .suspend        = wm97xx_bat_suspend,
 +      .resume         = wm97xx_bat_resume,
 +};
  #endif
  
  static int __devinit wm97xx_bat_probe(struct platform_device *dev)
@@@ -168,15 -149,6 +168,15 @@@
        int ret = 0;
        int props = 1;  /* POWER_SUPPLY_PROP_PRESENT */
        int i = 0;
 +      struct wm97xx_pdata *wmdata = dev->dev.platform_data;
 +      struct wm97xx_batt_pdata *pdata;
 +
 +      if (gpdata) {
 +              dev_err(&dev->dev, "Do not pass platform_data through "
 +                      "wm97xx_bat_set_pdata!\n");
 +              return -EINVAL;
 +      } else
 +              pdata = wmdata->batt_pdata;
  
        if (dev->id != -1)
                return -EINVAL;
@@@ -184,20 -156,15 +184,20 @@@
        mutex_init(&work_lock);
  
        if (!pdata) {
 -              dev_err(&dev->dev, "Please use wm97xx_bat_set_pdata\n");
 +              dev_err(&dev->dev, "No platform_data supplied\n");
                return -EINVAL;
        }
  
 -      if (pdata->charge_gpio >= 0 && gpio_is_valid(pdata->charge_gpio)) {
 +      if (gpio_is_valid(pdata->charge_gpio)) {
                ret = gpio_request(pdata->charge_gpio, "BATT CHRG");
                if (ret)
                        goto err;
                ret = gpio_direction_input(pdata->charge_gpio);
 +              if (ret)
 +                      goto err2;
 +              ret = request_irq(gpio_to_irq(pdata->charge_gpio),
 +                              wm97xx_chrg_irq, IRQF_DISABLED,
 +                              "AC Detect", 0);
                if (ret)
                        goto err2;
                props++;        /* POWER_SUPPLY_PROP_STATUS */
@@@ -216,7 -183,7 +216,7 @@@
  
        prop = kzalloc(props * sizeof(*prop), GFP_KERNEL);
        if (!prop)
 -              goto err2;
 +              goto err3;
  
        prop[i++] = POWER_SUPPLY_PROP_PRESENT;
        if (pdata->charge_gpio >= 0)
@@@ -249,30 -216,21 +249,30 @@@
        if (!ret)
                schedule_work(&bat_work);
        else
 -              goto err3;
 +              goto err4;
  
        return 0;
 -err3:
 +err4:
        kfree(prop);
 +err3:
 +      if (gpio_is_valid(pdata->charge_gpio))
 +              free_irq(gpio_to_irq(pdata->charge_gpio), dev);
  err2:
 -      gpio_free(pdata->charge_gpio);
 +      if (gpio_is_valid(pdata->charge_gpio))
 +              gpio_free(pdata->charge_gpio);
  err:
        return ret;
  }
  
  static int __devexit wm97xx_bat_remove(struct platform_device *dev)
  {
 -      if (pdata && pdata->charge_gpio && pdata->charge_gpio >= 0)
 +      struct wm97xx_pdata *wmdata = dev->dev.platform_data;
 +      struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
 +
 +      if (pdata && gpio_is_valid(pdata->charge_gpio)) {
 +              free_irq(gpio_to_irq(pdata->charge_gpio), dev);
                gpio_free(pdata->charge_gpio);
 +      }
        flush_scheduled_work();
        power_supply_unregister(&bat_ps);
        kfree(prop);
@@@ -283,12 -241,11 +283,12 @@@ static struct platform_driver wm97xx_ba
        .driver = {
                .name   = "wm97xx-battery",
                .owner  = THIS_MODULE,
 +#ifdef CONFIG_PM
 +              .pm     = &wm97xx_bat_pm_ops,
 +#endif
        },
        .probe          = wm97xx_bat_probe,
        .remove         = __devexit_p(wm97xx_bat_remove),
 -      .suspend        = wm97xx_bat_suspend,
 -      .resume         = wm97xx_bat_resume,
  };
  
  static int __init wm97xx_bat_init(void)
@@@ -301,9 -258,9 +301,9 @@@ static void __exit wm97xx_bat_exit(void
        platform_driver_unregister(&wm97xx_bat_driver);
  }
  
 -void __init wm97xx_bat_set_pdata(struct wm97xx_batt_info *data)
 +void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data)
  {
 -      pdata = data;
 +      gpdata = data;
  }
  EXPORT_SYMBOL_GPL(wm97xx_bat_set_pdata);
  

diff --combined include/linux/wm97xx.h
index b2c2297,0c98781..38e8c4d
--- 1/include/linux/wm97xx.h
--- 2/include/linux/wm97xx.h
+++ b/include/linux/wm97xx.h
@@@ -15,6 -15,12 +15,12 @@@
  #include <linux/input.h>      /* Input device layer */
  #include <linux/platform_device.h>
  
+ /*
+  * WM97xx variants
+  */
+ #define       WM97xx_GENERIC                  0x0000
+ #define       WM97xx_WM1613                   0x1613
+ 
  /*
   * WM97xx AC97 Touchscreen registers
   */
@@@ -283,27 -289,10 +289,28 @@@ struct wm97xx 
        unsigned pen_is_down:1;         /* Pen is down */
        unsigned aux_waiting:1;         /* aux measurement waiting */
        unsigned pen_probably_down:1;   /* used in polling mode */
+       u16 variant;                    /* WM97xx chip variant */
        u16 suspend_mode;               /* PRP in suspend mode */
  };
  
 +struct wm97xx_batt_pdata {
 +      int     batt_aux;
 +      int     temp_aux;
 +      int     charge_gpio;
 +      int     min_voltage;
 +      int     max_voltage;
 +      int     batt_div;
 +      int     batt_mult;
 +      int     temp_div;
 +      int     temp_mult;
 +      int     batt_tech;
 +      char    *batt_name;
 +};
 +
 +struct wm97xx_pdata {
 +      struct wm97xx_batt_pdata        *batt_pdata;    /* battery data */
 +};
 +
  /*
   * Codec GPIO access (not supported on WM9705)
   * This can be used to set/get codec GPIO and Virtual GPIO status.