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

1 files changed, 18 insertions, 29 deletions

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 36979d3dfe34..47c91f7185d2 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -23,8 +23,9 @@
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/phy.h>
+#include <linux/regmap.h>
 #include <linux/micrel_phy.h>
-#include <linux/mfd/anatop.h>
+#include <linux/mfd/syscon.h>
 #include <asm/cpuidle.h>
 #include <asm/smp_twd.h>
 #include <asm/hardware/cache-l2x0.h>
@@ -118,20 +119,7 @@ static void __init imx6q_sabrelite_init(void)
 
 static void __init imx6q_usb_init(void)
 {
-        struct device_node *np;
-        struct platform_device *pdev = NULL;
-        struct anatop *adata = NULL;
-
-        np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop");
-        if (np)
-                pdev = of_find_device_by_node(np);
-        if (pdev)
-                adata = platform_get_drvdata(pdev);
-        if (!adata) {
-                if (np)
-                        of_node_put(np);
-                return;
-        }
+        struct regmap *anatop;
 
 #define HW_ANADIG_USB1_CHRG_DETECT              0x000001b0
 #define HW_ANADIG_USB2_CHRG_DETECT              0x00000210
@@ -139,20 +127,21 @@ static void __init imx6q_usb_init(void)
 #define BM_ANADIG_USB_CHRG_DETECT_EN_B          0x00100000
 #define BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B    0x00080000
 
-        /*
-         * The external charger detector needs to be disabled,
-         * or the signal at DP will be poor
-         */
-        anatop_write_reg(adata, HW_ANADIG_USB1_CHRG_DETECT,
-                        BM_ANADIG_USB_CHRG_DETECT_EN_B
-                        | BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B,
-                        ~0);
-        anatop_write_reg(adata, HW_ANADIG_USB2_CHRG_DETECT,
-                        BM_ANADIG_USB_CHRG_DETECT_EN_B |
-                        BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B,
-                        ~0);
-
-        of_node_put(np);
+        anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop");
+        if (!IS_ERR(anatop)) {
+                /*
+                 * The external charger detector needs to be disabled,
+                 * or the signal at DP will be poor
+                 */
+                regmap_write(anatop, HW_ANADIG_USB1_CHRG_DETECT,
+                                BM_ANADIG_USB_CHRG_DETECT_EN_B
+                                | BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B);
+                regmap_write(anatop, HW_ANADIG_USB2_CHRG_DETECT,
+                                BM_ANADIG_USB_CHRG_DETECT_EN_B |
+                                BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B);
+        } else {
+                pr_warn("failed to find fsl,imx6q-anatop regmap\n");
+        }
 }
 
 static void __init imx6q_init_machine(void)