kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-18 19:13:51 +01:00
Code Releases Activity

Merge pull request #20601 from maribu/cpu/msp430/clock

Browse Source 
cpu/msp430: clean up and fix clock driver
This commit is contained in:
benpicco 2024-04-22 08:44:20 +00:00 committed by GitHub
commit 5a7bcc9f87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/msp430/Makefile.include
View File

@ -2,6 +2,7 @@ INCLUDES += -I$(RIOTCPU)/msp430/include/
INCLUDES += -I$(RIOTCPU)/msp430/include/$(subst msp430_,,$(CPU_FAM)) INCLUDES += -I$(RIOTCPU)/msp430/include/$(subst msp430_,,$(CPU_FAM))
CFLAGS += -DCPU_MODEL_$(call uppercase_and_underscore,$(CPU_MODEL)) CFLAGS += -DCPU_MODEL_$(call uppercase_and_underscore,$(CPU_MODEL))
CFLAGS += -DCPU_FAM_$(call uppercase_and_underscore,$(CPU_FAM))
# include the msp430 common Makefile # include the msp430 common Makefile
include $(RIOTMAKE)/arch/msp430.inc.mk include $(RIOTMAKE)/arch/msp430.inc.mk

23
cpu/msp430/clock.c
View File

@ -20,16 +20,14 @@
* @} * @}
*/ */
#include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include "debug.h"
#include "busy_wait.h" #include "busy_wait.h"
#include "macros/math.h" #include "macros/math.h"
#include "macros/units.h" #include "macros/units.h"
#include "modules.h"
#include "periph_conf.h" #include "periph_conf.h"
#include "periph_cpu.h"
#ifdef RSEL3 #ifdef RSEL3
#define RSEL_MASK (RSEL0 | RSEL1 | RSEL2 | RSEL3) #define RSEL_MASK (RSEL0 | RSEL1 | RSEL2 | RSEL3)
@ -52,8 +50,15 @@ static inline bool is_valid_low_freq(uint32_t freq) {
return (freq == 32768); return (freq == 32768);
} }
/* As high speed crystal anything between 450 kHz and 8 MHz is allowed */ /* Valid parameter range for the high speed crystal by family:
* MSP430 x1xx: 450 kHz <= f <= 8 MHz
* MSP430 F2xx / G2xx: 400 kHz <= f <= 16 MHz
*/
static inline bool is_valid_high_freq(uint32_t freq) { static inline bool is_valid_high_freq(uint32_t freq) {
if (IS_ACTIVE(CPU_FAM_MSP430_F2XX_G2XX)) {
return ((freq >= KHZ(400)) && (freq <= MHZ(16)));
}
return ((freq >= KHZ(450)) && (freq <= MHZ(8))); return ((freq >= KHZ(450)) && (freq <= MHZ(8)));
} }
@ -69,8 +74,7 @@ static inline bool is_valid_high_freq(uint32_t freq) {
static void check_config(void) static void check_config(void)
{ {
/* LFXT1 can either be a low frequency 32.768 kHz watch crystal or a /* LFXT1 can either be a low frequency 32.768 kHz watch crystal or a
* high frequency crustal between 450 kHz and 8 MHz. We cannot function * high frequency crystal. We cannot function without this crystal */
* without this crystal */
if (!is_valid_low_freq(clock_params.lfxt1_frequency) if (!is_valid_low_freq(clock_params.lfxt1_frequency)
&& !is_valid_high_freq(clock_params.lfxt1_frequency)) { && !is_valid_high_freq(clock_params.lfxt1_frequency)) {
extern void lfxt1_frequency_invalid(void); extern void lfxt1_frequency_invalid(void);
@ -78,7 +82,8 @@ static void check_config(void)
} }
/* XT2 is not required and may be configured as 0 Hz to indicate its /* XT2 is not required and may be configured as 0 Hz to indicate its
* absence. If it is present, we require 450 kHz <= XT <= 8 MHz */ * absence. If it is present, it must but a valid frequency for a high
* frequency crystal. */
if ((clock_params.xt2_frequency != 0) && if ((clock_params.xt2_frequency != 0) &&
!is_valid_high_freq(clock_params.xt2_frequency)) { !is_valid_high_freq(clock_params.xt2_frequency)) {
extern void xt2_frequency_invalid(void); extern void xt2_frequency_invalid(void);
@ -319,10 +324,10 @@ void default_clock_init(void)
/* if DCO is not used at all, disable it to preserve power */ /* if DCO is not used at all, disable it to preserve power */
if (clock_params.target_dco_frequency == 0) { if (clock_params.target_dco_frequency == 0) {
/* Setting bit SCG0 in the status register (r2) disables the DCO. /* Setting bit SCG0 in the status register (SR) disables the DCO.
* We do so in assembly, as r2 is not memory mapped. */ * We do so in assembly, as r2 is not memory mapped. */
__asm__ __volatile__ ( __asm__ __volatile__ (
"bis %[scg0], r2" "\n\t" "bis %[scg0], SR" "\n\t"
: /* no outputs */ : /* no outputs */
: /* inputs: */ : /* inputs: */
[scg0] "i"(SCG0) /* bitmask to set SCGO0 as immediate */ [scg0] "i"(SCG0) /* bitmask to set SCGO0 as immediate */