michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/usb: usb_dc_stm32: Convert to DT_INST

Browse source 
Convert usb_stm32 driver to use of DT_INST macros.

Since driver is compatible with 3 different dt compatibles and
compatible string is included in DT_INST macros, I've kept the
DT_USB_ compatible agnostic macros based on DT_INST ones, which
allowed to remove fixup definitions.
Use of DT_USB symbols is now limited to usb_dc_stm32.

Additionally, compatible "st,stm32-otgfs" is removed from list
of compatibles for usbotg_hs ips.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2020-03-04 14:15:11 +01:00 • committed by Kumar Gala
commit 9367c6ad3f
14 changed files with 51 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

8
boards/arm/olimex_stm32_e407/pinmux.c
View file

@ -41,14 +41,14 @@ static const struct pin_config pinconf[] = {
{STM32_PIN_PG14, STM32F4_PINMUX_FUNC_PG14_ETH}, {STM32_PIN_PG14, STM32F4_PINMUX_FUNC_PG14_ETH},
#endif /* CONFIG_ETH_STM32_HAL */ #endif /* CONFIG_ETH_STM32_HAL */
#ifdef CONFIG_USB_DC_STM32 #ifdef CONFIG_USB_DC_STM32
#ifdef DT_USB_BASE_ADDRESS #ifdef DT_INST_0_ST_STM32_OTGFS
{STM32_PIN_PA11, STM32F4_PINMUX_FUNC_PA11_OTG_FS_DM}, {STM32_PIN_PA11, STM32F4_PINMUX_FUNC_PA11_OTG_FS_DM},
{STM32_PIN_PA12, STM32F4_PINMUX_FUNC_PA12_OTG_FS_DP}, {STM32_PIN_PA12, STM32F4_PINMUX_FUNC_PA12_OTG_FS_DP},
#endif /* DT_USB_BASE_ADDRESS */ #endif /* DT_INST_0_ST_STM32_OTGFS */
#ifdef DT_USB_HS_BASE_ADDRESS #ifdef DT_INST_0_ST_STM32_OTGHS
{STM32_PIN_PB14, STM32F4_PINMUX_FUNC_PB14_OTG_HS_DM}, {STM32_PIN_PB14, STM32F4_PINMUX_FUNC_PB14_OTG_HS_DM},
{STM32_PIN_PB15, STM32F4_PINMUX_FUNC_PB15_OTG_HS_DP}, {STM32_PIN_PB15, STM32F4_PINMUX_FUNC_PB15_OTG_HS_DP},
#endif /* DT_USB_HS_BASE_ADDRESS */ #endif /* DT_INST_0_ST_STM32_OTGHS */
#endif /* CONFIG_USB_DC_STM32 */ #endif /* CONFIG_USB_DC_STM32 */
}; };

56
drivers/usb/device/usb_dc_stm32.c
View file

