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
  ...

2 files changed, 92 insertions, 60 deletions

diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c
index 87a68a896abf..094c5c4fd7f2 100644
--- a/drivers/gpio/gpio-stmpe.c
+++ b/drivers/gpio/gpio-stmpe.c
@@ -307,13 +307,11 @@ static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
         struct stmpe_gpio_platform_data *pdata;
         struct stmpe_gpio *stmpe_gpio;
         int ret;
-        int irq;
+        int irq = 0;
 
         pdata = stmpe->pdata->gpio;
 
         irq = platform_get_irq(pdev, 0);
-        if (irq < 0)
-                return irq;
 
         stmpe_gpio = kzalloc(sizeof(struct stmpe_gpio), GFP_KERNEL);
         if (!stmpe_gpio)
@@ -330,21 +328,28 @@ static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
         stmpe_gpio->chip.dev = &pdev->dev;
         stmpe_gpio->chip.base = pdata ? pdata->gpio_base : -1;
 
-        stmpe_gpio->irq_base = stmpe->irq_base + STMPE_INT_GPIO(0);
+        if (irq >= 0)
+                stmpe_gpio->irq_base = stmpe->irq_base + STMPE_INT_GPIO(0);
+        else
+                dev_info(&pdev->dev,
+                        "device configured in no-irq mode; "
+                        "irqs are not available\n");
 
         ret = stmpe_enable(stmpe, STMPE_BLOCK_GPIO);
         if (ret)
                 goto out_free;
 
-        ret = stmpe_gpio_irq_init(stmpe_gpio);
-        if (ret)
-                goto out_disable;
+        if (irq >= 0) {
+                ret = stmpe_gpio_irq_init(stmpe_gpio);
+                if (ret)
+                        goto out_disable;
 
-        ret = request_threaded_irq(irq, NULL, stmpe_gpio_irq, IRQF_ONESHOT,
-                                   "stmpe-gpio", stmpe_gpio);
-        if (ret) {
-                dev_err(&pdev->dev, "unable to get irq: %d\n", ret);
-                goto out_removeirq;
+                ret = request_threaded_irq(irq, NULL, stmpe_gpio_irq,
+                                IRQF_ONESHOT, "stmpe-gpio", stmpe_gpio);
+                if (ret) {
+                        dev_err(&pdev->dev, "unable to get irq: %d\n", ret);
+                        goto out_removeirq;
+                }
         }
 
         ret = gpiochip_add(&stmpe_gpio->chip);
@@ -361,9 +366,11 @@ static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
         return 0;
 
 out_freeirq:
-        free_irq(irq, stmpe_gpio);
+        if (irq >= 0)
+                free_irq(irq, stmpe_gpio);
 out_removeirq:
-        stmpe_gpio_irq_remove(stmpe_gpio);
+        if (irq >= 0)
+                stmpe_gpio_irq_remove(stmpe_gpio);
 out_disable:
         stmpe_disable(stmpe, STMPE_BLOCK_GPIO);
 out_free:
@@ -391,8 +398,10 @@ static int __devexit stmpe_gpio_remove(struct platform_device *pdev)
 
         stmpe_disable(stmpe, STMPE_BLOCK_GPIO);
 
-        free_irq(irq, stmpe_gpio);
-        stmpe_gpio_irq_remove(stmpe_gpio);
+        if (irq >= 0) {
+                free_irq(irq, stmpe_gpio);
+                stmpe_gpio_irq_remove(stmpe_gpio);
+        }
         platform_set_drvdata(pdev, NULL);
         kfree(stmpe_gpio);
 
diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c
index b8b4f228757c..94256fe7bf36 100644
--- a/drivers/gpio/gpio-twl4030.c
+++ b/drivers/gpio/gpio-twl4030.c
@@ -32,6 +32,8 @@
 #include <linux/irq.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/irqdomain.h>
 
 #include <linux/i2c/twl.h>
 
@@ -256,7 +258,8 @@ static int twl_request(struct gpio_chip *chip, unsigned offset)
                  * and vMMC2 power supplies based on card presence.
                  */
                 pdata = chip->dev->platform_data;
-                value |= pdata->mmc_cd & 0x03;
+                if (pdata)
+                        value |= pdata->mmc_cd & 0x03;
 
                 status = gpio_twl4030_write(REG_GPIO_CTRL, value);
         }
