3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atsamd: Clarify clock generation code 

Implement gen_clock() and route_pclock() helpers in an effort to make
the code more readable.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-01-15 09:31:45 -05:00
parent 893cbbab83
commit ed1334c24b
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/atsamd/clock.c
View File

@ -1,10 +1,9 @@
// Code to setup peripheral clocks on the SAMD21 // Code to setup peripheral clocks on the SAMD21
// //
// Copyright (C) 2018 Kevin O'Connor <kevin@koconnor.net> // Copyright (C) 2018-2019 Kevin O'Connor <kevin@koconnor.net>
// //
// This file may be distributed under the terms of the GNU GPLv3 license. // This file may be distributed under the terms of the GNU GPLv3 license.
#include "autoconf.h" // CONFIG_CLOCK_FREQ
#include "compiler.h" // DIV_ROUND_CLOSEST #include "compiler.h" // DIV_ROUND_CLOSEST
#include "internal.h" // enable_pclock #include "internal.h" // enable_pclock
#include "samd21.h" // GCLK #include "samd21.h" // GCLK
@ -14,18 +13,34 @@
#define CLKGEN_32K 1 #define CLKGEN_32K 1
#define CLKGEN_ULP32K 2 #define CLKGEN_ULP32K 2
// Enable a peripheral clock and power to that peripheral #define FREQ_MAIN 48000000
void #define FREQ_32K 32768
enable_pclock(uint32_t clock_id, uint32_t pmask)
// Configure a clock generator using a given source as input
static inline void
gen_clock(uint32_t clkgen_id, uint32_t flags)
{ {
GCLK->CLKCTRL.reg = (GCLK_CLKCTRL_ID(clock_id) GCLK->GENDIV.reg = GCLK_GENDIV_ID(clkgen_id);
| GCLK_CLKCTRL_GEN(CLKGEN_MAIN) | GCLK_CLKCTRL_CLKEN); GCLK->GENCTRL.reg = GCLK_GENCTRL_ID(clkgen_id) | flags | GCLK_GENCTRL_GENEN;
while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY)
;
PM->APBCMASK.reg |= pmask;
} }
#define FREQ_XOSC32K 32768 // Route a peripheral clock to a given clkgen
static inline void
route_pclock(uint32_t pclk_id, uint32_t clkgen_id)
{
GCLK->CLKCTRL.reg = (GCLK_CLKCTRL_ID(pclk_id)
| GCLK_CLKCTRL_GEN(clkgen_id) | GCLK_CLKCTRL_CLKEN);
while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY)
;
}
// Enable a peripheral clock and power to that peripheral
void
enable_pclock(uint32_t pclk_id, uint32_t pmask)
{
route_pclock(pclk_id, CLKGEN_MAIN);
PM->APBCMASK.reg |= pmask;
}
void void
SystemInit(void) SystemInit(void)
@ -33,31 +48,24 @@ SystemInit(void)
// Setup flash to work with 48Mhz clock // Setup flash to work with 48Mhz clock
NVMCTRL->CTRLB.reg = NVMCTRL_CTRLB_RWS_HALF; NVMCTRL->CTRLB.reg = NVMCTRL_CTRLB_RWS_HALF;
// Enable external 32Khz crystal // Reset GCLK
GCLK->CTRL.reg = GCLK_CTRL_SWRST;
while (GCLK->CTRL.reg & GCLK_CTRL_SWRST)
;
// Enable external 32Khz crystal and route to CLKGEN_32K
uint32_t val = (SYSCTRL_XOSC32K_STARTUP(6) uint32_t val = (SYSCTRL_XOSC32K_STARTUP(6)
| SYSCTRL_XOSC32K_XTALEN | SYSCTRL_XOSC32K_EN32K); | SYSCTRL_XOSC32K_XTALEN | SYSCTRL_XOSC32K_EN32K);
SYSCTRL->XOSC32K.reg = val; SYSCTRL->XOSC32K.reg = val;
SYSCTRL->XOSC32K.reg = val | SYSCTRL_XOSC32K_ENABLE; SYSCTRL->XOSC32K.reg = val | SYSCTRL_XOSC32K_ENABLE;
while (!(SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_XOSC32KRDY)) while (!(SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_XOSC32KRDY))
; ;
gen_clock(CLKGEN_32K, GCLK_GENCTRL_SRC_XOSC32K);
// Reset GCLK // Configure DFLL48M clock (with CLKGEN_32K as reference)
GCLK->CTRL.reg = GCLK_CTRL_SWRST; route_pclock(SYSCTRL_GCLK_ID_DFLL48, CLKGEN_32K);
while (GCLK->CTRL.reg & GCLK_CTRL_SWRST)
;
// Route external 32Khz clock to DFLL48M (via CLKGEN_32K)
GCLK->GENDIV.reg = GCLK_GENDIV_ID(CLKGEN_32K);
GCLK->GENCTRL.reg = (GCLK_GENCTRL_ID(CLKGEN_32K)
| GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_GENEN);
GCLK->CLKCTRL.reg = (GCLK_CLKCTRL_ID(SYSCTRL_GCLK_ID_DFLL48)
| GCLK_CLKCTRL_GEN(CLKGEN_32K) | GCLK_CLKCTRL_CLKEN);
while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY)
;
// Configure DFLL48M clock
SYSCTRL->DFLLCTRL.reg = 0; SYSCTRL->DFLLCTRL.reg = 0;
uint32_t mul = DIV_ROUND_CLOSEST(CONFIG_CLOCK_FREQ, FREQ_XOSC32K); uint32_t mul = DIV_ROUND_CLOSEST(FREQ_MAIN, FREQ_32K);
SYSCTRL->DFLLMUL.reg = (SYSCTRL_DFLLMUL_CSTEP(31) SYSCTRL->DFLLMUL.reg = (SYSCTRL_DFLLMUL_CSTEP(31)
| SYSCTRL_DFLLMUL_FSTEP(511) | SYSCTRL_DFLLMUL_FSTEP(511)
| SYSCTRL_DFLLMUL_MUL(mul)); | SYSCTRL_DFLLMUL_MUL(mul));
@ -70,8 +78,5 @@ SystemInit(void)
; ;
// Switch main clock to DFLL48M clock // Switch main clock to DFLL48M clock
GCLK->GENDIV.reg = GCLK_GENDIV_ID(CLKGEN_MAIN); gen_clock(CLKGEN_MAIN, GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_IDC);
GCLK->GENCTRL.reg = (GCLK_GENCTRL_ID(CLKGEN_MAIN)
| GCLK_GENCTRL_SRC_DFLL48M
| GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN);
} }