ARM: imx: Move anatop related from board file to anatop driver

Move anatop related (For USB) from board file to anatop driver

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c
index 0cfa07dd9aa422aa6a5cb1b245dd3a07c4d4498d..ad3b755abb78a949d1b379757a11725a983f2d3b 100644 (file)
--- a/arch/arm/mach-imx/anatop.c
+++ b/arch/arm/mach-imx/anatop.c
@@ -66,7 +66,7 @@ void imx_anatop_post_resume(void)
        imx_anatop_enable_weak2p5(false);
 }
 
-void imx_anatop_usb_chrg_detect_disable(void)
+static void imx_anatop_usb_chrg_detect_disable(void)
 {
        regmap_write(anatop, ANADIG_USB1_CHRG_DETECT,
                BM_ANADIG_USB_CHRG_DETECT_EN_B
@@ -100,4 +100,6 @@ void __init imx_anatop_init(void)
                pr_err("%s: failed to find imx6q-anatop regmap!\n", __func__);
                return;
        }
+
+       imx_anatop_usb_chrg_detect_disable();
 }

diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index cdc9288ac48ac0db3e58241861e7dc6fecc023f3..4517fd760bfc6d0c55a160f7fa22f8f3e1ae778c 100644 (file)
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -137,7 +137,6 @@ extern void imx_gpc_restore_all(void);
 extern void imx_anatop_init(void);
 extern void imx_anatop_pre_suspend(void);
 extern void imx_anatop_post_resume(void);
-extern void imx_anatop_usb_chrg_detect_disable(void);
 extern u32 imx_anatop_get_digprog(void);
 extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
 extern void imx6q_set_chicken_bit(void);

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 9f06cc8789c6b4aca93052f200c1068598783732..c730af673085bb3b75e38a2da9b573a7f37b1fc9 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -249,10 +249,6 @@ static void __init imx6q_1588_init(void)
                pr_err("failed to find fsl,imx6q-iomux-gpr regmap\n");
 
 }
-static void __init imx6q_usb_init(void)
-{
-       imx_anatop_usb_chrg_detect_disable();
-}
 
 static void __init imx6q_init_machine(void)
 {
@@ -268,7 +264,6 @@ static void __init imx6q_init_machine(void)
 
        imx_anatop_init();
        imx6q_pm_init();
-       imx6q_usb_init();
        imx6q_1588_init();
 }