rcc: add peripheral clock definitions for the rest of the H5 family

Cargo.toml

@@ -25,17 +25,28 @@ device-selected = []
 
 # rmXXXX represent processor subfamilies and their common features
 rm0492 = ["gpio-h503"]
-rm0481 = ["gpio-h5x"]   # STM32H52x/6x/7x
+rm0481 = []                 # STM32H52x/6x/7x
 
-# Different subfamilies have different GPIOs available
+# Different subfamily groups have different selections of identical peripherals
+h56x_h573 = ["gpio-h56x_h573"]         # STM32H56x/STM32H573
+h523_h533 = []                         # STM32H523/STM32H533
+
+# Different subfamily groups have different GPIOs available and different alternate functions
+# available
 gpio-h503 = []
-gpio-h5x = []
+gpio-h56x_h573 = []
+
+# Some peripherals are only present on specific MCUs within a subfamily group
+ethernet = []               # Only STM32H563/73 have ethernet
+otfdec = []                 # Only STM32H573/33 have OTFDEC
+sdmmc2 = []                 # Only STM32H563/73 have SDMMC2
 
 rt = ["stm32h5/rt"]
 stm32h503 = ["stm32h5/stm32h503", "device-selected", "rm0492"]
-stm32h562 = ["stm32h5/stm32h562", "device-selected", "rm0481"]
-stm32h563 = ["stm32h5/stm32h563", "device-selected", "rm0481"]
-stm32h573 = ["stm32h5/stm32h573", "device-selected", "rm0481"]
+stm32h562 = ["stm32h5/stm32h562", "device-selected", "rm0481", "h56x_h573"]
+stm32h563 = ["stm32h5/stm32h563", "device-selected", "rm0481", "h56x_h573", "sdmmc2", "ethernet"]
+stm32h573 = ["stm32h5/stm32h573", "device-selected", "rm0481", "h56x_h573", "otfdec", "sdmmc2", "ethernet"]
+
 # Flags for examples
 log = ["dep:log"]
 log-itm = ["log"]

src/gpio/gpio_def.rs

@@ -145,11 +145,11 @@ mod h503 {
     }
 }
 
-#[cfg(feature = "gpio-h5x")]
-pub use h5x::*;
+#[cfg(feature = "gpio-h56x_h573")]
+pub use h56x_h573::*;
 
