From c2f19dc52e9189ebcebe0c46b523b148e24f78ed Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Fri, 28 Feb 2020 14:22:32 +0100 Subject: [PATCH] drivers: spi: spi_stm32: convert to DT_INST defines Convert driver to use DT_INST_ defines. Signed-off-by: Erwan Gouriou --- drivers/spi/spi_ll_stm32.c | 42 ++++++++--------- soc/arm/st_stm32/stm32f0/dts_fixup.h | 15 ------- soc/arm/st_stm32/stm32f1/dts_fixup.h | 21 --------- soc/arm/st_stm32/stm32f3/dts_fixup.h | 28 ------------ soc/arm/st_stm32/stm32f4/dts_fixup.h | 42 ----------------- soc/arm/st_stm32/stm32f7/dts_fixup.h | 42 ----------------- soc/arm/st_stm32/stm32g4/dts_fixup.h | 21 --------- soc/arm/st_stm32/stm32l0/dts_fixup.h | 14 ------ soc/arm/st_stm32/stm32l1/dts_fixup.h | 14 ------ soc/arm/st_stm32/stm32l4/dts_fixup.h | 21 --------- soc/arm/st_stm32/stm32mp1/dts_fixup.h | 65 --------------------------- soc/arm/st_stm32/stm32wb/dts_fixup.h | 14 ------ 12 files changed, 22 insertions(+), 317 deletions(-) diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c index 5b16df8d5b6..a6702374fe6 100644 --- a/drivers/spi/spi_ll_stm32.c +++ b/drivers/spi/spi_ll_stm32.c @@ -506,9 +506,10 @@ static int spi_stm32_init(struct device *dev) #define STM32_SPI_IRQ_HANDLER(id) \ static void spi_stm32_irq_config_func_##id(struct device *dev) \ { \ - IRQ_CONNECT(DT_SPI_##id##_IRQ, DT_SPI_##id##_IRQ_PRI, \ + IRQ_CONNECT(DT_INST_##id##_ST_STM32_SPI_IRQ_0, \ + DT_INST_##id##_ST_STM32_SPI_IRQ_0_PRIORITY, \ spi_stm32_isr, DEVICE_GET(spi_stm32_##id), 0); \ - irq_enable(DT_SPI_##id##_IRQ); \ + irq_enable(DT_INST_##id##_ST_STM32_SPI_IRQ_0); \ } #else #define STM32_SPI_IRQ_HANDLER_DECL(id) @@ -520,10 +521,10 @@ static void spi_stm32_irq_config_func_##id(struct device *dev) \ STM32_SPI_IRQ_HANDLER_DECL(id); \ \ static const struct spi_stm32_config spi_stm32_cfg_##id = { \ - .spi = (SPI_TypeDef *) DT_SPI_##id##_BASE_ADDRESS, \ + .spi = (SPI_TypeDef *) DT_INST_##id##_ST_STM32_SPI_BASE_ADDRESS,\ .pclken = { \ - .enr = DT_SPI_##id##_CLOCK_BITS, \ - .bus = DT_SPI_##id##_CLOCK_BUS \ + .enr = DT_INST_##id##_ST_STM32_SPI_CLOCK_BITS, \ + .bus = DT_INST_##id##_ST_STM32_SPI_CLOCK_BUS \ }, \ STM32_SPI_IRQ_HANDLER_FUNC(id) \ }; \ @@ -533,33 +534,34 @@ static struct spi_stm32_data spi_stm32_dev_data_##id = { \ SPI_CONTEXT_INIT_SYNC(spi_stm32_dev_data_##id, ctx), \ }; \ \ -DEVICE_AND_API_INIT(spi_stm32_##id, DT_SPI_##id##_NAME, &spi_stm32_init, \ +DEVICE_AND_API_INIT(spi_stm32_##id, DT_INST_##id##_ST_STM32_SPI_LABEL, \ + &spi_stm32_init, \ &spi_stm32_dev_data_##id, &spi_stm32_cfg_##id, \ POST_KERNEL, CONFIG_SPI_INIT_PRIORITY, \ &api_funcs); \ \ STM32_SPI_IRQ_HANDLER(id) -#ifdef CONFIG_SPI_1 +#ifdef DT_INST_0_ST_STM32_SPI +STM32_SPI_INIT(0) +#endif /* DT_INST_0_ST_STM32_SPI */ + +#ifdef DT_INST_1_ST_STM32_SPI STM32_SPI_INIT(1) -#endif +#endif /* DT_INST_1_ST_STM32_SPI */ -#ifdef CONFIG_SPI_2 +#ifdef DT_INST_2_ST_STM32_SPI STM32_SPI_INIT(2) -#endif +#endif /* DT_INST_2_ST_STM32_SPI */ -#ifdef CONFIG_SPI_3 +#ifdef DT_INST_3_ST_STM32_SPI STM32_SPI_INIT(3) -#endif +#endif /* DT_INST_3_ST_STM32_SPI */ -#ifdef CONFIG_SPI_4 +#ifdef DT_INST_4_ST_STM32_SPI STM32_SPI_INIT(4) -#endif +#endif /* DT_INST_4_ST_STM32_SPI */ -#ifdef CONFIG_SPI_5 +#ifdef DT_INST_5_ST_STM32_SPI STM32_SPI_INIT(5) -#endif - -#ifdef CONFIG_SPI_6 -STM32_SPI_INIT(6) -#endif +#endif /* DT_INST_5_ST_STM32_SPI */ diff --git a/soc/arm/st_stm32/stm32f0/dts_fixup.h b/soc/arm/st_stm32/stm32f0/dts_fixup.h index 76699c422e9..1fd1359b847 100644 --- a/soc/arm/st_stm32/stm32f0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f0/dts_fixup.h @@ -92,21 +92,6 @@ #define DT_I2C_2_CLOCK_BITS DT_ST_STM32_I2C_V2_40005800_CLOCK_BITS #define DT_I2C_2_CLOCK_BUS DT_ST_STM32_I2C_V2_40005800_CLOCK_BUS -#define DT_SPI_1_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40013000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI DT_ST_STM32_SPI_FIFO_40013000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME DT_ST_STM32_SPI_FIFO_40013000_LABEL -#define DT_SPI_1_IRQ DT_ST_STM32_SPI_FIFO_40013000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40013000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40013000_CLOCK_BUS - - -#define DT_SPI_2_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40003800_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI DT_ST_STM32_SPI_FIFO_40003800_IRQ_0_PRIORITY -#define DT_SPI_2_NAME DT_ST_STM32_SPI_FIFO_40003800_LABEL -#define DT_SPI_2_IRQ DT_ST_STM32_SPI_FIFO_40003800_IRQ_0 -#define DT_SPI_2_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40003800_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40003800_CLOCK_BUS - #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_NAME DT_ST_STM32_CAN_40006400_LABEL diff --git a/soc/arm/st_stm32/stm32f1/dts_fixup.h b/soc/arm/st_stm32/stm32f1/dts_fixup.h index 332731603f5..6455d96c03a 100644 --- a/soc/arm/st_stm32/stm32f1/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f1/dts_fixup.h @@ -132,27 +132,6 @@ #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_SPI_1_BASE_ADDRESS DT_ST_STM32_SPI_40013000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI DT_ST_STM32_SPI_40013000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME DT_ST_STM32_SPI_40013000_LABEL -#define DT_SPI_1_IRQ DT_ST_STM32_SPI_40013000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS DT_ST_STM32_SPI_40013000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS DT_ST_STM32_SPI_40013000_CLOCK_BUS - -#define DT_SPI_2_BASE_ADDRESS DT_ST_STM32_SPI_40003800_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI DT_ST_STM32_SPI_40003800_IRQ_0_PRIORITY -#define DT_SPI_2_NAME DT_ST_STM32_SPI_40003800_LABEL -#define DT_SPI_2_IRQ DT_ST_STM32_SPI_40003800_IRQ_0 -#define DT_SPI_2_CLOCK_BITS DT_ST_STM32_SPI_40003800_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS DT_ST_STM32_SPI_40003800_CLOCK_BUS - -#define DT_SPI_3_BASE_ADDRESS DT_ST_STM32_SPI_40003C00_BASE_ADDRESS -#define DT_SPI_3_IRQ_PRI DT_ST_STM32_SPI_40003C00_IRQ_0_PRIORITY -#define DT_SPI_3_NAME DT_ST_STM32_SPI_40003C00_LABEL -#define DT_SPI_3_IRQ DT_ST_STM32_SPI_40003C00_IRQ_0 -#define DT_SPI_3_CLOCK_BITS DT_ST_STM32_SPI_40003C00_CLOCK_BITS -#define DT_SPI_3_CLOCK_BUS DT_ST_STM32_SPI_40003C00_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 diff --git a/soc/arm/st_stm32/stm32f3/dts_fixup.h b/soc/arm/st_stm32/stm32f3/dts_fixup.h index 6f855a3dcfa..cdf5d3cf857 100644 --- a/soc/arm/st_stm32/stm32f3/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f3/dts_fixup.h @@ -115,34 +115,6 @@ #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_SPI_1_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40013000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI DT_ST_STM32_SPI_FIFO_40013000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME DT_ST_STM32_SPI_FIFO_40013000_LABEL -#define DT_SPI_1_IRQ DT_ST_STM32_SPI_FIFO_40013000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40013000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40013000_CLOCK_BUS - -#define DT_SPI_2_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40003800_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI DT_ST_STM32_SPI_FIFO_40003800_IRQ_0_PRIORITY -#define DT_SPI_2_NAME DT_ST_STM32_SPI_FIFO_40003800_LABEL -#define DT_SPI_2_IRQ DT_ST_STM32_SPI_FIFO_40003800_IRQ_0 -#define DT_SPI_2_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40003800_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40003800_CLOCK_BUS - -#define DT_SPI_3_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40003C00_BASE_ADDRESS -#define DT_SPI_3_IRQ_PRI DT_ST_STM32_SPI_FIFO_40003C00_IRQ_0_PRIORITY -#define DT_SPI_3_NAME DT_ST_STM32_SPI_FIFO_40003C00_LABEL -#define DT_SPI_3_IRQ DT_ST_STM32_SPI_FIFO_40003C00_IRQ_0 -#define DT_SPI_3_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40003C00_CLOCK_BITS -#define DT_SPI_3_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40003C00_CLOCK_BUS - -#define DT_SPI_4_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40013C00_BASE_ADDRESS -#define DT_SPI_4_IRQ_PRI DT_ST_STM32_SPI_FIFO_40013C00_IRQ_0_PRIORITY -#define DT_SPI_4_NAME DT_ST_STM32_SPI_FIFO_40013C00_LABEL -#define DT_SPI_4_IRQ DT_ST_STM32_SPI_FIFO_40013C00_IRQ_0 -#define DT_SPI_4_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40013C00_CLOCK_BITS -#define DT_SPI_4_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40013C00_CLOCK_BUS - #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 diff --git a/soc/arm/st_stm32/stm32f4/dts_fixup.h b/soc/arm/st_stm32/stm32f4/dts_fixup.h index 932a2590003..a7ae2e50537 100644 --- a/soc/arm/st_stm32/stm32f4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f4/dts_fixup.h @@ -196,48 +196,6 @@ #define DT_I2C_3_CLOCK_BITS DT_ST_STM32_I2C_V1_40005C00_CLOCK_BITS #define DT_I2C_3_CLOCK_BUS DT_ST_STM32_I2C_V1_40005C00_CLOCK_BUS -#define DT_SPI_1_BASE_ADDRESS DT_ST_STM32_SPI_40013000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI DT_ST_STM32_SPI_40013000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME DT_ST_STM32_SPI_40013000_LABEL -#define DT_SPI_1_IRQ DT_ST_STM32_SPI_40013000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS DT_ST_STM32_SPI_40013000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS DT_ST_STM32_SPI_40013000_CLOCK_BUS - -#define DT_SPI_2_BASE_ADDRESS DT_ST_STM32_SPI_40003800_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI DT_ST_STM32_SPI_40003800_IRQ_0_PRIORITY -#define DT_SPI_2_NAME DT_ST_STM32_SPI_40003800_LABEL -#define DT_SPI_2_IRQ DT_ST_STM32_SPI_40003800_IRQ_0 -#define DT_SPI_2_CLOCK_BITS DT_ST_STM32_SPI_40003800_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS DT_ST_STM32_SPI_40003800_CLOCK_BUS - -#define DT_SPI_3_BASE_ADDRESS DT_ST_STM32_SPI_40003C00_BASE_ADDRESS -#define DT_SPI_3_IRQ_PRI DT_ST_STM32_SPI_40003C00_IRQ_0_PRIORITY -#define DT_SPI_3_NAME DT_ST_STM32_SPI_40003C00_LABEL -#define DT_SPI_3_IRQ DT_ST_STM32_SPI_40003C00_IRQ_0 -#define DT_SPI_3_CLOCK_BITS DT_ST_STM32_SPI_40003C00_CLOCK_BITS -#define DT_SPI_3_CLOCK_BUS DT_ST_STM32_SPI_40003C00_CLOCK_BUS - -#define DT_SPI_4_BASE_ADDRESS DT_ST_STM32_SPI_40013400_BASE_ADDRESS -#define DT_SPI_4_IRQ_PRI DT_ST_STM32_SPI_40013400_IRQ_0_PRIORITY -#define DT_SPI_4_NAME DT_ST_STM32_SPI_40013400_LABEL -#define DT_SPI_4_IRQ DT_ST_STM32_SPI_40013400_IRQ_0 -#define DT_SPI_4_CLOCK_BITS DT_ST_STM32_SPI_40013400_CLOCK_BITS -#define DT_SPI_4_CLOCK_BUS DT_ST_STM32_SPI_40013400_CLOCK_BUS - -#define DT_SPI_5_BASE_ADDRESS DT_ST_STM32_SPI_40015000_BASE_ADDRESS -#define DT_SPI_5_IRQ_PRI DT_ST_STM32_SPI_40015000_IRQ_0_PRIORITY -#define DT_SPI_5_NAME DT_ST_STM32_SPI_40015000_LABEL -#define DT_SPI_5_IRQ DT_ST_STM32_SPI_40015000_IRQ_0 -#define DT_SPI_5_CLOCK_BITS DT_ST_STM32_SPI_40015000_CLOCK_BITS -#define DT_SPI_5_CLOCK_BUS DT_ST_STM32_SPI_40015000_CLOCK_BUS - -#define DT_SPI_6_BASE_ADDRESS DT_ST_STM32_SPI_40015400_BASE_ADDRESS -#define DT_SPI_6_IRQ_PRI DT_ST_STM32_SPI_40015400_IRQ_0_PRIORITY -#define DT_SPI_6_NAME DT_ST_STM32_SPI_40015400_LABEL -#define DT_SPI_6_IRQ DT_ST_STM32_SPI_40015400_IRQ_0 -#define DT_SPI_6_CLOCK_BITS DT_ST_STM32_SPI_40015400_CLOCK_BITS -#define DT_SPI_6_CLOCK_BUS DT_ST_STM32_SPI_40015400_CLOCK_BUS - #define DT_I2S_1_BASE_ADDRESS DT_ST_STM32_I2S_40013000_BASE_ADDRESS #define DT_I2S_1_IRQ_PRI DT_ST_STM32_I2S_40013000_IRQ_0_PRIORITY #define DT_I2S_1_NAME DT_ST_STM32_I2S_40013000_LABEL diff --git a/soc/arm/st_stm32/stm32f7/dts_fixup.h b/soc/arm/st_stm32/stm32f7/dts_fixup.h index 3dc91f10ed4..f2754e3f8bd 100644 --- a/soc/arm/st_stm32/stm32f7/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f7/dts_fixup.h @@ -217,48 +217,6 @@ #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_SPI_1_BASE_ADDRESS DT_ST_STM32_SPI_40013000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI DT_ST_STM32_SPI_40013000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME DT_ST_STM32_SPI_40013000_LABEL -#define DT_SPI_1_IRQ DT_ST_STM32_SPI_40013000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS DT_ST_STM32_SPI_40013000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS DT_ST_STM32_SPI_40013000_CLOCK_BUS - -#define DT_SPI_2_BASE_ADDRESS DT_ST_STM32_SPI_40003800_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI DT_ST_STM32_SPI_40003800_IRQ_0_PRIORITY -#define DT_SPI_2_NAME DT_ST_STM32_SPI_40003800_LABEL -#define DT_SPI_2_IRQ DT_ST_STM32_SPI_40003800_IRQ_0 -#define DT_SPI_2_CLOCK_BITS DT_ST_STM32_SPI_40003800_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS DT_ST_STM32_SPI_40003800_CLOCK_BUS - -#define DT_SPI_3_BASE_ADDRESS DT_ST_STM32_SPI_40003C00_BASE_ADDRESS -#define DT_SPI_3_IRQ_PRI DT_ST_STM32_SPI_40003C00_IRQ_0_PRIORITY -#define DT_SPI_3_NAME DT_ST_STM32_SPI_40003C00_LABEL -#define DT_SPI_3_IRQ DT_ST_STM32_SPI_40003C00_IRQ_0 -#define DT_SPI_3_CLOCK_BITS DT_ST_STM32_SPI_40003C00_CLOCK_BITS -#define DT_SPI_3_CLOCK_BUS DT_ST_STM32_SPI_40003C00_CLOCK_BUS - -#define DT_SPI_4_BASE_ADDRESS DT_ST_STM32_SPI_40013400_BASE_ADDRESS -#define DT_SPI_4_IRQ_PRI DT_ST_STM32_SPI_40013400_IRQ_0_PRIORITY -#define DT_SPI_4_NAME DT_ST_STM32_SPI_40013400_LABEL -#define DT_SPI_4_IRQ DT_ST_STM32_SPI_40013400_IRQ_0 -#define DT_SPI_4_CLOCK_BITS DT_ST_STM32_SPI_40013400_CLOCK_BITS -#define DT_SPI_4_CLOCK_BUS DT_ST_STM32_SPI_40013400_CLOCK_BUS - -#define DT_SPI_5_BASE_ADDRESS DT_ST_STM32_SPI_40015000_BASE_ADDRESS -#define DT_SPI_5_IRQ_PRI DT_ST_STM32_SPI_40015000_IRQ_0_PRIORITY -#define DT_SPI_5_NAME DT_ST_STM32_SPI_40015000_LABEL -#define DT_SPI_5_IRQ DT_ST_STM32_SPI_40015000_IRQ_0 -#define DT_SPI_5_CLOCK_BITS DT_ST_STM32_SPI_40015000_CLOCK_BITS -#define DT_SPI_5_CLOCK_BUS DT_ST_STM32_SPI_40015000_CLOCK_BUS - -#define DT_SPI_6_BASE_ADDRESS DT_ST_STM32_SPI_40015400_BASE_ADDRESS -#define DT_SPI_6_IRQ_PRI DT_ST_STM32_SPI_40015400_IRQ_0_PRIORITY -#define DT_SPI_6_NAME DT_ST_STM32_SPI_40015400_LABEL -#define DT_SPI_6_IRQ DT_ST_STM32_SPI_40015400_IRQ_0 -#define DT_SPI_6_CLOCK_BITS DT_ST_STM32_SPI_40015400_CLOCK_BITS -#define DT_SPI_6_CLOCK_BUS DT_ST_STM32_SPI_40015400_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 diff --git a/soc/arm/st_stm32/stm32g4/dts_fixup.h b/soc/arm/st_stm32/stm32g4/dts_fixup.h index 92aba1d3f76..7f354409b95 100644 --- a/soc/arm/st_stm32/stm32g4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32g4/dts_fixup.h @@ -150,27 +150,6 @@ #define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL -#define DT_SPI_1_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40013000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI DT_ST_STM32_SPI_FIFO_40013000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME DT_ST_STM32_SPI_FIFO_40013000_LABEL -#define DT_SPI_1_IRQ DT_ST_STM32_SPI_FIFO_40013000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40013000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40013000_CLOCK_BUS - -#define DT_SPI_2_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40003800_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI DT_ST_STM32_SPI_FIFO_40003800_IRQ_0_PRIORITY -#define DT_SPI_2_NAME DT_ST_STM32_SPI_FIFO_40003800_LABEL -#define DT_SPI_2_IRQ DT_ST_STM32_SPI_FIFO_40003800_IRQ_0 -#define DT_SPI_2_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40003800_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40003800_CLOCK_BUS - -#define DT_SPI_3_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40003C00_BASE_ADDRESS -#define DT_SPI_3_IRQ_PRI DT_ST_STM32_SPI_FIFO_40003C00_IRQ_0_PRIORITY -#define DT_SPI_3_NAME DT_ST_STM32_SPI_FIFO_40003C00_LABEL -#define DT_SPI_3_IRQ DT_ST_STM32_SPI_FIFO_40003C00_IRQ_0 -#define DT_SPI_3_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40003C00_CLOCK_BITS -#define DT_SPI_3_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40003C00_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 diff --git a/soc/arm/st_stm32/stm32l0/dts_fixup.h b/soc/arm/st_stm32/stm32l0/dts_fixup.h index d12402c9bce..c4bbbe90a4a 100644 --- a/soc/arm/st_stm32/stm32l0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l0/dts_fixup.h @@ -111,20 +111,6 @@ #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_SPI_1_BASE_ADDRESS DT_ST_STM32_SPI_40013000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI DT_ST_STM32_SPI_40013000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME DT_ST_STM32_SPI_40013000_LABEL -#define DT_SPI_1_IRQ DT_ST_STM32_SPI_40013000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS DT_ST_STM32_SPI_40013000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS DT_ST_STM32_SPI_40013000_CLOCK_BUS - -#define DT_SPI_2_BASE_ADDRESS DT_ST_STM32_SPI_40003800_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI DT_ST_STM32_SPI_40003800_IRQ_0_PRIORITY -#define DT_SPI_2_NAME DT_ST_STM32_SPI_40003800_LABEL -#define DT_SPI_2_IRQ DT_ST_STM32_SPI_40003800_IRQ_0 -#define DT_SPI_2_CLOCK_BITS DT_ST_STM32_SPI_40003800_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS DT_ST_STM32_SPI_40003800_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 diff --git a/soc/arm/st_stm32/stm32l1/dts_fixup.h b/soc/arm/st_stm32/stm32l1/dts_fixup.h index 6bbdc6cce5e..908c2ad20f8 100644 --- a/soc/arm/st_stm32/stm32l1/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l1/dts_fixup.h @@ -109,20 +109,6 @@ #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_SPI_1_BASE_ADDRESS DT_ST_STM32_SPI_40013000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI DT_ST_STM32_SPI_40013000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME DT_ST_STM32_SPI_40013000_LABEL -#define DT_SPI_1_IRQ DT_ST_STM32_SPI_40013000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS DT_ST_STM32_SPI_40013000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS DT_ST_STM32_SPI_40013000_CLOCK_BUS - -#define DT_SPI_2_BASE_ADDRESS DT_ST_STM32_SPI_40003800_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI DT_ST_STM32_SPI_40003800_IRQ_0_PRIORITY -#define DT_SPI_2_NAME DT_ST_STM32_SPI_40003800_LABEL -#define DT_SPI_2_IRQ DT_ST_STM32_SPI_40003800_IRQ_0 -#define DT_SPI_2_CLOCK_BITS DT_ST_STM32_SPI_40003800_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS DT_ST_STM32_SPI_40003800_CLOCK_BUS - #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL diff --git a/soc/arm/st_stm32/stm32l4/dts_fixup.h b/soc/arm/st_stm32/stm32l4/dts_fixup.h index 1cf566593ea..8455a389f22 100644 --- a/soc/arm/st_stm32/stm32l4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l4/dts_fixup.h @@ -181,27 +181,6 @@ #define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL -#define DT_SPI_1_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40013000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI DT_ST_STM32_SPI_FIFO_40013000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME DT_ST_STM32_SPI_FIFO_40013000_LABEL -#define DT_SPI_1_IRQ DT_ST_STM32_SPI_FIFO_40013000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40013000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40013000_CLOCK_BUS - -#define DT_SPI_2_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40003800_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI DT_ST_STM32_SPI_FIFO_40003800_IRQ_0_PRIORITY -#define DT_SPI_2_NAME DT_ST_STM32_SPI_FIFO_40003800_LABEL -#define DT_SPI_2_IRQ DT_ST_STM32_SPI_FIFO_40003800_IRQ_0 -#define DT_SPI_2_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40003800_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40003800_CLOCK_BUS - -#define DT_SPI_3_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40003C00_BASE_ADDRESS -#define DT_SPI_3_IRQ_PRI DT_ST_STM32_SPI_FIFO_40003C00_IRQ_0_PRIORITY -#define DT_SPI_3_NAME DT_ST_STM32_SPI_FIFO_40003C00_LABEL -#define DT_SPI_3_IRQ DT_ST_STM32_SPI_FIFO_40003C00_IRQ_0 -#define DT_SPI_3_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40003C00_CLOCK_BITS -#define DT_SPI_3_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40003C00_CLOCK_BUS - #define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32L4_FLASH_CONTROLLER_LABEL #if defined(DT_ST_STM32_USB_40006800_BASE_ADDRESS) diff --git a/soc/arm/st_stm32/stm32mp1/dts_fixup.h b/soc/arm/st_stm32/stm32mp1/dts_fixup.h index 1811cb3be16..9d1406fbec5 100644 --- a/soc/arm/st_stm32/stm32mp1/dts_fixup.h +++ b/soc/arm/st_stm32/stm32mp1/dts_fixup.h @@ -195,71 +195,6 @@ #define DT_GPIO_STM32_GPIOK_CLOCK_BUS \ DT_ST_STM32_GPIO_5000C000_CLOCK_BUS -#define DT_SPI_1_BASE_ADDRESS \ - DT_ST_STM32_SPI_FIFO_44004000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI \ - DT_ST_STM32_SPI_FIFO_44004000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME \ - DT_ST_STM32_SPI_FIFO_44004000_LABEL -#define DT_SPI_1_IRQ \ - DT_ST_STM32_SPI_FIFO_44004000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS \ - DT_ST_STM32_SPI_FIFO_44004000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS \ - DT_ST_STM32_SPI_FIFO_44004000_CLOCK_BUS - -#define DT_SPI_2_BASE_ADDRESS \ - DT_ST_STM32_SPI_FIFO_4400B000_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI \ - DT_ST_STM32_SPI_FIFO_4400B000_IRQ_0_PRIORITY -#define DT_SPI_2_NAME \ - DT_ST_STM32_SPI_FIFO_4400B000_LABEL -#define DT_SPI_2_IRQ \ - DT_ST_STM32_SPI_FIFO_4400B000_IRQ_0 -#define DT_SPI_2_CLOCK_BITS \ - DT_ST_STM32_SPI_FIFO_4400B000_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS \ - DT_ST_STM32_SPI_FIFO_4400B000_CLOCK_BUS - -#define DT_SPI_3_BASE_ADDRESS \ - DT_ST_STM32_SPI_FIFO_4400C000_BASE_ADDRESS -#define DT_SPI_3_IRQ_PRI \ - DT_ST_STM32_SPI_FIFO_4400C000_IRQ_0_PRIORITY -#define DT_SPI_3_NAME \ - DT_ST_STM32_SPI_FIFO_4400C000_LABEL -#define DT_SPI_3_IRQ \ - DT_ST_STM32_SPI_FIFO_4400C000_IRQ_0 -#define DT_SPI_3_CLOCK_BITS \ - DT_ST_STM32_SPI_FIFO_4400C000_CLOCK_BITS -#define DT_SPI_3_CLOCK_BUS \ - DT_ST_STM32_SPI_FIFO_4400C000_CLOCK_BUS - -#define DT_SPI_4_BASE_ADDRESS \ - DT_ST_STM32_SPI_FIFO_44005000_BASE_ADDRESS -#define DT_SPI_4_IRQ_PRI \ - DT_ST_STM32_SPI_FIFO_44005000_IRQ_0_PRIORITY -#define DT_SPI_4_NAME \ - DT_ST_STM32_SPI_FIFO_44005000_LABEL -#define DT_SPI_4_IRQ \ - DT_ST_STM32_SPI_FIFO_44005000_IRQ_0 -#define DT_SPI_4_CLOCK_BITS \ - DT_ST_STM32_SPI_FIFO_44005000_CLOCK_BITS -#define DT_SPI_4_CLOCK_BUS \ - DT_ST_STM32_SPI_FIFO_44005000_CLOCK_BUS - -#define DT_SPI_5_BASE_ADDRESS \ - DT_ST_STM32_SPI_FIFO_44009000_BASE_ADDRESS -#define DT_SPI_5_IRQ_PRI \ - DT_ST_STM32_SPI_FIFO_44009000_IRQ_0_PRIORITY -#define DT_SPI_5_NAME \ - DT_ST_STM32_SPI_FIFO_44009000_LABEL -#define DT_SPI_5_IRQ \ - DT_ST_STM32_SPI_FIFO_44009000_IRQ_0 -#define DT_SPI_5_CLOCK_BITS \ - DT_ST_STM32_SPI_FIFO_44009000_CLOCK_BITS -#define DT_SPI_5_CLOCK_BUS \ - DT_ST_STM32_SPI_FIFO_40009000_CLOCK_BUS - #define DT_UART_STM32_USART_2_BASE_ADDRESS \ DT_ST_STM32_USART_4000E000_BASE_ADDRESS #define DT_UART_STM32_USART_2_BAUD_RATE \ diff --git a/soc/arm/st_stm32/stm32wb/dts_fixup.h b/soc/arm/st_stm32/stm32wb/dts_fixup.h index 7ddbe9fcb6b..0b0bfeb1d43 100644 --- a/soc/arm/st_stm32/stm32wb/dts_fixup.h +++ b/soc/arm/st_stm32/stm32wb/dts_fixup.h @@ -104,20 +104,6 @@ #define DT_I2C_3_CLOCK_BITS DT_ST_STM32_I2C_V2_40005C00_CLOCK_BITS #define DT_I2C_3_CLOCK_BUS DT_ST_STM32_I2C_V2_40005C00_CLOCK_BUS -#define DT_SPI_1_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40013000_BASE_ADDRESS -#define DT_SPI_1_IRQ_PRI DT_ST_STM32_SPI_FIFO_40013000_IRQ_0_PRIORITY -#define DT_SPI_1_NAME DT_ST_STM32_SPI_FIFO_40013000_LABEL -#define DT_SPI_1_IRQ DT_ST_STM32_SPI_FIFO_40013000_IRQ_0 -#define DT_SPI_1_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40013000_CLOCK_BITS -#define DT_SPI_1_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40013000_CLOCK_BUS - -#define DT_SPI_2_BASE_ADDRESS DT_ST_STM32_SPI_FIFO_40003800_BASE_ADDRESS -#define DT_SPI_2_IRQ_PRI DT_ST_STM32_SPI_FIFO_40003800_IRQ_0_PRIORITY -#define DT_SPI_2_NAME DT_ST_STM32_SPI_FIFO_40003800_LABEL -#define DT_SPI_2_IRQ DT_ST_STM32_SPI_FIFO_40003800_IRQ_0 -#define DT_SPI_2_CLOCK_BITS DT_ST_STM32_SPI_FIFO_40003800_CLOCK_BITS -#define DT_SPI_2_CLOCK_BUS DT_ST_STM32_SPI_FIFO_40003800_CLOCK_BUS - #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_LPTIM_1_BASE_ADDRESS DT_ST_STM32_TIMERS_40007C00_BASE_ADDRESS