Merge branch 'master' into Alternate_Raw32_Scheduler

remotes/origin_old/ugfx_release_2.6
Joel Bodenmann 2015-07-24 14:02:15 +02:00
commit 83b29284aa
1 changed files with 9 additions and 3 deletions

View File

@ -156,14 +156,20 @@ static void _ltdc_init(void)
// Set up the display scanning
uint32_t hacc, vacc;
// Reset the LTDC hardware module
// Reset the LTDC peripheral
RCC->APB2RSTR |= RCC_APB2RSTR_LTDCRST;
RCC->APB2RSTR = 0;
// Enable the LTDC clock
RCC->DCKCFGR1 = (RCC->DCKCFGR1 & ~RCC_DCKCFGR1_PLLSAIDIVR) | (1 << 16); /* /4 */
#if defined(STM32F4)
RCC->DCKCFGR = (RCC->DCKCFGR & ~RCC_DCKCFGR_PLLSAIDIVR) | (1 << 16);
#elif defined(STM32F7)
RCC->DCKCFGR1 = (RCC->DCKCFGR1 & ~RCC_DCKCFGR1_PLLSAIDIVR) | (1 << 16);
#else
#error STM32LTDC driver not implemented for your platform
#endif
// Enable the module
// Enable the peripheral
RCC->APB2ENR |= RCC_APB2ENR_LTDCEN;
// Turn off the controller and its interrupts