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, 25 insertions, 16 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);