From 43c717a6c1fdb7cd7cfb2646cb551769ab2dae86 Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Wed, 14 Aug 2013 11:40:56 +0800 Subject: [PATCH] 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 Signed-off-by: Shawn Guo --- arch/arm/mach-imx/anatop.c | 4 +++- arch/arm/mach-imx/common.h | 1 - arch/arm/mach-imx/mach-imx6q.c | 5 ----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c index ad42a0647156..4a40bbb46183 100644 --- a/arch/arm/mach-imx/anatop.c +++ b/arch/arm/mach-imx/anatop.c @@ -68,7 +68,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 @@ -119,4 +119,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 36c71e43604d..310867dbca88 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -143,7 +143,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 int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); extern void imx6q_set_cache_lpm_in_wait(bool enable); diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 2587e3e80241..e1e334380534 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -167,10 +167,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(); -} /* * Disable Hannstar LVDS panel CABC function. @@ -218,7 +214,6 @@ static void __init imx6q_init_machine(void) imx_anatop_init(); imx6q_pm_init(); - imx6q_usb_init(); imx6q_1588_init(); imx6q_lvds_cabc_init(); } -- 2.39.5