diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2025-05-31 02:01:39 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2025-05-31 15:20:12 -0400 |
| commit | cfa48fe39f1bb87a6b2766edd953c77c205ba7f5 (patch) | |
| tree | 85f24ea6d25372a66a18cce4fbc68f288d468aa9 /src | |
| parent | 2dd73d0431a2e6a0a88d5ebd95ffa870b1b45831 (diff) | |
| download | kutter-cfa48fe39f1bb87a6b2766edd953c77c205ba7f5.tar.gz kutter-cfa48fe39f1bb87a6b2766edd953c77c205ba7f5.tar.xz kutter-cfa48fe39f1bb87a6b2766edd953c77c205ba7f5.zip | |
stm32: Run stm32g431 at 170Mhz
The chip supports 170Mhz, so no need to run at 150Mhz.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/stm32/Kconfig | 2 | ||||
| -rw-r--r-- | src/stm32/stm32g4.c | 9 | ||||
| -rw-r--r-- | src/stm32/stm32h7_adc.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/stm32/Kconfig b/src/stm32/Kconfig index 0c240bb2..8a7afc3d 100644 --- a/src/stm32/Kconfig +++ b/src/stm32/Kconfig @@ -206,7 +206,7 @@ config CLOCK_FREQ default 180000000 if MACH_STM32F446 default 216000000 if MACH_STM32F765 default 64000000 if MACH_STM32G0 - default 150000000 if MACH_STM32G431 + default 170000000 if MACH_STM32G431 default 170000000 if MACH_STM32G474 default 520000000 if MACH_STM32H723 default 400000000 if MACH_STM32H743 || MACH_STM32H750 diff --git a/src/stm32/stm32g4.c b/src/stm32/stm32g4.c index 6d6d1c0d..02c9656f 100644 --- a/src/stm32/stm32g4.c +++ b/src/stm32/stm32g4.c @@ -1,6 +1,6 @@ // Code to setup clocks and gpio on stm32g4 // -// Copyright (C) 2019 Kevin O'Connor <kevin@koconnor.net> +// Copyright (C) 2019-2025 Kevin O'Connor <kevin@koconnor.net> // // This file may be distributed under the terms of the GNU GPLv3 license. @@ -85,14 +85,14 @@ enable_clock_stm32g4(void) { uint32_t pll_base = 4000000, pll_freq = CONFIG_CLOCK_FREQ * 2, pllcfgr; if (!CONFIG_STM32_CLOCK_REF_INTERNAL) { - // Configure 150Mhz PLL from external crystal (HSE) + // Configure PLL from external crystal (HSE) uint32_t div = CONFIG_CLOCK_REF_FREQ / pll_base - 1; RCC->CR |= RCC_CR_HSEON; while (!(RCC->CR & RCC_CR_HSERDY)) ; pllcfgr = RCC_PLLCFGR_PLLSRC_HSE | (div << RCC_PLLCFGR_PLLM_Pos); } else { - // Configure 150Mhz PLL from internal 16Mhz oscillator (HSI) + // Configure PLL from internal 16Mhz oscillator (HSI) uint32_t div = 16000000 / pll_base - 1; pllcfgr = RCC_PLLCFGR_PLLSRC_HSI | (div << RCC_PLLCFGR_PLLM_Pos); RCC->CR |= RCC_CR_HSION; @@ -134,6 +134,9 @@ clock_setup(void) enable_pclock(PWR_BASE); PWR->CR3 |= PWR_CR3_APC; // allow gpio pullup/down + if (CONFIG_CLOCK_FREQ > 150000000) + // Enable "range 1 boost" mode + PWR->CR5 = 0; // Wait for PLL lock while (!(RCC->CR & RCC_CR_PLLRDY)) diff --git a/src/stm32/stm32h7_adc.c b/src/stm32/stm32h7_adc.c index 0d7d00f9..ca50b0c1 100644 --- a/src/stm32/stm32h7_adc.c +++ b/src/stm32/stm32h7_adc.c @@ -164,7 +164,7 @@ static const uint8_t adc_pins[] = { // 520Mhz stm32h723: clock=32.5Mhz, Tsamp=387.5, Tconv=394, total=12.12us // 520Mhz stm32h723 adc3: clock=65Mhz, Tsamp=640.5, Tconv=653, total=10.05us // 80Mhz stm32l4: clock=20Mhz, Tsamp=247.5, Tconv=260, total=13.0us -// 150Mhz stm32g4: clock=37.5Mhz, Tsamp=247.5, Tconv=260, total=6.933us +// 170Mhz stm32g4: clock=42.5Mhz, Tsamp=247.5, Tconv=260, total=6.118us // Handle register name differences between chips #if CONFIG_MACH_STM32H723 |