diff options
| author | Joel Challis <git@zvecr.com> | 2021-09-14 03:18:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 12:18:36 +1000 |
| commit | 0ca4a56a0449d17a497ba610d4cee41c914ff50e (patch) | |
| tree | 5e10d1ced8cf84e673f5e3ae88457de32d4943dd /tmk_core | |
| parent | 232bc23a89874d1a2e028a1414dd34cf0339f8d2 (diff) | |
| download | qmk_firmware-0ca4a56a0449d17a497ba610d4cee41c914ff50e.tar.gz qmk_firmware-0ca4a56a0449d17a497ba610d4cee41c914ff50e.zip | |
Refactor use of STM32_SYSCLK (#14430)
* Refactor use of STM32_SYSCLK
* clang
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/chibios/_wait.h | 2 | ||||
| -rw-r--r-- | tmk_core/common/chibios/chibios_config.h | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/tmk_core/common/chibios/_wait.h b/tmk_core/common/chibios/_wait.h index b740afbd24..2f36c64a2e 100644 --- a/tmk_core/common/chibios/_wait.h +++ b/tmk_core/common/chibios/_wait.h @@ -43,8 +43,6 @@ void wait_us(uint16_t duration); #include "_wait.c" -#define CPU_CLOCK STM32_SYSCLK - /* For GPIOs on ARM-based MCUs, the input pins are sampled by the clock of the bus * to which the GPIO is connected. * The connected buses differ depending on the various series of MCUs. diff --git a/tmk_core/common/chibios/chibios_config.h b/tmk_core/common/chibios/chibios_config.h index 23c65f9428..4515b025da 100644 --- a/tmk_core/common/chibios/chibios_config.h +++ b/tmk_core/common/chibios/chibios_config.h @@ -19,6 +19,11 @@ # define SPLIT_USB_DETECT // Force this on when dedicated pin is not used #endif +// STM32 compatibility +#if defined(MCU_STM32) +# define CPU_CLOCK STM32_SYSCLK +#endif + #if defined(STM32F1XX) # define USE_GPIOV1 #endif @@ -27,14 +32,13 @@ # define USE_I2CV1 #endif -// teensy +// teensy compatibility +#if defined(MCU_KINETIS) +# define CPU_CLOCK KINETIS_SYSCLK_FREQUENCY +#endif + #if defined(K20x) || defined(KL2x) # define USE_I2CV1 # define USE_I2CV1_CONTRIB // for some reason a bunch of ChibiOS-Contrib boards only have clock_speed # define USE_GPIOV1 -# define STM32_SYSCLK KINETIS_SYSCLK_FREQUENCY -#endif - -#if defined(MK66F18) -# define STM32_SYSCLK KINETIS_SYSCLK_FREQUENCY #endif |