aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/include/asm/clock.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-05-12 05:14:53 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-05-12 05:14:53 +0900
commit4ff29ff8e8723a41e7defd8bc78a7b16cbf940a2 (patch)
tree0e277d27eee3af89e66856458dce29e6ba3f4721 /arch/sh/include/asm/clock.h
parentb1f6cfe48c3cb1dfa77db3d2f42f765febaef9bc (diff)
sh: clkfwk: Consolidate the ALWAYS_ENABLED / NEEDS_INIT mess.
There is no real distinction here in behaviour, either a clock needs to be enabled on initialiation or not. The ALWAYS_ENABLED flag was always intended to only apply to clocks that were physically always on and could simply not be disabled at all from software. Unfortunately over time this was abused and the meaning became a bit blurry. So, we kill off both of all of those paths now, as well as the newer NEEDS_INIT flag, and consolidate on a CLK_ENABLE_ON_INIT. Clocks that need to be enabled on initialization can set this, and it will purposely enable them and bump the refcount up. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/clock.h')
-rw-r--r--arch/sh/include/asm/clock.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/include/asm/clock.h b/arch/sh/include/asm/clock.h
index 5dc8b73a2bd..246f9ebbed2 100644
--- a/arch/sh/include/asm/clock.h
+++ b/arch/sh/include/asm/clock.h
@@ -37,8 +37,7 @@ struct clk {
unsigned long arch_flags;
};
-#define CLK_ALWAYS_ENABLED (1 << 0)
-#define CLK_NEEDS_INIT (1 << 2)
+#define CLK_ENABLE_ON_INIT (1 << 0)
/* Should be defined by processor-specific code */
void arch_init_clk_ops(struct clk_ops **, int type);