diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-02-23 00:09:26 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-02-24 14:29:43 -0500 |
commit | 51c19541624f5588bccb9d4fb3ae518c68c8082e (patch) | |
tree | 60f7b3df59806eea7ff7bbf691bb69f8791d5cc1 /arch/arm/mach-omap2/clock2420_data.c | |
parent | 8c34974ab0ecbbcdabd343f8cd0013cd2d2b0fa8 (diff) |
OMAP clock: drop RATE_FIXED clock flag
The RATE_FIXED clock flag is pointless. In the OMAP1 clock code, it
simply causes the omap1_clk_round_rate() function to return the
current rate of the clock. omap1_clk_round_rate(), however, should
never be called for a fixed-rate clock, since none of these clocks
have a .round_rate function pointer set in their struct clk records.
Similarly, in the OMAP2+ clock code, the RATE_FIXED flag just causes
the clock code to emit a warning if the OMAP clock maintainer was
foolish enough to add a .round_rate function pointer to a fixed-rate
clock. "Doctor, it hurts when I pretend that a fixed-rate clock is
rate-changeable." "Then don't pretend that a fixed-rate clock is
rate-changeable." It has no functional value. This patch drops the
RATE_FIXED clock flag, removing it from all clocks that are so marked.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Richard Woodruff <r-woodruff2@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock2420_data.c')
-rw-r--r-- | arch/arm/mach-omap2/clock2420_data.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index d5913f01e5d6..f12af95ead45 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c | |||
@@ -55,7 +55,6 @@ static struct clk func_32k_ck = { | |||
55 | .name = "func_32k_ck", | 55 | .name = "func_32k_ck", |
56 | .ops = &clkops_null, | 56 | .ops = &clkops_null, |
57 | .rate = 32000, | 57 | .rate = 32000, |
58 | .flags = RATE_FIXED, | ||
59 | .clkdm_name = "wkup_clkdm", | 58 | .clkdm_name = "wkup_clkdm", |
60 | }; | 59 | }; |
61 | 60 | ||
@@ -63,7 +62,6 @@ static struct clk secure_32k_ck = { | |||
63 | .name = "secure_32k_ck", | 62 | .name = "secure_32k_ck", |
64 | .ops = &clkops_null, | 63 | .ops = &clkops_null, |
65 | .rate = 32768, | 64 | .rate = 32768, |
66 | .flags = RATE_FIXED, | ||
67 | .clkdm_name = "wkup_clkdm", | 65 | .clkdm_name = "wkup_clkdm", |
68 | }; | 66 | }; |
69 | 67 | ||
@@ -88,7 +86,6 @@ static struct clk alt_ck = { /* Typical 54M or 48M, may not exist */ | |||
88 | .name = "alt_ck", | 86 | .name = "alt_ck", |
89 | .ops = &clkops_null, | 87 | .ops = &clkops_null, |
90 | .rate = 54000000, | 88 | .rate = 54000000, |
91 | .flags = RATE_FIXED, | ||
92 | .clkdm_name = "wkup_clkdm", | 89 | .clkdm_name = "wkup_clkdm", |
93 | }; | 90 | }; |
94 | 91 | ||
@@ -134,7 +131,7 @@ static struct clk apll96_ck = { | |||
134 | .ops = &clkops_apll96, | 131 | .ops = &clkops_apll96, |
135 | .parent = &sys_ck, | 132 | .parent = &sys_ck, |
136 | .rate = 96000000, | 133 | .rate = 96000000, |
137 | .flags = RATE_FIXED | ENABLE_ON_INIT, | 134 | .flags = ENABLE_ON_INIT, |
138 | .clkdm_name = "wkup_clkdm", | 135 | .clkdm_name = "wkup_clkdm", |
139 | .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), | 136 | .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), |
140 | .enable_bit = OMAP24XX_EN_96M_PLL_SHIFT, | 137 | .enable_bit = OMAP24XX_EN_96M_PLL_SHIFT, |
@@ -145,7 +142,7 @@ static struct clk apll54_ck = { | |||
145 | .ops = &clkops_apll54, | 142 | .ops = &clkops_apll54, |
146 | .parent = &sys_ck, | 143 | .parent = &sys_ck, |
147 | .rate = 54000000, | 144 | .rate = 54000000, |
148 | .flags = RATE_FIXED | ENABLE_ON_INIT, | 145 | .flags = ENABLE_ON_INIT, |
149 | .clkdm_name = "wkup_clkdm", | 146 | .clkdm_name = "wkup_clkdm", |
150 | .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), | 147 | .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), |
151 | .enable_bit = OMAP24XX_EN_54M_PLL_SHIFT, | 148 | .enable_bit = OMAP24XX_EN_54M_PLL_SHIFT, |