aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-19 10:51:11 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 12:50:15 -0500
commit44dc9d027f1cb56625b1011d8725d2ab614c04e6 (patch)
tree582577d2bae2c613d63147a935688186c900b624 /arch/arm/plat-omap
parent8ad8ff6548f1c0bcbeaa02f274b3927c5015a921 (diff)
[ARM] omap: convert OMAP3 to use clkdev
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/Kconfig1
-rw-r--r--arch/arm/plat-omap/include/mach/clock.h5
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 90372131055b..e25e1ac64fc1 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -21,6 +21,7 @@ config ARCH_OMAP2
21config ARCH_OMAP3 21config ARCH_OMAP3
22 bool "TI OMAP3" 22 bool "TI OMAP3"
23 select CPU_V7 23 select CPU_V7
24 select COMMON_CLKDEV
24 25
25endchoice 26endchoice
26 27
diff --git a/arch/arm/plat-omap/include/mach/clock.h b/arch/arm/plat-omap/include/mach/clock.h
index 214dc46d6ad1..3895ba729792 100644
--- a/arch/arm/plat-omap/include/mach/clock.h
+++ b/arch/arm/plat-omap/include/mach/clock.h
@@ -136,10 +136,7 @@ extern const struct clkops clkops_null;
136#define CONFIG_PARTICIPANT (1 << 10) /* Fundamental clock */ 136#define CONFIG_PARTICIPANT (1 << 10) /* Fundamental clock */
137#define ENABLE_ON_INIT (1 << 11) /* Enable upon framework init */ 137#define ENABLE_ON_INIT (1 << 11) /* Enable upon framework init */
138#define INVERT_ENABLE (1 << 12) /* 0 enables, 1 disables */ 138#define INVERT_ENABLE (1 << 12) /* 0 enables, 1 disables */
139/* bits 13-26 are currently free */ 139/* bits 13-31 are currently free */
140#define CLOCK_IN_OMAP343X (1 << 27) /* clocks common to all 343X */
141#define CLOCK_IN_OMAP3430ES1 (1 << 29) /* 3430ES1 clocks only */
142#define CLOCK_IN_OMAP3430ES2 (1 << 30) /* 3430ES2 clocks only */
143 140
144/* Clksel_rate flags */ 141/* Clksel_rate flags */
145#define DEFAULT_RATE (1 << 0) 142#define DEFAULT_RATE (1 << 0)