@ -55,10 +55,42 @@
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_REGISTER(usb_dc_stm32); LOG_MODULE_REGISTER(usb_dc_stm32);
#if defined(DT_USB_BASE_ADDRESS) && defined(DT_USB_HS_BASE_ADDRESS) #if defined(DT_COMPAT_ST_STM32_OTGFS) && defined(DT_COMPAT_ST_STM32_OTGHS)
#error "Only one interface should be enabled at a time, OTG FS or OTG HS" #error "Only one interface should be enabled at a time, OTG FS or OTG HS"
#endif #endif
#if defined(DT_COMPAT_ST_STM32_OTGHS)
#define DT_USB_BASE_ADDRESS DT_INST_0_ST_STM32_OTGHS_BASE_ADDRESS
#define DT_USB_IRQ DT_INST_0_ST_STM32_OTGHS_IRQ_OTGHS
#define DT_USB_IRQ_PRI DT_INST_0_ST_STM32_OTGHS_IRQ_OTGHS_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_INST_0_ST_STM32_OTGHS_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_INST_0_ST_STM32_OTGHS_RAM_SIZE
#define DT_USB_MAXIMUM_SPEED DT_INST_0_ST_STM32_OTGHS_MAXIMUM_SPEED
#define DT_USB_CLOCK_BITS DT_INST_0_ST_STM32_OTGHS_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_INST_0_ST_STM32_OTGHS_CLOCK_BUS
#elif defined(DT_COMPAT_ST_STM32_OTGFS)
#define DT_USB_BASE_ADDRESS DT_INST_0_ST_STM32_OTGFS_BASE_ADDRESS
#define DT_USB_IRQ DT_INST_0_ST_STM32_OTGFS_IRQ_OTGFS
#define DT_USB_IRQ_PRI DT_INST_0_ST_STM32_OTGFS_IRQ_OTGFS_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_INST_0_ST_STM32_OTGFS_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_INST_0_ST_STM32_OTGFS_RAM_SIZE
#define DT_USB_MAXIMUM_SPEED DT_INST_0_ST_STM32_OTGFS_MAXIMUM_SPEED
#define DT_USB_CLOCK_BITS DT_INST_0_ST_STM32_OTGFS_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_INST_0_ST_STM32_OTGFS_CLOCK_BUS
#elif defined(DT_COMPAT_ST_STM32_USB)
#define DT_USB_BASE_ADDRESS DT_INST_0_ST_STM32_USB_BASE_ADDRESS
#define DT_USB_IRQ DT_INST_0_ST_STM32_USB_IRQ_USB
#define DT_USB_IRQ_PRI DT_INST_0_ST_STM32_USB_IRQ_USB_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_INST_0_ST_STM32_USB_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_INST_0_ST_STM32_USB_RAM_SIZE
#define DT_USB_MAXIMUM_SPEED DT_INST_0_ST_STM32_USB_MAXIMUM_SPEED
#define DT_USB_CLOCK_BITS DT_INST_0_ST_STM32_USB_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_INST_0_ST_STM32_USB_CLOCK_BUS
#ifdef DT_INST_0_ST_STM32_USB_ENABLE_PIN_REMAP
#define DT_USB_ENABLE_PIN_REMAP DT_INST_0_ST_STM32_USB_ENABLE_PIN_REMAP
#endif
#endif
/* /*
* USB and USB_OTG_FS are defined in STM32Cube HAL and allows to distinguish * USB and USB_OTG_FS are defined in STM32Cube HAL and allows to distinguish
* between two kind of USB DC. STM32 F0, F3, L0 and G4 series support USB device * between two kind of USB DC. STM32 F0, F3, L0 and G4 series support USB device
@ -92,11 +124,11 @@ LOG_MODULE_REGISTER(usb_dc_stm32);
#endif /* CONFIG_SOC_SERIES_STM32L4X */ #endif /* CONFIG_SOC_SERIES_STM32L4X */
#define EP0_MPS USB_OTG_MAX_EP0_SIZE #define EP0_MPS USB_OTG_MAX_EP0_SIZE
#ifdef DT_USB_HS_BASE_ADDRESS #ifdef DT_COMPAT_ST_STM32_OTGHS
#define EP_MPS USB_OTG_HS_MAX_PACKET_SIZE #define EP_MPS USB_OTG_HS_MAX_PACKET_SIZE
#else #elif defined(DT_COMPAT_ST_STM32_OTGFS) || defined(DT_COMPAT_ST_STM32_USB)
#define EP_MPS USB_OTG_FS_MAX_PACKET_SIZE #define EP_MPS USB_OTG_FS_MAX_PACKET_SIZE
#endif /* DT_USB_HS_BASE_ADDRESS */ #endif /* DT_COMPAT_ST_STM32_OTGHS */
/* We need one RX FIFO and n TX-IN FIFOs */ /* We need one RX FIFO and n TX-IN FIFOs */
#define FIFO_NUM (1 + DT_USB_NUM_BIDIR_ENDPOINTS) #define FIFO_NUM (1 + DT_USB_NUM_BIDIR_ENDPOINTS)
@ -248,7 +280,7 @@ static int usb_dc_stm32_clock_enable(void)
return -EIO; return -EIO;
} }
#ifdef DT_USB_HS_BASE_ADDRESS #ifdef DT_COMPAT_ST_STM32_OTGHS
#ifdef DT_COMPAT_ST_STM32_USBPHYC #ifdef DT_COMPAT_ST_STM32_USBPHYC
@ -260,7 +292,7 @@ static int usb_dc_stm32_clock_enable(void)
LL_AHB1_GRP1_DisableClockLowPower(LL_AHB1_GRP1_PERIPH_OTGHSULPI); LL_AHB1_GRP1_DisableClockLowPower(LL_AHB1_GRP1_PERIPH_OTGHSULPI);
#endif /* DT_COMPAT_ST_STM32_USBPHYC */ #endif /* DT_COMPAT_ST_STM32_USBPHYC */
#endif /* DT_USB_HS_BASE_ADDRESS */ #endif /* DT_COMPAT_ST_STM32_OTGHS */
return 0; return 0;
} }
@ -272,22 +304,22 @@ static u32_t usb_dc_stm32_get_maximum_speed(void)
* If max-speed is not passed via DT, set it to USB controller's * If max-speed is not passed via DT, set it to USB controller's
* maximum hardware capability. * maximum hardware capability.
*/ */
#if defined(DT_COMPAT_ST_STM32_USBPHYC) && defined(DT_USB_HS_BASE_ADDRESS) #if defined(DT_COMPAT_ST_STM32_USBPHYC) && defined(DT_COMPAT_ST_STM32_OTGHS)
u32_t speed = USB_OTG_SPEED_HIGH; u32_t speed = USB_OTG_SPEED_HIGH;
#else #else
u32_t speed = USB_OTG_SPEED_FULL; u32_t speed = USB_OTG_SPEED_FULL;
#endif /* DT_COMPAT_ST_STM32_USBPHYC && DT_USB_HS_BASE_ADDRESS */ #endif /* DT_COMPAT_ST_STM32_USBPHYC && DT_COMPAT_ST_STM32_OTGHS */
#ifdef DT_USB_MAXIMUM_SPEED #ifdef DT_USB_MAXIMUM_SPEED
if (!strncmp(DT_USB_MAXIMUM_SPEED, "high-speed", 10)) { if (!strncmp(DT_USB_MAXIMUM_SPEED, "high-speed", 10)) {
speed = USB_OTG_SPEED_HIGH; speed = USB_OTG_SPEED_HIGH;
} else if (!strncmp(DT_USB_MAXIMUM_SPEED, "full-speed", 10)) { } else if (!strncmp(DT_USB_MAXIMUM_SPEED, "full-speed", 10)) {
#if defined(DT_COMPAT_ST_STM32_USBPHYC) && defined(DT_USB_HS_BASE_ADDRESS) #if defined(DT_COMPAT_ST_STM32_USBPHYC) && defined(DT_COMPAT_ST_STM32_OTGHS)
speed = USB_OTG_SPEED_HIGH_IN_FULL; speed = USB_OTG_SPEED_HIGH_IN_FULL;
#else #else
speed = USB_OTG_SPEED_FULL; speed = USB_OTG_SPEED_FULL;
#endif /* DT_COMPAT_ST_STM32_USBPHYC && DT_USB_HS_BASE_ADDRESS */ #endif /* DT_COMPAT_ST_STM32_USBPHYC && DT_COMPAT_ST_STM32_OTGHS */
} else { } else {
LOG_DBG("Unsupported maximum speed defined in device tree. " LOG_DBG("Unsupported maximum speed defined in device tree. "
"USB controller will default to its maximum HW " "USB controller will default to its maximum HW "
@ -312,14 +344,14 @@ static int usb_dc_stm32_init(void)
usb_dc_stm32_state.pcd.Init.ep0_mps = PCD_EP0MPS_64; usb_dc_stm32_state.pcd.Init.ep0_mps = PCD_EP0MPS_64;
usb_dc_stm32_state.pcd.Init.low_power_enable = 0; usb_dc_stm32_state.pcd.Init.low_power_enable = 0;
#else /* USB_OTG_FS || USB_OTG_HS */ #else /* USB_OTG_FS || USB_OTG_HS */
#ifdef DT_USB_HS_BASE_ADDRESS #ifdef DT_COMPAT_ST_STM32_OTGHS
usb_dc_stm32_state.pcd.Instance = USB_OTG_HS; usb_dc_stm32_state.pcd.Instance = USB_OTG_HS;
#else #else
usb_dc_stm32_state.pcd.Instance = USB_OTG_FS; usb_dc_stm32_state.pcd.Instance = USB_OTG_FS;
#endif #endif
usb_dc_stm32_state.pcd.Init.dev_endpoints = DT_USB_NUM_BIDIR_ENDPOINTS; usb_dc_stm32_state.pcd.Init.dev_endpoints = DT_USB_NUM_BIDIR_ENDPOINTS;
usb_dc_stm32_state.pcd.Init.speed = usb_dc_stm32_get_maximum_speed(); usb_dc_stm32_state.pcd.Init.speed = usb_dc_stm32_get_maximum_speed();
#if defined(DT_COMPAT_ST_STM32_USBPHYC) && defined(DT_USB_HS_BASE_ADDRESS) #if defined(DT_COMPAT_ST_STM32_USBPHYC) && defined(DT_COMPAT_ST_STM32_OTGHS)
usb_dc_stm32_state.pcd.Init.phy_itface = USB_OTG_HS_EMBEDDED_PHY; usb_dc_stm32_state.pcd.Init.phy_itface = USB_OTG_HS_EMBEDDED_PHY;
#else #else
usb_dc_stm32_state.pcd.Init.phy_itface = PCD_PHY_EMBEDDED; usb_dc_stm32_state.pcd.Init.phy_itface = PCD_PHY_EMBEDDED;

2
dts/arm/st/f4/stm32f405.dtsi
View file

@ -163,7 +163,7 @@
}; };
usbotg_hs: usb@40040000 { usbotg_hs: usb@40040000 {
compatible = "st,stm32-otghs", "st,stm32-otgfs"; compatible = "st,stm32-otghs";
reg = <0x40040000 0x40000>; reg = <0x40040000 0x40000>;
interrupts = <77 0>, <74 0>, <75 0>; interrupts = <77 0>, <74 0>, <75 0>;
interrupt-names = "otghs", "ep1_out", "ep1_in"; interrupt-names = "otghs", "ep1_out", "ep1_in";

2
dts/arm/st/f4/stm32f446.dtsi
View file

@ -31,7 +31,7 @@
}; };
usbotg_hs: usb@40040000 { usbotg_hs: usb@40040000 {
compatible = "st,stm32-otghs", "st,stm32-otgfs"; compatible = "st,stm32-otghs";
reg = <0x40040000 0x40000>; reg = <0x40040000 0x40000>;
interrupts = <77 0>, <74 0>, <75 0>; interrupts = <77 0>, <74 0>, <75 0>;
interrupt-names = "otghs", "ep1_out", "ep1_in"; interrupt-names = "otghs", "ep1_out", "ep1_in";

2
dts/arm/st/f7/stm32f7.dtsi
View file

@ -586,7 +586,7 @@
}; };
usbotg_hs: usb@40040000 { usbotg_hs: usb@40040000 {
compatible = "st,stm32-otghs", "st,stm32-otgfs"; compatible = "st,stm32-otghs";
reg = <0x40040000 0x40000>; reg = <0x40040000 0x40000>;
interrupts = <77 0>, <74 0>, <75 0>; interrupts = <77 0>, <74 0>, <75 0>;
interrupt-names = "otghs", "ep1_out", "ep1_in"; interrupt-names = "otghs", "ep1_out", "ep1_in";

12
soc/arm/st_stm32/stm32f0/dts_fixup.h
View file

@ -88,18 +88,6 @@
#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F0_FLASH_CONTROLLER_LABEL #define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F0_FLASH_CONTROLLER_LABEL
#define DT_USB_BASE_ADDRESS DT_ST_STM32_USB_40005C00_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_USB_40005C00_IRQ_USB
#define DT_USB_IRQ_PRI DT_ST_STM32_USB_40005C00_IRQ_USB_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_USB_40005C00_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_USB_40005C00_RAM_SIZE
#define DT_USB_CLOCK_BITS DT_ST_STM32_USB_40005C00_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_USB_40005C00_CLOCK_BUS
#ifdef DT_ST_STM32_USB_40005C00_ENABLE_PIN_REMAP
#define DT_USB_ENABLE_PIN_REMAP DT_ST_STM32_USB_40005C00_ENABLE_PIN_REMAP
#endif /* ST_STM32_USB_40005C00_ENABLE_PIN_REMAP */
#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL
/* End of SoC Level DTS fixup file */ /* End of SoC Level DTS fixup file */

8
soc/arm/st_stm32/stm32f1/dts_fixup.h
View file

@ -87,14 +87,6 @@
#define DT_I2C_2_CLOCK_BITS DT_ST_STM32_I2C_V1_40005800_CLOCK_BITS #define DT_I2C_2_CLOCK_BITS DT_ST_STM32_I2C_V1_40005800_CLOCK_BITS
#define DT_I2C_2_CLOCK_BUS DT_ST_STM32_I2C_V1_40005800_CLOCK_BUS #define DT_I2C_2_CLOCK_BUS DT_ST_STM32_I2C_V1_40005800_CLOCK_BUS
#define DT_USB_BASE_ADDRESS DT_ST_STM32_USB_40005C00_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_USB_40005C00_IRQ_USB
#define DT_USB_IRQ_PRI DT_ST_STM32_USB_40005C00_IRQ_USB_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_USB_40005C00_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_USB_40005C00_RAM_SIZE
#define DT_USB_CLOCK_BITS DT_ST_STM32_USB_40005C00_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_USB_40005C00_CLOCK_BUS
#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL
#define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS #define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS

9
soc/arm/st_stm32/stm32f2/dts_fixup.h
View file

@ -85,15 +85,6 @@
#define DT_GPIO_STM32_GPIOI_CLOCK_BITS DT_ST_STM32_GPIO_40022000_CLOCK_BITS #define DT_GPIO_STM32_GPIOI_CLOCK_BITS DT_ST_STM32_GPIO_40022000_CLOCK_BITS
#define DT_GPIO_STM32_GPIOI_CLOCK_BUS DT_ST_STM32_GPIO_40022000_CLOCK_BUS #define DT_GPIO_STM32_GPIOI_CLOCK_BUS DT_ST_STM32_GPIO_40022000_CLOCK_BUS
#define DT_USB_BASE_ADDRESS DT_ST_STM32_OTGFS_50000000_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_OTGFS_50000000_IRQ_OTGFS
#define DT_USB_IRQ_PRI DT_ST_STM32_OTGFS_50000000_IRQ_OTGFS_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_OTGFS_50000000_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_OTGFS_50000000_RAM_SIZE
#define DT_USB_MAXIMUM_SPEED DT_ST_STM32_OTGFS_50000000_MAXIMUM_SPEED
#define DT_USB_CLOCK_BITS DT_ST_STM32_OTGFS_50000000_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_OTGFS_50000000_CLOCK_BUS
#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL
/* End of SoC Level DTS fixup file */ /* End of SoC Level DTS fixup file */

8
soc/arm/st_stm32/stm32f3/dts_fixup.h
View file

@ -90,14 +90,6 @@
#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F3_FLASH_CONTROLLER_LABEL #define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F3_FLASH_CONTROLLER_LABEL
#define DT_USB_BASE_ADDRESS DT_ST_STM32_USB_40005C00_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_USB_40005C00_IRQ_USB
#define DT_USB_IRQ_PRI DT_ST_STM32_USB_40005C00_IRQ_USB_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_USB_40005C00_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_USB_40005C00_RAM_SIZE
#define DT_USB_CLOCK_BITS DT_ST_STM32_USB_40005C00_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_USB_40005C00_CLOCK_BUS
#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL #define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL
#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL

24
soc/arm/st_stm32/stm32f4/dts_fixup.h
View file

@ -271,30 +271,6 @@
#define DT_I2S_6_DMA_FEATURES_RX \ #define DT_I2S_6_DMA_FEATURES_RX \
DT_ST_STM32_I2S_40015400_RX_DMAS_FEATURES DT_ST_STM32_I2S_40015400_RX_DMAS_FEATURES
#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F4_FLASH_CONTROLLER_LABEL
#ifdef DT_ST_STM32_OTGFS_50000000_BASE_ADDRESS
#define DT_USB_BASE_ADDRESS DT_ST_STM32_OTGFS_50000000_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_OTGFS_50000000_IRQ_OTGFS
#define DT_USB_IRQ_PRI DT_ST_STM32_OTGFS_50000000_IRQ_OTGFS_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_OTGFS_50000000_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_OTGFS_50000000_RAM_SIZE
#define DT_USB_MAXIMUM_SPEED DT_ST_STM32_OTGFS_50000000_MAXIMUM_SPEED
#define DT_USB_CLOCK_BITS DT_ST_STM32_OTGFS_50000000_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_OTGFS_50000000_CLOCK_BUS
#endif /* DT_ST_STM32_OTGFS_50000000_BASE_ADDRESS */
#ifdef DT_ST_STM32_OTGHS_40040000_BASE_ADDRESS
#define DT_USB_HS_BASE_ADDRESS DT_ST_STM32_OTGHS_40040000_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_OTGHS_40040000_IRQ_OTGHS
#define DT_USB_IRQ_PRI DT_ST_STM32_OTGHS_40040000_IRQ_OTGHS_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_OTGHS_40040000_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_OTGHS_40040000_RAM_SIZE
#define DT_USB_MAXIMUM_SPEED DT_ST_STM32_OTGHS_40040000_MAXIMUM_SPEED
#define DT_USB_CLOCK_BITS DT_ST_STM32_OTGHS_40040000_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_OTGHS_40040000_CLOCK_BUS
#endif /* DT_ST_STM32_OTGHS_40040000_BASE_ADDRESS */
#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL #define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL
#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL

22
soc/arm/st_stm32/stm32f7/dts_fixup.h
View file

@ -145,28 +145,6 @@
#define DT_I2C_4_CLOCK_BITS DT_ST_STM32_I2C_V2_40006000_CLOCK_BITS #define DT_I2C_4_CLOCK_BITS DT_ST_STM32_I2C_V2_40006000_CLOCK_BITS
#define DT_I2C_4_CLOCK_BUS DT_ST_STM32_I2C_V2_40006000_CLOCK_BUS #define DT_I2C_4_CLOCK_BUS DT_ST_STM32_I2C_V2_40006000_CLOCK_BUS
#ifdef DT_ST_STM32_OTGFS_50000000_BASE_ADDRESS
#define DT_USB_BASE_ADDRESS DT_ST_STM32_OTGFS_50000000_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_OTGFS_50000000_IRQ_OTGFS
#define DT_USB_IRQ_PRI DT_ST_STM32_OTGFS_50000000_IRQ_OTGFS_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_OTGFS_50000000_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_OTGFS_50000000_RAM_SIZE
#define DT_USB_MAXIMUM_SPEED DT_ST_STM32_OTGFS_50000000_MAXIMUM_SPEED
#define DT_USB_CLOCK_BITS DT_ST_STM32_OTGFS_50000000_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_OTGFS_50000000_CLOCK_BUS
#endif /* DT_ST_STM32_OTGFS_50000000_BASE_ADDRESS */
#ifdef DT_ST_STM32_OTGHS_40040000_BASE_ADDRESS
#define DT_USB_HS_BASE_ADDRESS DT_ST_STM32_OTGHS_40040000_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_OTGHS_40040000_IRQ_OTGHS
#define DT_USB_IRQ_PRI DT_ST_STM32_OTGHS_40040000_IRQ_OTGHS_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_OTGHS_40040000_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_OTGHS_40040000_RAM_SIZE
#define DT_USB_MAXIMUM_SPEED DT_ST_STM32_OTGHS_40040000_MAXIMUM_SPEED
#define DT_USB_CLOCK_BITS DT_ST_STM32_OTGHS_40040000_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_OTGHS_40040000_CLOCK_BUS
#endif /* DT_ST_STM32_OTGHS_40040000_BASE_ADDRESS */
#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL #define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL
#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F7_FLASH_CONTROLLER_LABEL #define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F7_FLASH_CONTROLLER_LABEL

8
soc/arm/st_stm32/stm32g4/dts_fixup.h
View file

@ -105,14 +105,6 @@
#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL #define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL
#define DT_USB_BASE_ADDRESS DT_ST_STM32_USB_40005C00_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_USB_40005C00_IRQ_USB
#define DT_USB_IRQ_PRI DT_ST_STM32_USB_40005C00_IRQ_USB_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_USB_40005C00_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_USB_40005C00_RAM_SIZE
#define DT_USB_CLOCK_BITS DT_ST_STM32_USB_40005C00_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_USB_40005C00_CLOCK_BUS
#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL
/* End of SoC Level DTS fixup file */ /* End of SoC Level DTS fixup file */

8
soc/arm/st_stm32/stm32l0/dts_fixup.h
View file

@ -84,14 +84,6 @@
#define DT_I2C_3_CLOCK_BITS DT_ST_STM32_I2C_V2_40007800_CLOCK_BITS #define DT_I2C_3_CLOCK_BITS DT_ST_STM32_I2C_V2_40007800_CLOCK_BITS
#define DT_I2C_3_CLOCK_BUS DT_ST_STM32_I2C_V2_40007800_CLOCK_BUS #define DT_I2C_3_CLOCK_BUS DT_ST_STM32_I2C_V2_40007800_CLOCK_BUS
#define DT_USB_BASE_ADDRESS DT_ST_STM32_USB_40005C00_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_USB_40005C00_IRQ_USB
#define DT_USB_IRQ_PRI DT_ST_STM32_USB_40005C00_IRQ_USB_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_USB_40005C00_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_USB_40005C00_RAM_SIZE
#define DT_USB_CLOCK_BITS DT_ST_STM32_USB_40005C00_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_USB_40005C00_CLOCK_BUS
#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL
/* End of SoC Level DTS fixup file */ /* End of SoC Level DTS fixup file */

21
soc/arm/st_stm32/stm32l4/dts_fixup.h
View file

@ -129,27 +129,6 @@
#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32L4_FLASH_CONTROLLER_LABEL #define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32L4_FLASH_CONTROLLER_LABEL
#if defined(DT_ST_STM32_USB_40006800_BASE_ADDRESS)
#define DT_USB_BASE_ADDRESS DT_ST_STM32_USB_40006800_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_USB_40006800_IRQ_USB
#define DT_USB_IRQ_PRI DT_ST_STM32_USB_40006800_IRQ_USB_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_USB_40006800_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_USB_40006800_RAM_SIZE
#define DT_USB_CLOCK_BITS DT_ST_STM32_USB_40006800_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_USB_40006800_CLOCK_BUS
#endif
#if defined(DT_ST_STM32_OTGFS_50000000_BASE_ADDRESS)
#define DT_USB_BASE_ADDRESS DT_ST_STM32_OTGFS_50000000_BASE_ADDRESS
#define DT_USB_IRQ DT_ST_STM32_OTGFS_50000000_IRQ_OTGFS
#define DT_USB_IRQ_PRI DT_ST_STM32_OTGFS_50000000_IRQ_OTGFS_PRIORITY
#define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_OTGFS_50000000_NUM_BIDIR_ENDPOINTS
#define DT_USB_RAM_SIZE DT_ST_STM32_OTGFS_50000000_RAM_SIZE
#define DT_USB_MAXIMUM_SPEED DT_ST_STM32_OTGFS_50000000_MAXIMUM_SPEED
#define DT_USB_CLOCK_BITS DT_ST_STM32_OTGFS_50000000_CLOCK_BITS
#define DT_USB_CLOCK_BUS DT_ST_STM32_OTGFS_50000000_CLOCK_BUS
#endif
#define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS #define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS
#define DT_CAN_1_BUS_SPEED DT_ST_STM32_CAN_40006400_BUS_SPEED #define DT_CAN_1_BUS_SPEED DT_ST_STM32_CAN_40006400_BUS_SPEED
#define DT_CAN_1_NAME DT_ST_STM32_CAN_40006400_LABEL #define DT_CAN_1_NAME DT_ST_STM32_CAN_40006400_LABEL