regulator: anatop-regulator: Convert to use syscon to access anatop register

Using syscon to access anatop register.

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

3 files changed, 21 insertions, 32 deletions

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index bea21bc1aad..52ed4d1ff4e 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -378,8 +378,8 @@
                                 interrupts = <0 87 0x04 0 88 0x04>;
                         };
 
-                        anatop@020c8000 {
-                                compatible = "fsl,imx6q-anatop";
+                        anatop: anatop@020c8000 {
+                                compatible = "fsl,imx6q-anatop", "syscon", "simple-bus";
                                 reg = <0x020c8000 0x1000>;
                                 interrupts = <0 49 0x04 0 54 0x04 0 127 0x04>;
 
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index afd542ad6f9..7bba253fd2b 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -839,7 +839,7 @@ config SOC_IMX6Q
         select HAVE_IMX_MMDC
         select HAVE_IMX_SRC
         select HAVE_SMP
-        select MFD_ANATOP
+        select MFD_SYSCON
         select PINCTRL
         select PINCTRL_IMX6Q
 
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 5ec0608f2a7..8d7c1414074 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -24,8 +24,9 @@
 #include <linux/of_platform.h>
 #include <linux/pinctrl/machine.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>
@@ -120,20 +121,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
@@ -141,20 +129,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)