-#[cfg(feature = "gpio-h5x")]
-mod h5x {
+#[cfg(feature = "gpio-h56x_h573")]
+mod h56x_h573 {
     use super::Gpio;
 
     impl<const P: char> Gpio<P> {

src/rcc/rec.rs

@@ -475,10 +475,6 @@ macro_rules! variant_return_type {
 // Peripherals with an individual kernel clock must be marked "kernel clk". If a
 // kernel clock multiplexer is shared between multiple peripherals, all those
 // peripherals must instead be marked with a common "group clk".
-//
-// NOTE: The stm32h5 crate does not have definitions for the clock source variants for registers for
-// any processors other than the STM32H503 at this time. Therefore, peripherals which have
-// selectable clock sources are currently only specified for the H503 (rm0492).
 peripheral_reset_and_enable_control! {
 
     #[cfg(all())]
@@ -495,6 +491,19 @@ peripheral_reset_and_enable_control! {
     AHB1, "" => [
         (NoReset) Gtzc1
     ];
+    #[cfg(feature = "rm0481")]
+    AHB1, "" => [
+        (NoReset) Dcache,
+        (NoReset) Tzsc1,
+        Fmac,
+        Cordic
+    ];
+    #[cfg(feature = "ethernet")]
+    AHB1, "" => [
+        (NoReset) Ethrx,
+        (NoReset) Ethtx,
+        Eth
+    ];
 
     #[cfg(all())]
     AHB2, "AMBA High-performance Bus (AHB2) peripherals" => [
@@ -504,69 +513,136 @@ peripheral_reset_and_enable_control! {
         Gpiod,
         Gpioc,
         Gpiob,
-        Gpioa
+        Gpioa,
+        Rng [kernel clk: Rng RNG ccipr5 "RNG"],
+        Adc [group clk: AdcDac(Variant) ADCDAC ccipr5 "ADC/DAC"]
     ];
     #[cfg(feature = "rm0492")]
     AHB2, "" => [
-        Rng [kernel clk: Rng RNG ccipr5 "RNG"],
-        Adc [group clk: AdcDac(Variant) ADCDAC ccipr5 "ADC/DAC"],
         Dac12 [group clk: AdcDac]
     ];
+    #[cfg(feature = "rm0481")]
+    AHB2, "" => [
+        Gpiog,
+        Gpiof,
+        Gpioe,
+        Dac1 [group clk: AdcDac]
+    ];
+    #[cfg(feature = "h56x_h573")]
+    AHB2, "" => [
+        Gpioi
+    ];
 
+    #[cfg(feature = "rm0481")]
+    AHB4, "AMBA High-performance Bus (AHB4) peripherals" => [
+        Octospi1  [kernel clk: Octospi1 OCTOSPI1 ccipr4 "OCTOSPI1"],
+        Fmc,
+
+        Sdmmc1 [kernel clk: Sdmmc1 SDMMC ccipr4 "SDMMC1"]
+    ];
+    #[cfg(feature = "sdmmc2")]
+    AHB4, "" => [
+        Sdmmc2 [kernel clk: Sdmmc2 SDMMC ccipr4 "SDMMC2"]
+    ];
+    #[cfg(feature = "otfdec")]
+    AHB4, "" => [
+        Otfdec1
+    ];
 
     #[cfg(all())]
     APB1L, "Advanced Peripheral Bus 1L (APB1L) peripherals" => [
+        Usart2 [kernel clk: Usart2(Variant) USART ccipr1 "USART2"],
+        Usart3 [kernel clk: Usart3(Variant) USART ccipr1 "USART3"],
         Crs,
+        I3c1 [kernel clk: I3c1(Variant) I3C ccipr4 "I3C1"],
+        I2c2 [kernel clk: I2c2 I2C ccipr4 "I2C2"],
+        I2c1 [kernel clk: I2c1 I2C ccipr4 "I2C1"],
+        Spi3 [kernel clk: Spi3(Variant) SPI123 ccipr3 "SPI3"],
+        Spi2 [kernel clk: Spi2(Variant) SPI123 ccipr3 "SPI2"],
         (NoReset) Wwdg,
         Tim2, Tim3, Tim6, Tim7
     ];
     #[cfg(feature = "rm0492")]
     APB1L, "" => [
-        I3c1 [kernel clk: I3c1(Variant) I3C ccipr4 "I3C1"],
-
-        I2c1 [kernel clk: I2c1 I2C ccipr4 "I2C1"],
-        I2c2 [kernel clk: I2c2 I2C ccipr4 "I2C2"],
-
-        Usart2 [kernel clk: Usart2(Variant) USART ccipr1 "USART2"],
-        Usart3 [kernel clk: Usart3(Variant) USART ccipr1 "USART3"],
-
-        Spi2 [kernel clk: Spi2(Variant) SPI123 ccipr3 "SPI2"],
-        Spi3 [kernel clk: Spi3(Variant) SPI123 ccipr3 "SPI3"],
         Opamp,
         Comp
     ];
+    #[cfg(feature = "rm0481")]
+    APB1L, "" => [
+        Cec [kernel clk: Cec(Variant) CEC ccipr5 "CEC"],
+        Usart6 [kernel clk: Usart6(Variant) USART ccipr1 "USART6"],
+        Uart5 [kernel clk: Uart5(Variant) USART ccipr1 "USART5"],
+        Uart4 [kernel clk: Uart4(Variant) USART ccipr1 "USART4"],
+        Tim12, Tim5, Tim4
+    ];
+    #[cfg(feature = "h56x_h573")]
+    APB1L, "" => [
+        Uart8 [kernel clk: Uart8(Variant) USART ccipr1 "UART8"],
+        Uart7 [kernel clk: Uart7(Variant) USART ccipr1 "UART7"],
+        Usart11 [kernel clk: Usart11(Variant) USART ccipr2 "USART11"],
+        Usart10 [kernel clk: Usart10(Variant) USART ccipr1 "USART10"],
+        Tim14, Tim13
+    ];
 
     #[cfg(all())]
     APB1H, "Advanced Peripheral Bus 1H (APB1H) peripherals" => [
+        Fdcan [kernel clk: Fdcan(Variant) FDCAN ccipr5 "FDCAN"],
+        Lptim2 [kernel clk: Lptim2(Variant) LPTIM ccipr2 "LPTIM2"],
         Dts
     ];
-    #[cfg(feature = "rm0492")]
+    #[cfg(feature = "rm0481")]
     APB1H, "" => [
-        Lptim2 [kernel clk: Lptim2(Variant) LPTIM ccipr2 "LPTIM2"],
-        Fdcan [kernel clk: Fdcan(Variant) FDCAN ccipr5 "FDCAN"]
+        Ucpd1
+    ];
+    #[cfg(feature = "h56x_h573")]
+    APB1H, "" => [
+        Uart12 [kernel clk: Uart12(Variant) USART ccipr2 "USART12"],
+        Uart9 [kernel clk: Uart9(Variant) USART ccipr1 "UART9"]
     ];
 
     #[cfg(all())]
     APB2, "Advanced Peripheral Bus 2 (APB2) peripherals" => [
+        Usb [kernel clk: Usb USB ccipr4 "USB"],
+        Usart1 [kernel clk: Usart1(Variant) USART ccipr1 "USART1"],
+        Spi1 [kernel clk: Spi1(Variant) SPI123 ccipr3 "SPI1"],
         Tim1
     ];
-    #[cfg(feature = "rm0492")]
+    #[cfg(feature = "rm0481")]
     APB2, "" => [
-        Usb [kernel clk: Usb USB ccipr4 "USB"],
-        Usart1 [kernel clk: Usart1(Variant) USART ccipr1 "USART1"],
-        Spi1 [kernel clk: Spi1(Variant) SPI123 ccipr3 "SPI1"]
+        Sai2 [kernel clk: Sai2(Variant) SAI ccipr5 "SAI2"],
+        Sai1 [kernel clk: Sai1(Variant) SAI ccipr5 "SAI1"],
+        Spi4 [kernel clk: Spi4(Variant) SPI456 ccipr3 "SPI4"],
+        Tim15, Tim8
+    ];
+    #[cfg(feature = "h56x_h573")]
+    APB2, "" => [
+        Spi6 [kernel clk: Spi6(Variant) SPI456 ccipr3 "SPI6"],
+        Tim17, Tim16
     ];
 
     #[cfg(all())]
     APB3, "Advanced Peripheral Bus 3 (APB3) peripherals" => [
         (NoReset) RtcApb,
+        LpTim1 [kernel clk: LpTim1(Variant) LPTIM ccipr2 "LPTIM1"],
+        LpUart1 [kernel clk: LpUart1(Variant) USART ccipr3 "LPUART1"],
         (NoReset) Sbs
     ];
-    #[cfg(feature = "rm0492")]
+    #[cfg(feature = "rm0481")]
     APB3, "" => [
-        I3c2 [kernel clk: I3c2(Variant) I3C ccipr4 "I3C2"],
-        LpTim1 [kernel clk: LpTim1(Variant) LPTIM ccipr2 "LPTIM1"],
-        LpUart1 [kernel clk: LpUart1(Variant) USART ccipr3 "LPUART1"]
+        Vref,
+        I2c3 [kernel clk: I2c3 I2C ccipr4 "I2C3"]
+    ];
+    #[cfg(feature = "h56x_h573")]
+    APB3, "" => [
+        LpTim6 [kernel clk: LpTim6(Variant) LPTIM ccipr2 "LPTIM6"],
+        LpTim5 [kernel clk: LpTim5(Variant) LPTIM ccipr2 "LPTIM5"],
+        LpTim4 [kernel clk: LpTim4(Variant) LPTIM ccipr2 "LPTIM4"],
+        LpTim3 [kernel clk: LpTim3(Variant) LPTIM ccipr2 "LPTIM3"],
+        I2c4 [kernel clk: I2c4 I2C ccipr4 "I2C4"],
+        Spi5 [kernel clk: Spi5(Variant) SPI456 ccipr3 "SPI5"]
+    ];
+    #[cfg(any(feature = "rm0492", feature = "h523_h533"))]
+    APB3, "" => [
+        I3c2 [kernel clk: I3c2(Variant) I3C ccipr4 "I3C2"]
     ];
-
 }