From: peter.chen@freescale.com (Peter Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] arm: mach-imx: Move anatop related from board file to anatop driver
Date: Mon, 12 Aug 2013 15:26:53 +0800 [thread overview]
Message-ID: <1376292414-22922-1-git-send-email-peter.chen@freescale.com> (raw)
Move anatop related (For USB) from board file to anatop driver
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
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 f7efabe..71f1a08 100644
--- a/arch/arm/mach-imx/anatop.c
+++ b/arch/arm/mach-imx/anatop.c
@@ -115,7 +115,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
@@ -157,4 +157,6 @@ void __init imx_anatop_init(void)
*/
imx_anatop_pu_enable(true);
imx_gpc_xpu_enable();
+
+ imx_anatop_usb_chrg_detect_disable();
}
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index 558e95f..df1d7b0 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -136,7 +136,6 @@ extern void imx_gpc_xpu_enable(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 e04abe9..846731d 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -185,10 +185,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)
{
@@ -198,7 +194,6 @@ static void __init imx6q_init_machine(void)
imx_anatop_init();
imx6q_pm_init();
- imx6q_usb_init();
imx6q_1588_init();
}
--
1.7.1
next reply other threads:[~2013-08-12 7:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-12 7:26 Peter Chen [this message]
2013-08-12 7:26 ` [PATCH 2/2] arm: mach-imx: anatop: add two APIs for USB driver Peter Chen
2013-08-14 3:47 ` Shawn Guo
2013-08-14 3:50 ` Peter Chen
2013-08-14 6:32 ` Shawn Guo
2013-08-14 4:51 ` Peter Chen
2013-08-14 3:46 ` [PATCH 1/2] arm: mach-imx: Move anatop related from board file to anatop driver Shawn Guo
2013-08-14 3:53 ` Peter Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376292414-22922-1-git-send-email-peter.chen@freescale.com \
--to=peter.chen@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).