diff --git a/Libraries/PeriphDrivers/Include/MAX32690/mxc_sys.h b/Libraries/PeriphDrivers/Include/MAX32690/mxc_sys.h index 593be2faee..304a5732ab 100644 --- a/Libraries/PeriphDrivers/Include/MAX32690/mxc_sys.h +++ b/Libraries/PeriphDrivers/Include/MAX32690/mxc_sys.h @@ -203,6 +203,17 @@ typedef enum { MXC_V_GCR_CLKCTRL_SYSCLK_SEL_EXTCLK /**< Use the external system clock input */ } mxc_sys_system_clock_t; +typedef enum { + MXC_SYS_CLOCK_DIV_1 = MXC_S_GCR_CLKCTRL_SYSCLK_DIV_DIV1, + MXC_SYS_CLOCK_DIV_2 = MXC_S_GCR_CLKCTRL_SYSCLK_DIV_DIV2, + MXC_SYS_CLOCK_DIV_4 = MXC_S_GCR_CLKCTRL_SYSCLK_DIV_DIV4, + MXC_SYS_CLOCK_DIV_8 = MXC_S_GCR_CLKCTRL_SYSCLK_DIV_DIV8, + MXC_SYS_CLOCK_DIV_16 = MXC_S_GCR_CLKCTRL_SYSCLK_DIV_DIV16, + MXC_SYS_CLOCK_DIV_32 = MXC_S_GCR_CLKCTRL_SYSCLK_DIV_DIV32, + MXC_SYS_CLOCK_DIV_64 = MXC_S_GCR_CLKCTRL_SYSCLK_DIV_DIV64, + MXC_SYS_CLOCK_DIV_128 = MXC_S_GCR_CLKCTRL_SYSCLK_DIV_DIV128 +} mxc_sys_system_clock_div_t; + #define MXC_SYS_USN_CHECKSUM_LEN 16 // Length of the USN + padding for checksum compute #define MXC_SYS_USN_CSUM_FIELD_LEN 2 // Size of the checksum field in the USN #define MXC_SYS_USN_LEN 13 // Size of the USN including the checksum @@ -371,6 +382,18 @@ int MXC_SYS_ClockSourceDisable(mxc_sys_system_clock_t clock); */ int MXC_SYS_Clock_Select(mxc_sys_system_clock_t clock); +/** + * @brief Set the system clock divider. + * @param div Enumeration for desired clock divider. + */ +void MXC_SYS_SetClockDiv(mxc_sys_system_clock_div_t div); + +/** + * @brief Get the system clock divider. + * @returns System clock divider. + */ +mxc_sys_system_clock_div_t MXC_SYS_GetClockDiv(void); + /** * @brief Wait for a clock to enable with timeout * @param ready The clock to wait for diff --git a/Libraries/PeriphDrivers/Source/SYS/sys_me18.c b/Libraries/PeriphDrivers/Source/SYS/sys_me18.c index 2c8ffa8894..89c2386c45 100644 --- a/Libraries/PeriphDrivers/Source/SYS/sys_me18.c +++ b/Libraries/PeriphDrivers/Source/SYS/sys_me18.c @@ -443,6 +443,25 @@ int MXC_SYS_Clock_Select(mxc_sys_system_clock_t clock) return E_NO_ERROR; } +/* ************************************************************************** */ +void MXC_SYS_SetClockDiv(mxc_sys_system_clock_div_t div) +{ + /* Return if this setting is already current */ + if (div == MXC_SYS_GetClockDiv()) { + return; + } + + MXC_SETFIELD(MXC_GCR->clkctrl, MXC_F_GCR_CLKCTRL_SYSCLK_DIV, div); + + SystemCoreClockUpdate(); +} + +/* ************************************************************************** */ +mxc_sys_system_clock_div_t MXC_SYS_GetClockDiv(void) +{ + return (MXC_GCR->clkctrl & MXC_F_GCR_CLKCTRL_SYSCLK_DIV); +} + /* ************************************************************************** */ void MXC_SYS_Reset_Periph(mxc_sys_reset_t reset) { diff --git a/Libraries/zephyr/MAX/Include/wrap_max32_sys.h b/Libraries/zephyr/MAX/Include/wrap_max32_sys.h index 67ac5aa99e..289c16b91e 100644 --- a/Libraries/zephyr/MAX/Include/wrap_max32_sys.h +++ b/Libraries/zephyr/MAX/Include/wrap_max32_sys.h @@ -69,8 +69,6 @@ static inline void Wrap_MXC_SYS_SetClockDiv(int div) #define ADI_MAX32_CLK_ISO MXC_SYS_CLOCK_ISO #endif -#if !defined(CONFIG_SOC_MAX32690) - #define z_sysclk_prescaler(v) MXC_SYS_CLOCK_DIV_##v #define sysclk_prescaler(v) z_sysclk_prescaler(v) @@ -79,8 +77,6 @@ static inline void Wrap_MXC_SYS_SetClockDiv(int div) MXC_SYS_SetClockDiv((mxc_sys_system_clock_div_t)div); } -#endif // !defined(CONFIG_SOC_MAX32690) - #endif // part number #ifdef __cplusplus