aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock3xxx_data.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2010-02-23 00:09:26 -0500
committerPaul Walmsley <paul@pwsan.com>2010-02-24 14:29:43 -0500
commit51c19541624f5588bccb9d4fb3ae518c68c8082e (patch)
tree60f7b3df59806eea7ff7bbf691bb69f8791d5cc1 /arch/arm/mach-omap2/clock3xxx_data.c
parent8c34974ab0ecbbcdabd343f8cd0013cd2d2b0fa8 (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/clock3xxx_data.c')
-rw-r--r--arch/arm/mach-omap2/clock3xxx_data.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index f2379029700..fd832300be3 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -64,14 +64,12 @@ static struct clk omap_32k_fck = {
64 .name = "omap_32k_fck", 64 .name = "omap_32k_fck",
65 .ops = &clkops_null, 65 .ops = &clkops_null,
66 .rate = 32768, 66 .rate = 32768,
67 .flags = RATE_FIXED,
68}; 67};
69 68
70static struct clk secure_32k_fck = { 69static struct clk secure_32k_fck = {
71 .name = "secure_32k_fck", 70 .name = "secure_32k_fck",
72 .ops = &clkops_null, 71 .ops = &clkops_null,
73 .rate = 32768, 72 .rate = 32768,
74 .flags = RATE_FIXED,
75}; 73};
76 74
77/* Virtual source clocks for osc_sys_ck */ 75/* Virtual source clocks for osc_sys_ck */
@@ -79,42 +77,36 @@ static struct clk virt_12m_ck = {
79 .name = "virt_12m_ck", 77 .name = "virt_12m_ck",
80 .ops = &clkops_null, 78 .ops = &clkops_null,
81 .rate = 12000000, 79 .rate = 12000000,
82 .flags = RATE_FIXED,
83}; 80};
84 81
85static struct clk virt_13m_ck = { 82static struct clk virt_13m_ck = {
86 .name = "virt_13m_ck", 83 .name = "virt_13m_ck",
87 .ops = &clkops_null, 84 .ops = &clkops_null,
88 .rate = 13000000, 85 .rate = 13000000,
89 .flags = RATE_FIXED,
90}; 86};
91 87
92static struct clk virt_16_8m_ck = { 88static struct clk virt_16_8m_ck = {
93 .name = "virt_16_8m_ck", 89 .name = "virt_16_8m_ck",
94 .ops = &clkops_null, 90 .ops = &clkops_null,
95 .rate = 16800000, 91 .rate = 16800000,
96 .flags = RATE_FIXED,
97}; 92};
98 93
99static struct clk virt_19_2m_ck = { 94static struct clk virt_19_2m_ck = {
100 .name = "virt_19_2m_ck", 95 .name = "virt_19_2m_ck",
101 .ops = &clkops_null, 96 .ops = &clkops_null,
102 .rate = 19200000, 97 .rate = 19200000,
103 .flags = RATE_FIXED,
104}; 98};
105 99
106static struct clk virt_26m_ck = { 100static struct clk virt_26m_ck = {
107 .name = "virt_26m_ck", 101 .name = "virt_26m_ck",
108 .ops = &clkops_null, 102 .ops = &clkops_null,
109 .rate = 26000000, 103 .rate = 26000000,
110 .flags = RATE_FIXED,
111}; 104};
112 105
113static struct clk virt_38_4m_ck = { 106static struct clk virt_38_4m_ck = {
114 .name = "virt_38_4m_ck", 107 .name = "virt_38_4m_ck",
115 .ops = &clkops_null, 108 .ops = &clkops_null,
116 .rate = 38400000, 109 .rate = 38400000,
117 .flags = RATE_FIXED,
118}; 110};
119 111
120static const struct clksel_rate osc_sys_12m_rates[] = { 112static const struct clksel_rate osc_sys_12m_rates[] = {
@@ -167,7 +159,6 @@ static struct clk osc_sys_ck = {
167 .clksel_mask = OMAP3430_SYS_CLKIN_SEL_MASK, 159 .clksel_mask = OMAP3430_SYS_CLKIN_SEL_MASK,
168 .clksel = osc_sys_clksel, 160 .clksel = osc_sys_clksel,
169 /* REVISIT: deal with autoextclkmode? */ 161 /* REVISIT: deal with autoextclkmode? */
170 .flags = RATE_FIXED,
171 .recalc = &omap2_clksel_recalc, 162 .recalc = &omap2_clksel_recalc,
172}; 163};
173 164
@@ -3168,7 +3159,6 @@ static struct clk emac_ick = {
3168static struct clk rmii_ck = { 3159static struct clk rmii_ck = {
3169 .name = "rmii_ck", 3160 .name = "rmii_ck",
3170 .ops = &clkops_null, 3161 .ops = &clkops_null,
3171 .flags = RATE_FIXED,
3172 .rate = 50000000, 3162 .rate = 50000000,
3173}; 3163};
3174 3164
@@ -3224,7 +3214,6 @@ static struct clk vpfe_ick = {
3224static struct clk pclk_ck = { 3214static struct clk pclk_ck = {
3225 .name = "pclk_ck", 3215 .name = "pclk_ck",
3226 .ops = &clkops_null, 3216 .ops = &clkops_null,
3227 .flags = RATE_FIXED,
3228 .rate = 27000000, 3217 .rate = 27000000,
3229}; 3218};
3230 3219