Merge tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Pull MFD changes from Samuel Ortiz:
 - 4 new drivers: Freescale i.MX on-chip Anatop, Ricoh's RC5T583 and
   TI's TPS65090 and TPS65217.
 - New variants support (8420, 8520 ab9540), cleanups and bug fixes for
   the abx500 and db8500 ST-E chipsets.
 - Some minor fixes and update for the wm8994 from Mark.
 - The beginning of a long term TWL cleanup effort coming from the TI
   folks.
 - Various fixes and cleanups for the s5m, TPS659xx, pm860x, and MAX8997
   drivers.

Fix up trivial conflicts due to duplicate patches and header file
cleanups (<linux/device.h> removal etc).

* tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (97 commits)
  gpio/twl: Add DT support to gpio-twl4030 driver
  gpio/twl: Allocate irq_desc dynamically for SPARSE_IRQ support
  mfd: Detach twl6040 from the pmic mfd driver
  mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups
  mfd: Micro-optimization on twl4030 IRQ handler
  mfd: Make twl4030 SIH SPARSE_IRQ capable
  mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files
  mfd: Remove references already defineid in header file from twl-core
  mfd: Remove unneeded header from twl-core
  mfd: Make twl-core not depend on pdata->irq_base/end
  ARM: OMAP2+: board-omap4-*: Do not use anymore TWL6030_IRQ_BASE in board files
  mfd: Return twl6030_mmc_card_detect IRQ for board setup
  Revert "mfd: Add platform data for MAX8997 haptic driver"
  mfd: Add support for TPS65090
  mfd: Add some da9052-i2c section annotations
  mfd: Build rtc5t583 only if I2C config is selected to y.
  mfd: Add anatop mfd driver
  mfd: Fix compilation error in tps65910.h
  mfd: Add 8420 variant to db8500-prcmu
  mfd: Add 8520 PRCMU variant to db8500-prcmu
  ...

1 files changed, 28 insertions, 21 deletions

diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index 915943af3f21..f49181c73113 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -67,6 +67,28 @@ static inline int wled_idc(int port)
         return ret;
 }
 
+static int backlight_power_set(struct pm860x_chip *chip, int port,
+                int on)
+{
+        int ret = -EINVAL;
+
+        switch (port) {
+        case PM8606_BACKLIGHT1:
+                ret = on ? pm8606_osc_enable(chip, WLED1_DUTY) :
+                        pm8606_osc_disable(chip, WLED1_DUTY);
+                break;
+        case PM8606_BACKLIGHT2:
+                ret = on ? pm8606_osc_enable(chip, WLED2_DUTY) :
+                        pm8606_osc_disable(chip, WLED2_DUTY);
+                break;
+        case PM8606_BACKLIGHT3:
+                ret = on ? pm8606_osc_enable(chip, WLED3_DUTY) :
+                        pm8606_osc_disable(chip, WLED3_DUTY);
+                break;
+        }
+        return ret;
+}
+
 static int pm860x_backlight_set(struct backlight_device *bl, int brightness)
 {
         struct pm860x_backlight_data *data = bl_get_data(bl);
@@ -79,6 +101,9 @@ static int pm860x_backlight_set(struct backlight_device *bl, int brightness)
         else
                 value = brightness;
 
+        if (brightness)
+                backlight_power_set(chip, data->port, 1);
+
         ret = pm860x_reg_write(data->i2c, wled_a(data->port), value);
         if (ret < 0)
                 goto out;
@@ -115,6 +140,9 @@ static int pm860x_backlight_set(struct backlight_device *bl, int brightness)
         if (ret < 0)
                 goto out;
 
+        if (brightness == 0)
+                backlight_power_set(chip, data->port, 0);
+
         dev_dbg(chip->dev, "set brightness %d\n", value);
         data->current_brightness = value;
         return 0;
@@ -170,7 +198,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
         struct backlight_device *bl;
         struct resource *res;
         struct backlight_properties props;
-        unsigned char value;
         char name[MFD_NAME_SIZE];
         int ret;
 
@@ -217,26 +244,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, bl);
 
-        /* Enable reference VSYS */
-        ret = pm860x_reg_read(data->i2c, PM8606_VSYS);
-        if (ret < 0)
-                goto out;
-        if ((ret & PM8606_VSYS_EN) == 0) {
-                value = ret | PM8606_VSYS_EN;
-                ret = pm860x_reg_write(data->i2c, PM8606_VSYS, value);
-                if (ret < 0)
-                        goto out;
-        }
-        /* Enable reference OSC */
-        ret = pm860x_reg_read(data->i2c, PM8606_MISC);
-        if (ret < 0)
-                goto out;
-        if ((ret & PM8606_MISC_OSC_EN) == 0) {
-                value = ret | PM8606_MISC_OSC_EN;
-                ret = pm860x_reg_write(data->i2c, PM8606_MISC, value);
-                if (ret < 0)
-                        goto out;
-        }
         /* read current backlight */
         ret = pm860x_backlight_get_brightness(bl);
         if (ret < 0)