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

Pull MFD changes from Samuel Ortiz:
 "MFD bits for the 3.7 merge window.

  As usual we have a few new drivers:

   - TI LP8788
   - TI OMAP USB TLL
   - Maxim MAX8907
   - SMSC ECE1099
   - Dialog Semiconductor DA9055
   - A simpler syscon driver that allow us to get rid of the anatop one.

  Drivers are also gradually getting Device Tree and IRQ domain support.

  The following drivers got DT support:
   - palmas, 88pm860x, tc3589x and twl4030-audio

  And those ones now use the IRQ domain APIs:
   - 88pm860x, tc3589x, db8500_prcmu

  Also some other interesting changes:
   - Intel's ICH LPC now supports Lynx Point
   - TI's twl4030-audio added a GPO child
   - tps6527 enabled its backlight subdevice
   - The twl6030 pwm driver moved to the new PWM subsystem

  And finally a bunch of cleanup and casual fixes for mc13xxx, 88pm860x,
  palmas, ab8500, wm8994, wm5110, max8907 and the tps65xxx family."

Fix up various annoying conflicts: the DT and IRQ domain support came in
twice and was already in 3.6. And then it was apparently rebased.

Guys, DON'T REBASE!

* tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (89 commits)
  ARM: dts: Enable 88pm860x pmic
  mfd: 88pm860x: Move gpadc init into touch
  mfd: 88pm860x: Device tree support
  mfd: 88pm860x: Use irqdomain
  mfd: smsc: Add support for smsc gpio io/keypad driver
  backlight: tps65217_bl: Add missing platform_set_drvdata in tps65217_bl_probe
  mfd: DA9055 core driver
  mfd: tps65910: Add alarm interrupt of TPS65910 RTC to mfd device list
  mfd: wm5110: Add register patches for revision B
  mfd: wm5110: Disable control interface error report for WM5110 rev B
  mfd: max8907: Remove regulator-compatible from DT docs
  backlight: Add TPS65217 WLED driver
  mfd: Add backlight as subdevice to the tps65217
  mfd: Provide the PRCMU with its own IRQ domain
  mfd: Fix max8907 sparse warning
  mfd: Add lp8788 mfd driver
  mfd: dbx500: Provide a more accurate smp_twd clock
  mfd: rc5t583: Fix warning messages
  regulator: palmas: Add DT support
  mfd: palmas: Change regulator defns to better suite DT
  ...

4 files changed, 214 insertions, 10 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 8382dc832929..aa73ef3233b8 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -409,6 +409,13 @@ config GPIO_TWL4030
           Say yes here to access the GPIO signals of various multi-function
           power management chips from Texas Instruments.
 
+config GPIO_TWL6040
+        tristate "TWL6040 GPO"
+        depends on TWL6040_CORE
+        help
+          Say yes here to access the GPO signals of twl6040
+          audio chip from Texas Instruments.
+
 config GPIO_WM831X
         tristate "WM831x GPIOs"
         depends on MFD_WM831X
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 0ffaa8423e87..b2c109d1303d 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -68,6 +68,7 @@ obj-$(CONFIG_GPIO_TPS6586X)	+= gpio-tps6586x.o
 obj-$(CONFIG_GPIO_TPS65910)     += gpio-tps65910.o
 obj-$(CONFIG_GPIO_TPS65912)     += gpio-tps65912.o
 obj-$(CONFIG_GPIO_TWL4030)      += gpio-twl4030.o
+obj-$(CONFIG_GPIO_TWL6040)      += gpio-twl6040.o
 obj-$(CONFIG_GPIO_UCB1400)      += gpio-ucb1400.o
 obj-$(CONFIG_GPIO_VR41XX)       += gpio-vr41xx.o
 obj-$(CONFIG_GPIO_VT8500)       += gpio-vt8500.o
diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
index b7c06517403d..d4d617966696 100644
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
@@ -49,6 +49,10 @@ static const u8 ichx_regs[3][3] = {
         {0x0c, 0x38, 0x48},     /* LVL[1-3] offsets */
 };
 
+static const u8 ichx_reglen[3] = {
+        0x30, 0x10, 0x10,
+};
+
 #define ICHX_WRITE(val, reg, base_res)  outl(val, (reg) + (base_res)->start)
 #define ICHX_READ(reg, base_res)        inl((reg) + (base_res)->start)
 
@@ -75,6 +79,7 @@ static struct {
         struct resource *pm_base;       /* Power Mangagment IO base */
         struct ichx_desc *desc; /* Pointer to chipset-specific description */
         u32 orig_gpio_ctrl;     /* Orig CTRL value, used to restore on exit */
+        u8 use_gpio;            /* Which GPIO groups are usable */
 } ichx_priv;
 
 static int modparam_gpiobase = -1;      /* dynamic */
