aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2010-02-23 00:09:24 -0500
committerPaul Walmsley <paul@pwsan.com>2010-02-24 14:29:42 -0500
commit8c34974ab0ecbbcdabd343f8cd0013cd2d2b0fa8 (patch)
tree5d64fc187d5dcee6d82c20f09f4b1a6ff2abef5c /arch/arm/plat-omap
parent5173804fbbbff82a2fd40bc1c46655b272167af5 (diff)
OMAP2 clock: drop DELAYED_APP clock flag
All of the clocks that are marked with DELAYED_APP are changed as part of the virt_prcm_set OPP virtual clock. On 24xx, these clocks all need to be changed as part of a group to keep the clock tree functional - hence the need for the VALID_CONFIG bit, which is not present on later OMAPs. These clocks should not be rate-changed independently. So prevent these clocks from being changed independently by dropping their .round_rate and .set_rate function pointers. It then turns out that the DELAYED_APP clock flag is no longer useful, so drop it and the associated code and renumber the clock flags. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Richard Woodruff <r-woodruff2@ti.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/plat/clock.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/plat/clock.h b/arch/arm/plat-omap/include/plat/clock.h
index bbaba1b64a8a..91aa2c48cdde 100644
--- a/arch/arm/plat-omap/include/plat/clock.h
+++ b/arch/arm/plat-omap/include/plat/clock.h
@@ -190,10 +190,9 @@ extern const struct clkops clkops_null;
190#define ENABLE_REG_32BIT (1 << 1) /* Use 32-bit access */ 190#define ENABLE_REG_32BIT (1 << 1) /* Use 32-bit access */
191#define CLOCK_IDLE_CONTROL (1 << 2) 191#define CLOCK_IDLE_CONTROL (1 << 2)
192#define CLOCK_NO_IDLE_PARENT (1 << 3) 192#define CLOCK_NO_IDLE_PARENT (1 << 3)
193#define DELAYED_APP (1 << 4) /* Delay application of clock */ 193#define ENABLE_ON_INIT (1 << 4) /* Enable upon framework init */
194#define ENABLE_ON_INIT (1 << 5) /* Enable upon framework init */ 194#define INVERT_ENABLE (1 << 5) /* 0 enables, 1 disables */
195#define INVERT_ENABLE (1 << 6) /* 0 enables, 1 disables */ 195#define ALWAYS_ENABLED (1 << 6)
196#define ALWAYS_ENABLED (1 << 7)
197 196
198/* Clksel_rate flags */ 197/* Clksel_rate flags */
199#define DEFAULT_RATE (1 << 0) 198#define DEFAULT_RATE (1 << 0)