Skip to content

[stm32] add missing HSI48-related functionality #1252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/modm/platform/clock/stm32/module.lb
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,16 @@ def build(env):
properties["pllprediv2"] = False # FIXME: not sure what value this should have
properties["pll_hse_prediv2"] = target["family"] == "f1" and target["name"] in ["01", "02", "03"]
properties["hsi48"] = \
(target["family"] in ["g4", "h5", "h7", "l5", "u0", "u5"]) or \
(target["family"] == "f0" and target["name"] in ["42", "48", "71", "72", "78", "91", "98"]) or \
(target["family"] == "l4" and target["name"][0] not in ["7", "8"]) or \
(target["family"] == "l5") or \
(target["family"] == "u5")
if target["family"] in ["l4", "l5"]:
(target["family"] == "g0" and target["name"] in ["b1", "c1"]) or \
(target["family"] == "l0" and target["name"][1] == "2") or \
(target["family"] == "l4" and target["name"][0] not in ["7", "8"])
if target["family"] in ["g4", "l0", "l4", "l5", "u0"]:
properties["hsi48_cr"] = "CRRCR"
elif target["family"] in ["c0", "u5"]:
elif target["family"] in ["g0", "h5", "h7", "u5"]:
properties["hsi48_cr"] = "CR"
else:
elif target["family"] in ["f0"]:
properties["hsi48_cr"] = "CR2"
properties["pll_p"] = ((target["family"] == "l4" and target["name"] not in ["12", "22"]) or target["family"] == "g4")
properties["overdrive"] = (target["family"] == "f7") or \
Expand Down
43 changes: 40 additions & 3 deletions src/modm/platform/clock/stm32/rcc.hpp.in
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public:
Hsi16 = 0b10,
Hse = 0b11,
%% endif
%% if hsi48 and target.family not in ["l4", "l5", "u5"]
%% if hsi48 and target.family in ["f0"]
/// High speed internal clock (48 MHz)
Hsi48 = RCC_CFGR_PLLSRC_HSI48_PREDIV,
InternalClockMHz48 = Hsi48,
Expand Down Expand Up @@ -171,7 +171,7 @@ public:
Hsi16 = Hsi,
%% endif
Hse = RCC_CFGR_SW_HSE,
%% if hsi48 and target.family != "l4"
%% if hsi48 and target.family in ["f0"]
Hsi48 = RCC_CFGR_SW_HSI48,
InternalClockMHz48 = Hsi48,
%% endif
Expand Down Expand Up @@ -383,6 +383,12 @@ public:
Pll1Q = 0b10 << RCC_CCIPR1_ICLKSEL_Pos,
Msik = 0b11 << RCC_CCIPR1_ICLKSEL_Pos,
};
%% elif hsi48 and target.family in ["l0"]
enum class Clock48Source
{
PllQ = 0,
Hsi48 = RCC_CCIPR_HSI48SEL,
};
%% endif

%% if target.family in ["f2", "f4", "f7"]
Expand Down Expand Up @@ -456,7 +462,7 @@ public:
MultiSpeedInternalClockK = (0b1001 << RCC_{{cfgr_mco}}_MCOSEL_Pos), // MSIK
%% endif
};
%% else
%% elif target.family in ["f0", "f1", "f3"]
enum class
ClockOutputSource : uint32_t
{
Expand Down Expand Up @@ -814,6 +820,12 @@ public:
{
RCC->CCIPR1 = (RCC->CCIPR1 & ~RCC_CCIPR1_ICLKSEL_Msk) | uint32_t(source);
}
%% elif hsi48 and target.family in ["l0"]
static inline void
setClock48Source(Clock48Source source)
{
RCC->CCIPR = (RCC->CCIPR & ~RCC_CCIPR_HSI48SEL_Msk) | uint32_t(source);
}
%% endif

%% if target.family == "h7"
Expand All @@ -830,6 +842,31 @@ public:
{
RCC->{{d2}}CCIP2R = (RCC->{{d2}}CCIP2R & ~RCC_{{d2}}CCIP2R_USBSEL_Msk) | uint32_t(source);
}
%% elif hsi48 and target.family in ["f0"] and (target.name in ["42", "48", "72", "78"])
enum class
UsbClockSource : uint32_t
{
Hsi48 = 0,
Pll = RCC_CFGR3_USBSW_PLLCLK,
};
static inline void
enableUsbClockSource(UsbClockSource source)
{
RCC->CFGR3 = (RCC->CFGR3 & ~RCC_CFGR3_USBSW_Msk) | uint32_t(source);
}
%% elif hsi48 and target.family in ["g0"]
enum class
UsbClockSource : uint32_t
{
Hsi48 = 0,
Hse = RCC_CCIPR2_USBSEL_0,
Pll = RCC_CCIPR2_USBSEL_1,
};
static inline void
enableUsbClockSource(UsbClockSource source)
{
RCC->CCIPR2 = (RCC->CCIPR2 & ~RCC_CCIPR2_USBSEL_Msk) | uint32_t(source);
}
%% endif

%% if target.family in ["f2", "f4", "f7"]
Expand Down
Loading