summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs/system.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-04-28 20:02:40 +0400
committerShawn Guo <shawn.guo@linaro.org>2012-05-08 20:02:42 +0400
commit5da301a2056529cc5366f21d4325b96052d9cad1 (patch)
tree9a5302e5318f4f0ec7408ab7cac1a33aa15fc62e /arch/arm/mach-mxs/system.c
parent2664681fa4101aef2bceb81bbe26a81a88131393 (diff)
downloadlinux-5da301a2056529cc5366f21d4325b96052d9cad1.tar.xz
ARM: mxs: remove old clock support
The mxs clock has been switched to common clock framework, so the old clock support can be removed now. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/system.c')
-rw-r--r--arch/arm/mach-mxs/system.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-mxs/system.c b/arch/arm/mach-mxs/system.c
index 80ac1fca8a00..30042e23bfa7 100644
--- a/arch/arm/mach-mxs/system.c
+++ b/arch/arm/mach-mxs/system.c
@@ -37,8 +37,6 @@
#define MXS_MODULE_CLKGATE (1 << 30)
#define MXS_MODULE_SFTRST (1 << 31)
-#define CLKCTRL_TIMEOUT 10 /* 10 ms */
-
static void __iomem *mxs_clkctrl_reset_addr;
/*
@@ -139,17 +137,3 @@ error:
return -ETIMEDOUT;
}
EXPORT_SYMBOL(mxs_reset_block);
-
-int mxs_clkctrl_timeout(unsigned int reg_offset, unsigned int mask)
-{
- unsigned long timeout = jiffies + msecs_to_jiffies(CLKCTRL_TIMEOUT);
- while (readl_relaxed(MXS_IO_ADDRESS(MXS_CLKCTRL_BASE_ADDR)
- + reg_offset) & mask) {
- if (time_after(jiffies, timeout)) {
- pr_err("Timeout at CLKCTRL + 0x%x\n", reg_offset);
- return -ETIMEDOUT;
- }
- }
-
- return 0;
-}