EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stm32/h7: Fixed an issue with how the RCC implementation decides which VCO to use in a given PLL

Browse Source
This commit is contained in:
dragonmux
2024-04-29 11:04:33 +01:00
committed by Piotr Esden-Tempski
parent 0685d162df
commit 03a884bcca
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/stm32/h7/rcc.c
View File

@@ -42,7 +42,7 @@ static struct {
.per.pclk4 = RCC_HSI_BASE_FREQUENCY .per.pclk4 = RCC_HSI_BASE_FREQUENCY
}; };
static void rcc_configure_pll(uint32_t clkin, const struct pll_config *config, int pll_num) { static void rcc_configure_pll(uint32_t clkin, const struct pll_config *config, size_t pll_num) {
/* Only concern ourselves with the PLL if the input clock is enabled. */ /* Only concern ourselves with the PLL if the input clock is enabled. */
if (config->divm == 0 || pll_num < 1 || pll_num > 3) { if (config->divm == 0 || pll_num < 1 || pll_num > 3) {
return; return;
@@ -62,11 +62,13 @@ static void rcc_configure_pll(uint32_t clkin, const struct pll_config *config, i
RCC_PLLDIVR(pll_num) |= RCC_PLLNDIVR_DIVN(config->divn); RCC_PLLDIVR(pll_num) |= RCC_PLLNDIVR_DIVN(config->divn);
/* Setup the PLL config values for this PLL. */ /* Setup the PLL config values for this PLL. */
uint8_t vco_addshift = 4 * (pll_num - 1); /* Values spaced by 4 for PLL 1/2/3 */ uint8_t vco_addshift = 4U * (pll_num - 1U); /* Values spaced by 4 for PLL 1/2/3 */
/* Set the PLL input frequency range. */ /* Set the PLL input frequency range. */
uint32_t pll_clk = clkin / config->divm; uint32_t pll_clk = clkin / config->divm;
if (pll_clk > (2 * HZ_PER_MHZ) && pll_clk <= (4 * HZ_PER_MHZ)) { if (pll_clk >= (1 * HZ_PER_MHZ) && pll_clk <= (2 * HZ_PER_MHZ)) {
RCC_PLLCFGR |= (RCC_PLLCFGR_PLL1VCO_MED << vco_addshift);
} else if (pll_clk > (2 * HZ_PER_MHZ) && pll_clk <= (4 * HZ_PER_MHZ)) {
RCC_PLLCFGR |= (RCC_PLLCFGR_PLLRGE_2_4MHZ << RCC_PLLCFGR_PLL1RGE_SHIFT) << vco_addshift; RCC_PLLCFGR |= (RCC_PLLCFGR_PLLRGE_2_4MHZ << RCC_PLLCFGR_PLL1RGE_SHIFT) << vco_addshift;
} else if (pll_clk > (4 * HZ_PER_MHZ) && pll_clk <= (8 * HZ_PER_MHZ)) { } else if (pll_clk > (4 * HZ_PER_MHZ) && pll_clk <= (8 * HZ_PER_MHZ)) {
RCC_PLLCFGR |= (RCC_PLLCFGR_PLLRGE_4_8MHZ << RCC_PLLCFGR_PLL1RGE_SHIFT) << vco_addshift; RCC_PLLCFGR |= (RCC_PLLCFGR_PLLRGE_4_8MHZ << RCC_PLLCFGR_PLL1RGE_SHIFT) << vco_addshift;
@@ -74,13 +76,8 @@ static void rcc_configure_pll(uint32_t clkin, const struct pll_config *config, i
RCC_PLLCFGR |= (RCC_PLLCFGR_PLLRGE_8_16MHZ << RCC_PLLCFGR_PLL1RGE_SHIFT) << vco_addshift; RCC_PLLCFGR |= (RCC_PLLCFGR_PLLRGE_8_16MHZ << RCC_PLLCFGR_PLL1RGE_SHIFT) << vco_addshift;
} }
/* Set the VCO output frequency range. */
uint32_t pll_vco_clk = pll_clk * config->divn;
if (pll_vco_clk <= (420 * HZ_PER_MHZ)) {
RCC_PLLCFGR |= (RCC_PLLCFGR_PLL1VCO_MED << vco_addshift);
}
/* Setup the enable bits for the PLL outputs. */ /* Setup the enable bits for the PLL outputs. */
uint32_t pll_vco_clk = pll_clk * config->divn;
uint8_t diven_addshift = 3 * (pll_num - 1); /* Values spaced by 3 for PLL1/2/3 */ uint8_t diven_addshift = 3 * (pll_num - 1); /* Values spaced by 3 for PLL1/2/3 */
if (config->divp > 0) { if (config->divp > 0) {
RCC_PLLDIVR(pll_num) |= RCC_PLLNDIVR_DIVP(config->divp); RCC_PLLDIVR(pll_num) |= RCC_PLLNDIVR_DIVP(config->divp);