@@ -395,59 +398,70 @@ static int gpio_twl4030_remove(struct platform_device *pdev);
 static int __devinit gpio_twl4030_probe(struct platform_device *pdev)
 {
         struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
-        int ret;
+        struct device_node *node = pdev->dev.of_node;
+        int ret, irq_base;
 
         /* maybe setup IRQs */
-        if (pdata->irq_base) {
-                if (is_module()) {
-                        dev_err(&pdev->dev,
-                                "can't dispatch IRQs from modules\n");
-                        goto no_irqs;
-                }
-                ret = twl4030_sih_setup(TWL4030_MODULE_GPIO);
-                if (ret < 0)
-                        return ret;
-                WARN_ON(ret != pdata->irq_base);
-                twl4030_gpio_irq_base = ret;
+        if (is_module()) {
+                dev_err(&pdev->dev, "can't dispatch IRQs from modules\n");
+                goto no_irqs;
+        }
+
+        irq_base = irq_alloc_descs(-1, 0, TWL4030_GPIO_MAX, 0);
+        if (irq_base < 0) {
+                dev_err(&pdev->dev, "Failed to alloc irq_descs\n");
+                return irq_base;
         }
 
+        irq_domain_add_legacy(node, TWL4030_GPIO_MAX, irq_base, 0,
+                              &irq_domain_simple_ops, NULL);
+
+        ret = twl4030_sih_setup(&pdev->dev, TWL4030_MODULE_GPIO, irq_base);
+        if (ret < 0)
+                return ret;
+
+        twl4030_gpio_irq_base = irq_base;
+
 no_irqs:
-        /*
-         * NOTE:  boards may waste power if they don't set pullups
-         * and pulldowns correctly ... default for non-ULPI pins is
-         * pulldown, and some other pins may have external pullups
-         * or pulldowns.  Careful!
-         */
-        ret = gpio_twl4030_pulls(pdata->pullups, pdata->pulldowns);
-        if (ret)
-                dev_dbg(&pdev->dev, "pullups %.05x %.05x --> %d\n",
-                                pdata->pullups, pdata->pulldowns,
-                                ret);
-
-        ret = gpio_twl4030_debounce(pdata->debounce, pdata->mmc_cd);
-        if (ret)
-                dev_dbg(&pdev->dev, "debounce %.03x %.01x --> %d\n",
-                                pdata->debounce, pdata->mmc_cd,
-                                ret);
-
-        twl_gpiochip.base = pdata->gpio_base;
+        twl_gpiochip.base = -1;
         twl_gpiochip.ngpio = TWL4030_GPIO_MAX;
         twl_gpiochip.dev = &pdev->dev;
 
-        /* NOTE: we assume VIBRA_CTL.VIBRA_EN, in MODULE_AUDIO_VOICE,
-         * is (still) clear if use_leds is set.
-         */
-        if (pdata->use_leds)
-                twl_gpiochip.ngpio += 2;
+        if (pdata) {
+                twl_gpiochip.base = pdata->gpio_base;
+
+                /*
+                 * NOTE:  boards may waste power if they don't set pullups
+                 * and pulldowns correctly ... default for non-ULPI pins is
+                 * pulldown, and some other pins may have external pullups
+                 * or pulldowns.  Careful!
+                 */
+                ret = gpio_twl4030_pulls(pdata->pullups, pdata->pulldowns);
+                if (ret)
+                        dev_dbg(&pdev->dev, "pullups %.05x %.05x --> %d\n",
+                                        pdata->pullups, pdata->pulldowns,
+                                        ret);
+
+                ret = gpio_twl4030_debounce(pdata->debounce, pdata->mmc_cd);
+                if (ret)
+                        dev_dbg(&pdev->dev, "debounce %.03x %.01x --> %d\n",
+                                        pdata->debounce, pdata->mmc_cd,
+                                        ret);
+
+                /*
+                 * NOTE: we assume VIBRA_CTL.VIBRA_EN, in MODULE_AUDIO_VOICE,
+                 * is (still) clear if use_leds is set.
+                 */
+                if (pdata->use_leds)
+                        twl_gpiochip.ngpio += 2;
+        }
 
         ret = gpiochip_add(&twl_gpiochip);
         if (ret < 0) {
-                dev_err(&pdev->dev,
-                                "could not register gpiochip, %d\n",
-                                ret);
+                dev_err(&pdev->dev, "could not register gpiochip, %d\n", ret);
                 twl_gpiochip.ngpio = 0;
                 gpio_twl4030_remove(pdev);
-        } else if (pdata->setup) {
+        } else if (pdata && pdata->setup) {
                 int status;
 
                 status = pdata->setup(&pdev->dev,
@@ -465,7 +479,7 @@ static int gpio_twl4030_remove(struct platform_device *pdev)
         struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
         int status;
 
-        if (pdata->teardown) {
+        if (pdata && pdata->teardown) {
                 status = pdata->teardown(&pdev->dev,
                                 pdata->gpio_base, TWL4030_GPIO_MAX);
                 if (status) {
@@ -486,12 +500,21 @@ static int gpio_twl4030_remove(struct platform_device *pdev)
         return -EIO;
 }
 
+static const struct of_device_id twl_gpio_match[] = {
+        { .compatible = "ti,twl4030-gpio", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, twl_gpio_match);
+
 /* Note:  this hardware lives inside an I2C-based multi-function device. */
 MODULE_ALIAS("platform:twl4030_gpio");
 
 static struct platform_driver gpio_twl4030_driver = {
-        .driver.name    = "twl4030_gpio",
-        .driver.owner   = THIS_MODULE,
+        .driver = {
+                .name   = "twl4030_gpio",
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(twl_gpio_match),
+        },
         .probe          = gpio_twl4030_probe,
         .remove         = gpio_twl4030_remove,
 };