diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-22 06:46:49 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-11 01:30:16 -0500 |
| commit | 5fcc9297b8ca5bb65409f9963bd45dd9cfee8364 (patch) | |
| tree | 3bea953ec869724737006d155d88db78078bb6ca | |
| parent | a855039ee4b814782aebe2448d838944d2d29fcb (diff) | |
PM / devfreq: update the name of EXYNOS clock register
According to replacing the name of EXYNOS clock registers,
this patch updates exynos4_bus.c file where it is used.
Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | drivers/devfreq/exynos4_bus.c | 224 |
1 files changed, 112 insertions, 112 deletions
diff --git a/drivers/devfreq/exynos4_bus.c b/drivers/devfreq/exynos4_bus.c index 6460577d6701..565aa98a4219 100644 --- a/drivers/devfreq/exynos4_bus.c +++ b/drivers/devfreq/exynos4_bus.c | |||
| @@ -311,51 +311,51 @@ static int exynos4210_set_busclk(struct busfreq_data *data, struct opp *opp) | |||
| 311 | /* Change Divider - DMC0 */ | 311 | /* Change Divider - DMC0 */ |
| 312 | tmp = data->dmc_divtable[index]; | 312 | tmp = data->dmc_divtable[index]; |
| 313 | 313 | ||
| 314 | __raw_writel(tmp, S5P_CLKDIV_DMC0); | 314 | __raw_writel(tmp, EXYNOS4_CLKDIV_DMC0); |
| 315 | 315 | ||
| 316 | do { | 316 | do { |
| 317 | tmp = __raw_readl(S5P_CLKDIV_STAT_DMC0); | 317 | tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_DMC0); |
| 318 | } while (tmp & 0x11111111); | 318 | } while (tmp & 0x11111111); |
| 319 | 319 | ||
| 320 | /* Change Divider - TOP */ | 320 | /* Change Divider - TOP */ |
| 321 | tmp = data->top_divtable[index]; | 321 | tmp = data->top_divtable[index]; |
| 322 | 322 | ||
| 323 | __raw_writel(tmp, S5P_CLKDIV_TOP); | 323 | __raw_writel(tmp, EXYNOS4_CLKDIV_TOP); |
| 324 | 324 | ||
| 325 | do { | 325 | do { |
| 326 | tmp = __raw_readl(S5P_CLKDIV_STAT_TOP); | 326 | tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_TOP); |
| 327 | } while (tmp & 0x11111); | 327 | } while (tmp & 0x11111); |
| 328 | 328 | ||
| 329 | /* Change Divider - LEFTBUS */ | 329 | /* Change Divider - LEFTBUS */ |
| 330 | tmp = __raw_readl(S5P_CLKDIV_LEFTBUS); | 330 | tmp = __raw_readl(EXYNOS4_CLKDIV_LEFTBUS); |
| 331 | 331 | ||
| 332 | tmp &= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK); | 332 | tmp &= ~(EXYNOS4_CLKDIV_BUS_GDLR_MASK | EXYNOS4_CLKDIV_BUS_GPLR_MASK); |
| 333 | 333 | ||
| 334 | tmp |= ((exynos4210_clkdiv_lr_bus[index][0] << | 334 | tmp |= ((exynos4210_clkdiv_lr_bus[index][0] << |
| 335 | S5P_CLKDIV_BUS_GDLR_SHIFT) | | 335 | EXYNOS4_CLKDIV_BUS_GDLR_SHIFT) | |
| 336 | (exynos4210_clkdiv_lr_bus[index][1] << | 336 | (exynos4210_clkdiv_lr_bus[index][1] << |
| 337 | S5P_CLKDIV_BUS_GPLR_SHIFT)); | 337 | EXYNOS4_CLKDIV_BUS_GPLR_SHIFT)); |
| 338 | 338 | ||
| 339 | __raw_writel(tmp, S5P_CLKDIV_LEFTBUS); | 339 | __raw_writel(tmp, EXYNOS4_CLKDIV_LEFTBUS); |
| 340 | 340 | ||
| 341 | do { | 341 | do { |
| 342 | tmp = __raw_readl(S5P_CLKDIV_STAT_LEFTBUS); | 342 | tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_LEFTBUS); |
| 343 | } while (tmp & 0x11); | 343 | } while (tmp & 0x11); |
| 344 | 344 | ||
| 345 | /* Change Divider - RIGHTBUS */ | 345 | /* Change Divider - RIGHTBUS */ |
| 346 | tmp = __raw_readl(S5P_CLKDIV_RIGHTBUS); | 346 | tmp = __raw_readl(EXYNOS4_CLKDIV_RIGHTBUS); |
| 347 | 347 | ||
| 348 | tmp &= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK); | 348 | tmp &= ~(EXYNOS4_CLKDIV_BUS_GDLR_MASK | EXYNOS4_CLKDIV_BUS_GPLR_MASK); |
| 349 | 349 | ||
| 350 | tmp |= ((exynos4210_clkdiv_lr_bus[index][0] << | 350 | tmp |= ((exynos4210_clkdiv_lr_bus[index][0] << |
| 351 | S5P_CLKDIV_BUS_GDLR_SHIFT) | | 351 | EXYNOS4_CLKDIV_BUS_GDLR_SHIFT) | |
| 352 | (exynos4210_clkdiv_lr_bus[index][1] << | 352 | (exynos4210_clkdiv_lr_bus[index][1] << |
| 353 | S5P_CLKDIV_BUS_GPLR_SHIFT)); | 353 | EXYNOS4_CLKDIV_BUS_GPLR_SHIFT)); |
| 354 | 354 | ||
| 355 | __raw_writel(tmp, S5P_CLKDIV_RIGHTBUS); | 355 | __raw_writel(tmp, EXYNOS4_CLKDIV_RIGHTBUS); |
| 356 | 356 | ||
| 357 | do { | 357 | do { |
| 358 | tmp = __raw_readl(S5P_CLKDIV_STAT_RIGHTBUS); | 358 | tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_RIGHTBUS); |
| 359 | } while (tmp & 0x11); | 359 | } while (tmp & 0x11); |
| 360 | 360 | ||
| 361 | return 0; | 361 | return 0; |
| @@ -376,137 +376,137 @@ static int exynos4x12_set_busclk(struct busfreq_data *data, struct opp *opp) | |||
| 376 | /* Change Divider - DMC0 */ | 376 | /* Change Divider - DMC0 */ |
| 377 | tmp = data->dmc_divtable[index]; | 377 | tmp = data->dmc_divtable[index]; |
| 378 | 378 | ||
| 379 | __raw_writel(tmp, S5P_CLKDIV_DMC0); | 379 | __raw_writel(tmp, EXYNOS4_CLKDIV_DMC0); |
| 380 | 380 | ||
| 381 | do { | 381 | do { |
| 382 | tmp = __raw_readl(S5P_CLKDIV_STAT_DMC0); | 382 | tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_DMC0); |
| 383 | } while (tmp & 0x11111111); | 383 | } while (tmp & 0x11111111); |
| 384 | 384 | ||
| 385 | /* Change Divider - DMC1 */ | 385 | /* Change Divider - DMC1 */ |
| 386 | tmp = __raw_readl(S5P_CLKDIV_DMC1); | 386 | tmp = __raw_readl(EXYNOS4_CLKDIV_DMC1); |
| 387 | 387 | ||
| 388 | tmp &= ~(S5P_CLKDIV_DMC1_G2D_ACP_MASK | | 388 | tmp &= ~(EXYNOS4_CLKDIV_DMC1_G2D_ACP_MASK | |
| 389 | S5P_CLKDIV_DMC1_C2C_MASK | | 389 | EXYNOS4_CLKDIV_DMC1_C2C_MASK | |
| 390 | S5P_CLKDIV_DMC1_C2CACLK_MASK); | 390 | EXYNOS4_CLKDIV_DMC1_C2CACLK_MASK); |
| 391 | 391 | ||
| 392 | tmp |= ((exynos4x12_clkdiv_dmc1[index][0] << | 392 | tmp |= ((exynos4x12_clkdiv_dmc1[index][0] << |
| 393 | S5P_CLKDIV_DMC1_G2D_ACP_SHIFT) | | 393 | EXYNOS4_CLKDIV_DMC1_G2D_ACP_SHIFT) | |
| 394 | (exynos4x12_clkdiv_dmc1[index][1] << | 394 | (exynos4x12_clkdiv_dmc1[index][1] << |
| 395 | S5P_CLKDIV_DMC1_C2C_SHIFT) | | 395 | EXYNOS4_CLKDIV_DMC1_C2C_SHIFT) | |
| 396 | (exynos4x12_clkdiv_dmc1[index][2] << | 396 | (exynos4x12_clkdiv_dmc1[index][2] << |
| 397 | S5P_CLKDIV_DMC1_C2CACLK_SHIFT)); | 397 | EXYNOS4_CLKDIV_DMC1_C2CACLK_SHIFT)); |
| 398 | 398 | ||
| 399 | __raw_writel(tmp, S5P_CLKDIV_DMC1); | 399 | __raw_writel(tmp, EXYNOS4_CLKDIV_DMC1); |
| 400 | 400 | ||
| 401 | do { | 401 | do { |
| 402 | tmp = __raw_readl(S5P_CLKDIV_STAT_DMC1); | 402 | tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_DMC1); |
| 403 | } while (tmp & 0x111111); | 403 | } while (tmp & 0x111111); |
| 404 | 404 | ||
| 405 | /* Change Divider - TOP */ | 405 | /* Change Divider - TOP */ |
| 406 | tmp = __raw_readl(S5P_CLKDIV_TOP); | 406 | tmp = __raw_readl(EXYNOS4_CLKDIV_TOP); |
| 407 | 407 | ||
| 408 | tmp &= ~(S5P_CLKDIV_TOP_ACLK266_GPS_MASK | | 408 | tmp &= ~(EXYNOS4_CLKDIV_TOP_ACLK266_GPS_MASK | |
| 409 | S5P_CLKDIV_TOP_ACLK100_MASK | | 409 | EXYNOS4_CLKDIV_TOP_ACLK100_MASK | |
| 410 | S5P_CLKDIV_TOP_ACLK160_MASK | | 410 | EXYNOS4_CLKDIV_TOP_ACLK160_MASK | |
| 411 | S5P_CLKDIV_TOP_ACLK133_MASK | | 411 | EXYNOS4_CLKDIV_TOP_ACLK133_MASK | |
| 412 | S5P_CLKDIV_TOP_ONENAND_MASK); | 412 | EXYNOS4_CLKDIV_TOP_ONENAND_MASK); |
| 413 | 413 | ||
| 414 | tmp |= ((exynos4x12_clkdiv_top[index][0] << | 414 | tmp |= ((exynos4x12_clkdiv_top[index][0] << |
| 415 | S5P_CLKDIV_TOP_ACLK266_GPS_SHIFT) | | 415 | EXYNOS4_CLKDIV_TOP_ACLK266_GPS_SHIFT) | |
| 416 | (exynos4x12_clkdiv_top[index][1] << | 416 | (exynos4x12_clkdiv_top[index][1] << |
| 417 | S5P_CLKDIV_TOP_ACLK100_SHIFT) | | 417 | EXYNOS4_CLKDIV_TOP_ACLK100_SHIFT) | |
| 418 | (exynos4x12_clkdiv_top[index][2] << | 418 | (exynos4x12_clkdiv_top[index][2] << |
| 419 | S5P_CLKDIV_TOP_ACLK160_SHIFT) | | 419 | EXYNOS4_CLKDIV_TOP_ACLK160_SHIFT) | |
| 420 | (exynos4x12_clkdiv_top[index][3] << | 420 | (exynos4x12_clkdiv_top[index][3] << |
| 421 | S5P_CLKDIV_TOP_ACLK133_SHIFT) | | 421 | EXYNOS4_CLKDIV_TOP_ACLK133_SHIFT) | |
| 422 | (exynos4x12_clkdiv_top[index][4] << | 422 | (exynos4x12_clkdiv_top[index][4] << |
| 423 | S5P_CLKDIV_TOP_ONENAND_SHIFT)); | 423 | EXYNOS4_CLKDIV_TOP_ONENAND_SHIFT)); |
| 424 | 424 | ||
| 425 | __raw_writel(tmp, S5P_CLKDIV_TOP); | 425 | __raw_writel(tmp, EXYNOS4_CLKDIV_TOP); |
| 426 | 426 | ||
| 427 | do { | 427 | do { |
| 428 | tmp = __raw_readl(S5P_CLKDIV_STAT_TOP); | 428 | tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_TOP); |
| 429 | } while (tmp & 0x11111); | 429 | } while (tmp & 0x11111); |
| 430 | 430 | ||
| 431 | /* Change Divider - LEFTBUS */ | 431 | /* Change Divider - LEFTBUS */ |
| 432 | tmp = __raw_readl(S5P_CLKDIV_LEFTBUS); | 432 | tmp = __raw_readl(EXYNOS4_CLKDIV_LEFTBUS); |
| 433 | 433 | ||
| 434 | tmp &= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK); | 434 | tmp &= ~(EXYNOS4_CLKDIV_BUS_GDLR_MASK | EXYNOS4_CLKDIV_BUS_GPLR_MASK); |
| 435 | 435 | ||
| 436 | tmp |= ((exynos4x12_clkdiv_lr_bus[index][0] << | 436 | tmp |= ((exynos4x12_clkdiv_lr_bus[index][0] << |
| 437 | S5P_CLKDIV_BUS_GDLR_SHIFT) | | 437 | EXYNOS4_CLKDIV_BUS_GDLR_SHIFT) | |
| 438 | (exynos4x12_clkdiv_lr_bus[index][1] << | 438 | (exynos4x12_clkdiv_lr_bus[index][1] << |
| 439 | S5P_CLKDIV_BUS_GPLR_SHIFT)); | 439 | EXYNOS4_CLKDIV_BUS_GPLR_SHIFT)); |
| 440 | 440 | ||
| 441 | __raw_writel(tmp, S5P_CLKDIV_LEFTBUS); | 441 | __raw_writel(tmp, EXYNOS4_CLKDIV_LEFTBUS); |
| 442 | 442 | ||
| 443 | do { | 443 | do { |
| 444 | tmp = __raw_readl(S5P_CLKDIV_STAT_LEFTBUS); | 444 | tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_LEFTBUS); |
| 445 | } while (tmp & 0x11); | 445 | } while (tmp & 0x11); |
| 446 | |||
