diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2009-09-30 11:48:03 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-11-25 13:21:30 -0500 |
commit | 789a785ee4351a0b425d1b3702d40aeb71745ff3 (patch) | |
tree | 0ac26280bcbd162c94d53e568f1c3c404474e0f4 /arch/arm/mach-davinci/da850.c | |
parent | a9eb1f675c3363a174a424f7834e768d17cd20e5 (diff) |
davinci: DA8xx: rename 'psc_ctlr' field into 'gpsc'
Replace badly chosen 'psc_ctlr' name of the 'struct clk' field (PSC already
means "Power and Sleep Controller", so the '_ctlr' postfix makes the name
tautological) with technically correct 'gpsc' (Global PSC -- which contains
all the module registers).
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/da850.c')
-rw-r--r-- | arch/arm/mach-davinci/da850.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 0e1027ea8a40..1d6d8b42a624 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c | |||
@@ -224,16 +224,16 @@ static struct clk tpcc1_clk = { | |||
224 | .name = "tpcc1", | 224 | .name = "tpcc1", |
225 | .parent = &pll0_sysclk2, | 225 | .parent = &pll0_sysclk2, |
226 | .lpsc = DA850_LPSC1_TPCC1, | 226 | .lpsc = DA850_LPSC1_TPCC1, |
227 | .gpsc = 1, | ||
227 | .flags = CLK_PSC | ALWAYS_ENABLED, | 228 | .flags = CLK_PSC | ALWAYS_ENABLED, |
228 | .psc_ctlr = 1, | ||
229 | }; | 229 | }; |
230 | 230 | ||
231 | static struct clk tptc2_clk = { | 231 | static struct clk tptc2_clk = { |
232 | .name = "tptc2", | 232 | .name = "tptc2", |
233 | .parent = &pll0_sysclk2, | 233 | .parent = &pll0_sysclk2, |
234 | .lpsc = DA850_LPSC1_TPTC2, | 234 | .lpsc = DA850_LPSC1_TPTC2, |
235 | .gpsc = 1, | ||
235 | .flags = ALWAYS_ENABLED, | 236 | .flags = ALWAYS_ENABLED, |
236 | .psc_ctlr = 1, | ||
237 | }; | 237 | }; |
238 | 238 | ||
239 | static struct clk uart0_clk = { | 239 | static struct clk uart0_clk = { |
@@ -246,16 +246,16 @@ static struct clk uart1_clk = { | |||
246 | .name = "uart1", | 246 | .name = "uart1", |
247 | .parent = &pll0_sysclk2, | 247 | .parent = &pll0_sysclk2, |
248 | .lpsc = DA8XX_LPSC1_UART1, | 248 | .lpsc = DA8XX_LPSC1_UART1, |
249 | .gpsc = 1, | ||
249 | .flags = DA850_CLK_ASYNC3, | 250 | .flags = DA850_CLK_ASYNC3, |
250 | .psc_ctlr = 1, | ||
251 | }; | 251 | }; |
252 | 252 | ||
253 | static struct clk uart2_clk = { | 253 | static struct clk uart2_clk = { |
254 | .name = "uart2", | 254 | .name = "uart2", |
255 | .parent = &pll0_sysclk2, | 255 | .parent = &pll0_sysclk2, |
256 | .lpsc = DA8XX_LPSC1_UART2, | 256 | .lpsc = DA8XX_LPSC1_UART2, |
257 | .gpsc = 1, | ||
257 | .flags = DA850_CLK_ASYNC3, | 258 | .flags = DA850_CLK_ASYNC3, |
258 | .psc_ctlr = 1, | ||
259 | }; | 259 | }; |
260 | 260 | ||
261 | static struct clk aintc_clk = { | 261 | static struct clk aintc_clk = { |
@@ -269,22 +269,22 @@ static struct clk gpio_clk = { | |||
269 | .name = "gpio", | 269 | .name = "gpio", |
270 | .parent = &pll0_sysclk4, | 270 | .parent = &pll0_sysclk4, |
271 | .lpsc = DA8XX_LPSC1_GPIO, | 271 | .lpsc = DA8XX_LPSC1_GPIO, |
272 | .psc_ctlr = 1, | 272 | .gpsc = 1, |
273 | }; | 273 | }; |
274 | 274 | ||
275 | static struct clk i2c1_clk = { | 275 | static struct clk i2c1_clk = { |
276 | .name = "i2c1", | 276 | .name = "i2c1", |
277 | .parent = &pll0_sysclk4, | 277 | .parent = &pll0_sysclk4, |
278 | .lpsc = DA8XX_LPSC1_I2C, | 278 | .lpsc = DA8XX_LPSC1_I2C, |
279 | .psc_ctlr = 1, | 279 | .gpsc = 1, |
280 | }; | 280 | }; |
281 | 281 | ||
282 | static struct clk emif3_clk = { | 282 | static struct clk emif3_clk = { |
283 | .name = "emif3", | 283 | .name = "emif3", |
284 | .parent = &pll0_sysclk5, | 284 | .parent = &pll0_sysclk5, |
285 | .lpsc = DA8XX_LPSC1_EMIF3C, | 285 | .lpsc = DA8XX_LPSC1_EMIF3C, |
286 | .gpsc = 1, | ||
286 | .flags = ALWAYS_ENABLED, | 287 | .flags = ALWAYS_ENABLED, |
287 | .psc_ctlr = 1, | ||
288 | }; | 288 | }; |
289 | 289 | ||
290 | static struct clk arm_clk = { | 290 | static struct clk arm_clk = { |
@@ -305,21 +305,21 @@ static struct clk emac_clk = { | |||
305 | .name = "emac", | 305 | .name = "emac", |
306 | .parent = &pll0_sysclk4, | 306 | .parent = &pll0_sysclk4, |
307 | .lpsc = DA8XX_LPSC1_CPGMAC, | 307 | .lpsc = DA8XX_LPSC1_CPGMAC, |
308 | .psc_ctlr = 1, | 308 | .gpsc = 1, |
309 | }; | 309 | }; |
310 | 310 | ||
311 | static struct clk mcasp_clk = { | 311 | static struct clk mcasp_clk = { |
312 | .name = "mcasp", | 312 | .name = "mcasp", |
313 | .parent = &pll0_sysclk2, | 313 | .parent = &pll0_sysclk2, |
314 | .lpsc = DA8XX_LPSC1_McASP0, | 314 | .lpsc = DA8XX_LPSC1_McASP0, |
315 | .psc_ctlr = 1, | 315 | .gpsc = 1, |
316 | }; | 316 | }; |
317 | 317 | ||
318 | static struct clk lcdc_clk = { | 318 | static struct clk lcdc_clk = { |
319 | .name = "lcdc", | 319 | .name = "lcdc", |
320 | .parent = &pll0_sysclk2, | 320 | .parent = &pll0_sysclk2, |
321 | .lpsc = DA8XX_LPSC1_LCDC, | 321 | .lpsc = DA8XX_LPSC1_LCDC, |
322 | .psc_ctlr = 1, | 322 | .gpsc = 1, |
323 | }; | 323 | }; |
324 | 324 | ||
325 | static struct clk mmcsd_clk = { | 325 | static struct clk mmcsd_clk = { |