@@ -123,8 +128,16 @@ static int ichx_read_bit(int reg, unsigned nr)
         return data & (1 << bit) ? 1 : 0;
 }
 
+static int ichx_gpio_check_available(struct gpio_chip *gpio, unsigned nr)
+{
+        return (ichx_priv.use_gpio & (1 << (nr / 32))) ? 0 : -ENXIO;
+}
+
 static int ichx_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
 {
+        if (!ichx_gpio_check_available(gpio, nr))
+                return -ENXIO;
+
         /*
          * Try setting pin as an input and verify it worked since many pins
          * are output-only.
@@ -138,6 +151,9 @@ static int ichx_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
 static int ichx_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
                                         int val)
 {
+        if (!ichx_gpio_check_available(gpio, nr))
+                return -ENXIO;
+
         /* Set GPIO output value. */
         ichx_write_bit(GPIO_LVL, nr, val, 0);
 
@@ -153,6 +169,9 @@ static int ichx_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
 
 static int ichx_gpio_get(struct gpio_chip *chip, unsigned nr)
 {
+        if (!ichx_gpio_check_available(chip, nr))
+                return -ENXIO;
+
         return ichx_read_bit(GPIO_LVL, nr);
 }
 
@@ -161,6 +180,9 @@ static int ich6_gpio_get(struct gpio_chip *chip, unsigned nr)
         unsigned long flags;
         u32 data;
 
+        if (!ichx_gpio_check_available(chip, nr))
+                return -ENXIO;
+
         /*
          * GPI 0 - 15 need to be read from the power management registers on
          * a ICH6/3100 bridge.
@@ -291,6 +313,46 @@ static struct ichx_desc intel5_desc = {
         .ngpio = 76,
 };
 
+static int __devinit ichx_gpio_request_regions(struct resource *res_base,
+                                                const char *name, u8 use_gpio)
+{
+        int i;
+
+        if (!res_base || !res_base->start || !res_base->end)
+                return -ENODEV;
+
+        for (i = 0; i < ARRAY_SIZE(ichx_regs[0]); i++) {
+                if (!(use_gpio & (1 << i)))
+                        continue;
+                if (!request_region(res_base->start + ichx_regs[0][i],
+                                    ichx_reglen[i], name))
+                        goto request_err;
+        }
+        return 0;
+
+request_err:
+        /* Clean up: release already requested regions, if any */
+        for (i--; i >= 0; i--) {
+                if (!(use_gpio & (1 << i)))
+                        continue;
+                release_region(res_base->start + ichx_regs[0][i],
+                               ichx_reglen[i]);
+        }
+        return -EBUSY;
+}
+
+static void ichx_gpio_release_regions(struct resource *res_base, u8 use_gpio)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(ichx_regs[0]); i++) {
+                if (!(use_gpio & (1 << i)))
+                        continue;
+                release_region(res_base->start + ichx_regs[0][i],
+                               ichx_reglen[i]);
+        }
+}
+
 static int __devinit ichx_gpio_probe(struct platform_device *pdev)
 {
         struct resource *res_base, *res_pm;
@@ -329,12 +391,11 @@ static int __devinit ichx_gpio_probe(struct platform_device *pdev)
         }
 
         res_base = platform_get_resource(pdev, IORESOURCE_IO, ICH_RES_GPIO);
-        if (!res_base || !res_base->start || !res_base->end)
-                return -ENODEV;
-
-        if (!request_region(res_base->start, resource_size(res_base),
-                                pdev->name))
-                return -EBUSY;
+        ichx_priv.use_gpio = ich_info->use_gpio;
+        err = ichx_gpio_request_regions(res_base, pdev->name,
+                                        ichx_priv.use_gpio);
+        if (err)
+                return err;
 
         ichx_priv.gpio_base = res_base;
 
@@ -374,8 +435,7 @@ init:
         return 0;
 
 add_err:
-        release_region(ichx_priv.gpio_base->start,
-                        resource_size(ichx_priv.gpio_base));
+        ichx_gpio_release_regions(ichx_priv.gpio_base, ichx_priv.use_gpio);
         if (ichx_priv.pm_base)
                 release_region(ichx_priv.pm_base->start,
                                 resource_size(ichx_priv.pm_base));
@@ -393,8 +453,7 @@ static int __devexit ichx_gpio_remove(struct platform_device *pdev)
                 return err;
         }
 
