diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 8b9cd0690ce7..a516c1bda141 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/gpio.h> | 25 | #include <linux/gpio.h> |
26 | #include <linux/input.h> | 26 | #include <linux/input.h> |
27 | #include <linux/gpio_keys.h> | 27 | #include <linux/gpio_keys.h> |
28 | #include <linux/opp.h> | 28 | #include <linux/pm_opp.h> |
29 | #include <linux/cpu.h> | 29 | #include <linux/cpu.h> |
30 | 30 | ||
31 | #include <linux/mtd/mtd.h> | 31 | #include <linux/mtd/mtd.h> |
@@ -516,11 +516,11 @@ static int __init beagle_opp_init(void) | |||
516 | return -ENODEV; | 516 | return -ENODEV; |
517 | } | 517 | } |
518 | /* Enable MPU 1GHz and lower opps */ | 518 | /* Enable MPU 1GHz and lower opps */ |
519 | r = opp_enable(mpu_dev, 800000000); | 519 | r = dev_pm_opp_enable(mpu_dev, 800000000); |
520 | /* TODO: MPU 1GHz needs SR and ABB */ | 520 | /* TODO: MPU 1GHz needs SR and ABB */ |
521 | 521 | ||
522 | /* Enable IVA 800MHz and lower opps */ | 522 | /* Enable IVA 800MHz and lower opps */ |
523 | r |= opp_enable(iva_dev, 660000000); | 523 | r |= dev_pm_opp_enable(iva_dev, 660000000); |
524 | /* TODO: DSP 800MHz needs SR and ABB */ | 524 | /* TODO: DSP 800MHz needs SR and ABB */ |
525 | if (r) { | 525 | if (r) { |
526 | pr_err("%s: failed to enable higher opp %d\n", | 526 | pr_err("%s: failed to enable higher opp %d\n", |
@@ -529,8 +529,8 @@ static int __init beagle_opp_init(void) | |||
529 | * Cleanup - disable the higher freqs - we dont care | 529 | * Cleanup - disable the higher freqs - we dont care |
530 | * about the results | 530 | * about the results |
531 | */ | 531 | */ |
532 | opp_disable(mpu_dev, 800000000); | 532 | dev_pm_opp_disable(mpu_dev, 800000000); |
533 | opp_disable(iva_dev, 660000000); | 533 | dev_pm_opp_disable(iva_dev, 660000000); |
534 | } | 534 | } |
535 | } | 535 | } |
536 | return 0; | 536 | return 0; |