diff options
Diffstat (limited to 'arch/arm/mach-exynos4')
-rw-r--r-- | arch/arm/mach-exynos4/cpufreq.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-exynos4/cpufreq.c b/arch/arm/mach-exynos4/cpufreq.c index 174f080b500d..a16ac35747a9 100644 --- a/arch/arm/mach-exynos4/cpufreq.c +++ b/arch/arm/mach-exynos4/cpufreq.c | |||
@@ -31,10 +31,8 @@ static struct clk *moutcore; | |||
31 | static struct clk *mout_mpll; | 31 | static struct clk *mout_mpll; |
32 | static struct clk *mout_apll; | 32 | static struct clk *mout_apll; |
33 | 33 | ||
34 | #ifdef CONFIG_REGULATOR | ||
35 | static struct regulator *arm_regulator; | 34 | static struct regulator *arm_regulator; |
36 | static struct regulator *int_regulator; | 35 | static struct regulator *int_regulator; |
37 | #endif | ||
38 | 36 | ||
39 | static struct cpufreq_freqs freqs; | 37 | static struct cpufreq_freqs freqs; |
40 | static unsigned int memtype; | 38 | static unsigned int memtype; |
@@ -434,10 +432,8 @@ static int exynos4_target(struct cpufreq_policy *policy, | |||
434 | /* control regulator */ | 432 | /* control regulator */ |
435 | if (freqs.new > freqs.old) { | 433 | if (freqs.new > freqs.old) { |
436 | /* Voltage up */ | 434 | /* Voltage up */ |
437 | #ifdef CONFIG_REGULATOR | ||
438 | regulator_set_voltage(arm_regulator, arm_volt, arm_volt); | 435 | regulator_set_voltage(arm_regulator, arm_volt, arm_volt); |
439 | regulator_set_voltage(int_regulator, int_volt, int_volt); | 436 | regulator_set_voltage(int_regulator, int_volt, int_volt); |
440 | #endif | ||
441 | } | 437 | } |
442 | 438 | ||
443 | /* Clock Configuration Procedure */ | 439 | /* Clock Configuration Procedure */ |
@@ -446,10 +442,8 @@ static int exynos4_target(struct cpufreq_policy *policy, | |||
446 | /* control regulator */ | 442 | /* control regulator */ |
447 | if (freqs.new < freqs.old) { | 443 | if (freqs.new < freqs.old) { |
448 | /* Voltage down */ | 444 | /* Voltage down */ |
449 | #ifdef CONFIG_REGULATOR | ||
450 | regulator_set_voltage(arm_regulator, arm_volt, arm_volt); | 445 | regulator_set_voltage(arm_regulator, arm_volt, arm_volt); |
451 | regulator_set_voltage(int_regulator, int_volt, int_volt); | 446 | regulator_set_voltage(int_regulator, int_volt, int_volt); |
452 | #endif | ||
453 | } | 447 | } |
454 | 448 | ||
455 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); | 449 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); |
@@ -521,7 +515,6 @@ static int __init exynos4_cpufreq_init(void) | |||
521 | if (IS_ERR(mout_apll)) | 515 | if (IS_ERR(mout_apll)) |
522 | goto out; | 516 | goto out; |
523 | 517 | ||
524 | #ifdef CONFIG_REGULATOR | ||
525 | arm_regulator = regulator_get(NULL, "vdd_arm"); | 518 | arm_regulator = regulator_get(NULL, "vdd_arm"); |
526 | if (IS_ERR(arm_regulator)) { | 519 | if (IS_ERR(arm_regulator)) { |
527 | printk(KERN_ERR "failed to get resource %s\n", "vdd_arm"); | 520 | printk(KERN_ERR "failed to get resource %s\n", "vdd_arm"); |
@@ -533,7 +526,6 @@ static int __init exynos4_cpufreq_init(void) | |||
533 | printk(KERN_ERR "failed to get resource %s\n", "vdd_int"); | 526 | printk(KERN_ERR "failed to get resource %s\n", "vdd_int"); |
534 | goto out; | 527 | goto out; |
535 | } | 528 | } |
536 | #endif | ||
537 | 529 | ||
538 | /* | 530 | /* |
539 | * Check DRAM type. | 531 | * Check DRAM type. |
@@ -565,13 +557,11 @@ out: | |||
565 | if (!IS_ERR(mout_apll)) | 557 | if (!IS_ERR(mout_apll)) |
566 | clk_put(mout_apll); | 558 | clk_put(mout_apll); |
567 | 559 | ||
568 | #ifdef CONFIG_REGULATOR | ||
569 | if (!IS_ERR(arm_regulator)) | 560 | if (!IS_ERR(arm_regulator)) |
570 | regulator_put(arm_regulator); | 561 | regulator_put(arm_regulator); |
571 | 562 | ||
572 | if (!IS_ERR(int_regulator)) | 563 | if (!IS_ERR(int_regulator)) |
573 | regulator_put(int_regulator); | 564 | regulator_put(int_regulator); |
574 | #endif | ||
575 | 565 | ||
576 | printk(KERN_ERR "%s: failed initialization\n", __func__); | 566 | printk(KERN_ERR "%s: failed initialization\n", __func__); |
577 | 567 | ||