-        release_region(ichx_priv.gpio_base->start,
-                                resource_size(ichx_priv.gpio_base));
+        ichx_gpio_release_regions(ichx_priv.gpio_base, ichx_priv.use_gpio);
         if (ichx_priv.pm_base)
                 release_region(ichx_priv.pm_base->start,
                                 resource_size(ichx_priv.pm_base));
diff --git a/drivers/gpio/gpio-twl6040.c b/drivers/gpio/gpio-twl6040.c
new file mode 100644
index 000000000000..dd58e8b25043
--- /dev/null
+++ b/drivers/gpio/gpio-twl6040.c
@@ -0,0 +1,137 @@
+/*
+ * Access to GPOs on TWL6040 chip
+ *
+ * Copyright (C) 2012 Texas Instruments, Inc.
+ *
+ * Authors:
+ *      Sergio Aguirre <saaguirre@ti.com>
+ *      Peter Ujfalusi <peter.ujfalusi@ti.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/module.h>
+#include <linux/init.h>
+#include <linux/kthread.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+
+#include <linux/mfd/twl6040.h>
+
+static struct gpio_chip twl6040gpo_chip;
+
+static int twl6040gpo_get(struct gpio_chip *chip, unsigned offset)
+{
+        struct twl6040 *twl6040 = dev_get_drvdata(chip->dev->parent);
+        int ret = 0;
+
+        ret = twl6040_reg_read(twl6040, TWL6040_REG_GPOCTL);
+        if (ret < 0)
+                return ret;
+
+        return (ret >> offset) & 1;
+}
+
+static int twl6040gpo_direction_out(struct gpio_chip *chip, unsigned offset,
+                                    int value)
+{
+        /* This only drives GPOs, and can't change direction */
+        return 0;
+}
+
+static void twl6040gpo_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+        struct twl6040 *twl6040 = dev_get_drvdata(chip->dev->parent);
+        int ret;
+        u8 gpoctl;
+
+        ret = twl6040_reg_read(twl6040, TWL6040_REG_GPOCTL);
+        if (ret < 0)
+                return;
+
+        if (value)
+                gpoctl = ret | (1 << offset);
+        else
+                gpoctl = ret & ~(1 << offset);
+
+        twl6040_reg_write(twl6040, TWL6040_REG_GPOCTL, gpoctl);
+}
+
+static struct gpio_chip twl6040gpo_chip = {
+        .label                  = "twl6040",
+        .owner                  = THIS_MODULE,
+        .get                    = twl6040gpo_get,
+        .direction_output       = twl6040gpo_direction_out,
+        .set                    = twl6040gpo_set,
+        .can_sleep              = 1,
+};
+
+/*----------------------------------------------------------------------*/
+
+static int __devinit gpo_twl6040_probe(struct platform_device *pdev)
+{
+        struct twl6040_gpo_data *pdata = pdev->dev.platform_data;
+        struct device *twl6040_core_dev = pdev->dev.parent;
+        struct twl6040 *twl6040 = dev_get_drvdata(twl6040_core_dev);
+        int ret;
+
+        if (pdata)
+                twl6040gpo_chip.base = pdata->gpio_base;
+        else
+                twl6040gpo_chip.base = -1;
+
+        if (twl6040_get_revid(twl6040) < TWL6041_REV_ES2_0)
+                twl6040gpo_chip.ngpio = 3; /* twl6040 have 3 GPO */
+        else
+                twl6040gpo_chip.ngpio = 1; /* twl6041 have 1 GPO */
+
+        twl6040gpo_chip.dev = &pdev->dev;
+#ifdef CONFIG_OF_GPIO
+        twl6040gpo_chip.of_node = twl6040_core_dev->of_node;
+#endif
+
+        ret = gpiochip_add(&twl6040gpo_chip);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "could not register gpiochip, %d\n", ret);
+                twl6040gpo_chip.ngpio = 0;
+        }
+
+        return ret;
+}
+
+static int __devexit gpo_twl6040_remove(struct platform_device *pdev)
+{
+        return gpiochip_remove(&twl6040gpo_chip);
+}
+
+/* Note:  this hardware lives inside an I2C-based multi-function device. */
+MODULE_ALIAS("platform:twl6040-gpo");
+
+static struct platform_driver gpo_twl6040_driver = {
+        .driver = {
+                .name   = "twl6040-gpo",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = gpo_twl6040_probe,
+        .remove         = gpo_twl6040_remove,
+};
+
+module_platform_driver(gpo_twl6040_driver);
+
+MODULE_AUTHOR("Texas Instruments, Inc.");
+MODULE_DESCRIPTION("GPO interface for TWL6040");
+MODULE_LICENSE("GPL");