[usb] Fixes for new STM32H5 devices with OTG USB

Author: salkinium

src/modm/platform/clock/stm32/rcc_h5.hpp.in

@@ -429,6 +429,37 @@ public:
 	}
 %% endfor
 %#
+%% if target.name in ["e4", "e5", "f4", "f5"]
+	enum class
+	UsbClockSource : uint32_t
+	{
+		Disabled = 0,
+		Pll1Q = 0b01 << RCC_CCIPR4_OTGFSSEL_Pos,
+		Pll{{pll_ids[-1]}}Q = 0b10 << RCC_CCIPR4_OTGFSSEL_Pos,
+		Hsi48 = 0b11 << RCC_CCIPR4_OTGFSSEL_Pos,
+	};
+	static inline void
+	setUsbClockSource(UsbClockSource src)
+	{
+		RCC->CCIPR4 = (RCC->CCIPR4 & ~RCC_CCIPR4_OTGFSSEL) | uint32_t(src);
+	}
+%#
+%% if target.name in ["e5", "f5"]
+	enum class
+	UsbHsClockSource : uint32_t
+	{
+		Disabled = 0,
+		Pll1Q = 0b01 << RCC_CCIPR4_OTGHSSEL_Pos,
+		Pll{{pll_ids[-1]}}Q = 0b10 << RCC_CCIPR4_OTGHSSEL_Pos,
+		Hsi48 = 0b11 << RCC_CCIPR4_OTGHSSEL_Pos,
+	};
+	static inline void
+	setUsbHsClockSource(UsbHsClockSource src)
+	{
+		RCC->CCIPR4 = (RCC->CCIPR4 & ~RCC_CCIPR4_OTGHSSEL) | uint32_t(src);
+	}
+%% endif
+%% else
 	enum class
 	UsbClockSource : uint32_t
 	{
@@ -442,7 +473,8 @@ public:
 	{
 		RCC->CCIPR4 = (RCC->CCIPR4 & ~RCC_CCIPR4_USBSEL) | uint32_t(src);
 	}
-
+%% endif
+%#
 	// CCIPR5
 	enum class
 	CanClockSource : uint32_t

src/modm/platform/usb/stm32/module.lb

@@ -68,6 +68,7 @@ def generate_instance(env, port, otg=False):
         "port": port,
         "peripheral": "Usbotg{}".format(port) if otg else "Usb",
         "is_otg": otg,
+        "has_id": "Id" in all_signals,
         "is_phyc": port == "hs" and not is_ulpi,
         "is_remap": irq_data["is_remap"],
         "irqs": irq_data["port_irqs"][port],

src/modm/platform/usb/stm32/usb.hpp.in

@@ -66,11 +66,11 @@ public:
 		using Connector = GpioConnector<Peripheral::{{ peripheral }}, Signals...>;
 		using Dp = typename Connector::template GetSignal< Gpio::Signal::Dp >;
 		using Dm = typename Connector::template GetSignal< Gpio::Signal::Dm >;
-%% if is_otg
+%% if has_id
 		using Id = typename Connector::template GetSignal< Gpio::Signal::Id >;
 %% endif
 		static constexpr bool all_usb =
-			Connector::template IsValid<Dp> and Connector::template IsValid<Dm>;
+			Connector::template IsValid<Dp> and Connector::template IsValid<Dm>{% if has_id %} and Connector::template IsValid<Id>{% endif %};
 %% if is_ulpi
 		static constexpr bool any_usb =
 			Connector::template IsValid<Dp> or Connector::template IsValid<Dm>;
@@ -90,7 +90,7 @@ public:
 %% endfor
 %#
 		static_assert((any_ulpi xor any_usb) and (all_ulpi or all_usb),
-			"{{ name }}::connect() requires at least Dp, Dm (+Id) signals OR 12 ULPI signals:\n"
+			"{{ name }}::connect() requires at least Dp, Dm{% if has_id %} (+Id){% endif %} signals OR 12 ULPI signals:\n"
 %% for signal in ulpi_signals
 			"    - {{ signal.replace("Ulpi", "") | upper }}{% if loop.last %}");{% else %}\n"{% endif %}
 %% endfor
@@ -111,7 +111,7 @@ public:
 %% set idt = ""
 %% endif
 		{{idt}}GpioSet<Dp, Dm>::configure(Gpio::OutputType::PushPull, Gpio::OutputSpeed::High);
-%% if is_otg
+%% if has_id
 		{{idt}}Id::configure(Gpio::OutputType::OpenDrain, Gpio::OutputSpeed::High);
 		{{idt}}Id::configure(Gpio::InputType::PullUp);
 %% endif