diff options
-rw-r--r-- | bootloader/gigabeat-s.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/imx31/dvfs_dptc-imx31.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c index 2e95d4cf64..8258e276c3 100644 --- a/bootloader/gigabeat-s.c +++ b/bootloader/gigabeat-s.c | |||
@@ -143,6 +143,9 @@ static void handle_usb(void) | |||
143 | button_close(); | 143 | button_close(); |
144 | backlight_close(); | 144 | backlight_close(); |
145 | 145 | ||
146 | /* Sleep a little to let the backlight ramp up */ | ||
147 | sleep(HZ*5/4); | ||
148 | |||
146 | reset_screen(); | 149 | reset_screen(); |
147 | } | 150 | } |
148 | 151 | ||
diff --git a/firmware/target/arm/imx31/dvfs_dptc-imx31.c b/firmware/target/arm/imx31/dvfs_dptc-imx31.c index cae9a384c9..129e47d55e 100644 --- a/firmware/target/arm/imx31/dvfs_dptc-imx31.c +++ b/firmware/target/arm/imx31/dvfs_dptc-imx31.c | |||
@@ -571,14 +571,15 @@ static void dptc_stop(void) | |||
571 | 571 | ||
572 | if (dptc_running) | 572 | if (dptc_running) |
573 | { | 573 | { |
574 | dptc_running = false; | ||
575 | |||
574 | /* Disable DPTC and mask interrupt. */ | 576 | /* Disable DPTC and mask interrupt. */ |
575 | CCM_PMCR0 = (CCM_PMCR0 & ~CCM_PMCR0_DPTEN) | CCM_PMCR0_PTVAIM; | 577 | CCM_PMCR0 = (CCM_PMCR0 & ~CCM_PMCR0_DPTEN) | CCM_PMCR0_PTVAIM; |
576 | avic_disable_int(INT_CCM_CLK); | 578 | avic_disable_int(INT_CCM_CLK); |
577 | dptc_running = false; | ||
578 | } | ||
579 | 579 | ||
580 | /* Go back to default working point. */ | 580 | /* Go back to default working point. */ |
581 | dptc_new_wp(DPTC_WP_DEFAULT); | 581 | dptc_new_wp(DPTC_WP_DEFAULT); |
582 | } | ||
582 | 583 | ||
583 | restore_irq(oldlevel); | 584 | restore_irq(oldlevel); |
584 | 585 | ||