3 files changed, 8 insertions, 5 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c
index 481cb467bd..f30287d4e9 100644
--- a/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c
@@ -71,10 +71,11 @@ void INIT_ATTR kernel_device_init(void)
     spi_init();
     enable_interrupt(IRQ_FIQ_STATUS);
     mc13783_init();
-    dvfs_dptc_init();
-    dvfs_wfi_monitor(true); /* Monitor the WFI signal */
+    dvfs_dptc_init();       /* Init also sets default points */
 #ifndef BOOTLOADER
-    dvfs_dptc_start(); /* Should be ok to start even so early */
+    dvfs_wfi_monitor(true); /* Monitor the WFI signal */
+    dvfs_start();           /* Should be ok to start even so early */
+    dptc_start();
 #endif
 }
 
diff --git a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
index 9d7d30547b..11276a6c3a 100644
--- a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
@@ -129,7 +129,8 @@ bool tuner_powered(void)
 void power_off(void)
 {
     /* Turn off voltage and frequency scaling */
-    dvfs_dptc_stop();
+    dvfs_stop();
+    dptc_stop();
 
     /* Cut backlight */
     _backlight_off();
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
index 1f177d4252..16b17ba403 100644
--- a/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
@@ -210,7 +210,8 @@ void INIT_ATTR system_init(void)
 
 void system_prepare_fw_start(void)
 {
-    dvfs_dptc_stop();
+    dvfs_stop();
+    dptc_stop();
     mc13783_close();
     tick_stop();
     disable_interrupt(IRQ_FIQ_STATUS);