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

Pull MFD bits from Samuel Ortiz:
 "We have support for a few new drivers:
   - Samsung s2mps11
   - Wolfson Microelectronics wm5102 and wm5110
   - Marvell 88PM800 and 88PM805
   - TI twl6041

  We also have our regular driver improvements:
   - Device tree and IRQ domain support for STE AB8500
   - Regmap and devm_* API conversion for TI tps6586x
   - Device tree support for Samsung max77686
   - devm_* API conversion for STE AB3100

  Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
  tps65090, da9052 and twl-core."

Fix up mostly trivial conflicts, with the exception of
drivers/usb/host/ehci-omap.c in particular, which had some
re-organization of the reset sequence (commit 1a49e2ac9651: "EHCI:
centralize controller initialization") that clashed with commit
2761a6394516 ("mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix
issues").

In particular, commit 2761a6394516 moved the usb_add_hcd() to the
*middle* of the reset sequence, which clashes fairly badly with the
reset sequence re-organization (although it could have been done inside
the new omap_ehci_init() function).

I left that part of commit 2761a6394516 just undone.

* tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (110 commits)
  mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core
  mfd: Arizone core should select MFD_CORE
  mfd: Fix arizona-irq.c build by selecting REGMAP_IRQ
  mfd: Add debug trace on entering and leaving arizone runtime suspend
  mfd: Correct tps65090 cell names
  mfd: Remove gpio support from tps6586x core driver
  ARM: tegra: defconfig: Enable tps6586x gpio
  gpio: tps6586x: Add gpio support through platform driver
  mfd: Cache tps6586x register through regmap
  mfd: Use regmap for tps6586x register access.
  mfd: Use devm managed resources for tps6586x
  input: Add onkey support for 88PM80X PMIC
  mfd: Add support for twl6041
  mfd: Fix twl6040 revision information
  mfd: Matches should be NULL when populate anatop child devices
  input: ab8500-ponkey: Create AB8500 domain IRQ mapping
  mfd: Add missing out of memory check for pcf50633
  Documentation: Describe the AB8500 Device Tree bindings
  mfd: Add tps65910 32-kHz-crystal-input init
  mfd: Drop modifying mc13xxx driver's id_table in probe
  ...

2 files changed, 19 insertions, 12 deletions

diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index 16716356d1fe..e175c8ed4ec4 100644
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -33,7 +33,7 @@ config EXTCON_MAX77693
 
 config EXTCON_MAX8997
         tristate "MAX8997 EXTCON Support"
-        depends on MFD_MAX8997
+        depends on MFD_MAX8997 && IRQ_DOMAIN
         help
           If you say yes here you get support for the MUIC device of
           Maxim MAX8997 PMIC. The MAX8997 MUIC is a USB port accessory
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index a4ed30bd9a41..ef9090a4271d 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -26,6 +26,7 @@
 #include <linux/mfd/max8997.h>
 #include <linux/mfd/max8997-private.h>
 #include <linux/extcon.h>
+#include <linux/irqdomain.h>
 
 #define DEV_NAME                        "max8997-muic"
 
@@ -77,6 +78,7 @@
 struct max8997_muic_irq {
         unsigned int irq;
         const char *name;
+        unsigned int virq;
 };
 
 static struct max8997_muic_irq muic_irqs[] = {
@@ -343,12 +345,10 @@ static void max8997_muic_irq_work(struct work_struct *work)
 {
         struct max8997_muic_info *info = container_of(work,
                         struct max8997_muic_info, irq_work);
-        struct max8997_dev *max8997 = i2c_get_clientdata(info->muic);
         u8 status[2];
         u8 adc, chg_type;
-
-        int irq_type = info->irq - max8997->irq_base;
-        int ret;
+        int irq_type = 0;
+        int i, ret;
 
         mutex_lock(&info->mutex);
 
@@ -363,6 +363,10 @@ static void max8997_muic_irq_work(struct work_struct *work)
         dev_dbg(info->dev, "%s: STATUS1:0x%x, 2:0x%x\n", __func__,
                         status[0], status[1]);
 
+        for (i = 0 ; i < ARRAY_SIZE(muic_irqs) ; i++)
+                if (info->irq == muic_irqs[i].virq)
+                        irq_type = muic_irqs[i].irq;
+
         switch (irq_type) {
         case MAX8997_MUICIRQ_ADC:
                 adc = status[0] & STATUS1_ADC_MASK;
@@ -448,11 +452,15 @@ static int __devinit max8997_muic_probe(struct platform_device *pdev)
 
         for (i = 0; i < ARRAY_SIZE(muic_irqs); i++) {
                 struct max8997_muic_irq *muic_irq = &muic_irqs[i];
+                int virq = 0;
+
+                virq = irq_create_mapping(max8997->irq_domain, muic_irq->irq);
+                if (!virq)
+                        goto err_irq;
+                muic_irq->virq = virq;
 
-                ret = request_threaded_irq(pdata->irq_base + muic_irq->irq,
-                                NULL, max8997_muic_irq_handler,
-                                0, muic_irq->name,
-                                info);
+                ret = request_threaded_irq(virq, NULL,max8997_muic_irq_handler,
+                                0, muic_irq->name, info);
                 if (ret) {
                         dev_err(&pdev->dev,
                                 "failed: irq request (IRQ: %d,"
@@ -496,7 +504,7 @@ err_extcon:
         kfree(info->edev);
 err_irq:
         while (--i >= 0)
-                free_irq(pdata->irq_base + muic_irqs[i].irq, info);
+                free_irq(muic_irqs[i].virq, info);
         kfree(info);
 err_kfree:
         return ret;
@@ -505,11 +513,10 @@ err_kfree:
 static int __devexit max8997_muic_remove(struct platform_device *pdev)
 {
         struct max8997_muic_info *info = platform_get_drvdata(pdev);
-        struct max8997_dev *max8997 = i2c_get_clientdata(info->muic);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(muic_irqs); i++)
-                free_irq(max8997->irq_base + muic_irqs[i].irq, info);
+                free_irq(muic_irqs[i].virq, info);
         cancel_work_sync(&info->irq_work);
 
         extcon_dev_unregister(info->edev);