diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-04 11:35:03 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 06:38:39 -0500 |
| commit | 897dcded6fb6565f4d1c22a55d21f135403db132 (patch) | |
| tree | da9c4028ed49a1482445131760b4fc45c6524abe /arch/arm/mach-omap2/clock.c | |
| parent | 548d849574847b788fe846fe21a41386063be161 (diff) | |
[ARM] omap: provide a NULL clock operations structure
... and use it for clocks which are ALWAYS_ENABLED. These clocks
use a non-NULL enable_reg pointer for other purposes (such as
selecting clock rates.)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index d3213f565d5f..fa99c0b71d3f 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
| @@ -271,7 +271,7 @@ int _omap2_clk_enable(struct clk *clk) | |||
| 271 | { | 271 | { |
| 272 | u32 regval32; | 272 | u32 regval32; |
| 273 | 273 | ||
| 274 | if (clk->flags & (ALWAYS_ENABLED | PARENT_CONTROLS_CLOCK)) | 274 | if (clk->flags & PARENT_CONTROLS_CLOCK) |
| 275 | return 0; | 275 | return 0; |
| 276 | 276 | ||
| 277 | if (clk->ops && clk->ops->enable) | 277 | if (clk->ops && clk->ops->enable) |
| @@ -301,7 +301,7 @@ void _omap2_clk_disable(struct clk *clk) | |||
| 301 | { | 301 | { |
| 302 | u32 regval32; | 302 | u32 regval32; |
| 303 | 303 | ||
| 304 | if (clk->flags & (ALWAYS_ENABLED | PARENT_CONTROLS_CLOCK)) | 304 | if (clk->flags & PARENT_CONTROLS_CLOCK) |
| 305 | return; | 305 | return; |
| 306 | 306 | ||
| 307 | if (clk->ops && clk->ops->disable) { | 307 | if (clk->ops && clk->ops->disable) { |