Skip to content

Commit 3f2b376

Browse files
Daniel Wagenknechtgalak
Daniel Wagenknecht
authored and
galak
committed
dts: stm32l4: move dts.fixup to soc family level
This moves and merges the existing board-level dts.fixup files for STM32 L4 SOC family into one soc family level dts.fixup file. No new fixup blocks have been added, only fixup blocks, that were part of at least one board level dts.fixup file are present in soc family level dts.fixup file. disco_l475_iot1 boards fixup blocks for devices connected via SPI and I2C stay in board level dts.fixup file, because they are board specific. Contributes to #5707 Signed-off-by: Daniel Wagenknecht <[email protected]>
1 parent 080fe4d commit 3f2b376

File tree

6 files changed

+60
-202
lines changed

6 files changed

+60
-202
lines changed

‎arch/arm/soc/st_stm32/stm32l4/dts.fixup

+60-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,64 @@
11
/* SoC level DTS fixup file */
22

3-
#define FLASH_DEV_BASE_ADDRESS ST_STM32L4_FLASH_CONTROLLER_40022000_BASE_ADDRESS_0
4-
#define FLASH_DEV_NAME ST_STM32L4_FLASH_CONTROLLER_40022000_LABEL
3+
#define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
4+
5+
#define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS
6+
#define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED
7+
#define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY
8+
#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL
9+
#define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0
10+
11+
#define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS
12+
#define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED
13+
#define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY
14+
#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL
15+
#define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0
16+
17+
#define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS
18+
#define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED
19+
#define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY
20+
#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL
21+
#define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0
22+
23+
#define CONFIG_UART_STM32_PORT_4_BASE_ADDRESS ST_STM32_USART_40004C00_BASE_ADDRESS
24+
#define CONFIG_UART_STM32_PORT_4_BAUD_RATE ST_STM32_USART_40004C00_CURRENT_SPEED
25+
#define CONFIG_UART_STM32_PORT_4_IRQ_PRI ST_STM32_USART_40004C00_IRQ_0_PRIORITY
26+
#define CONFIG_UART_STM32_PORT_4_NAME ST_STM32_USART_40004C00_LABEL
27+
#define PORT_4_IRQ ST_STM32_USART_40004C00_IRQ_0
28+
29+
#define CONFIG_UART_STM32_PORT_5_BASE_ADDRESS ST_STM32_USART_40005000_BASE_ADDRESS
30+
#define CONFIG_UART_STM32_PORT_5_BAUD_RATE ST_STM32_USART_40005000_CURRENT_SPEED
31+
#define CONFIG_UART_STM32_PORT_5_IRQ_PRI ST_STM32_USART_40005000_IRQ_0_PRIORITY
32+
#define CONFIG_UART_STM32_PORT_5_NAME ST_STM32_USART_40005000_LABEL
33+
#define PORT_5_IRQ ST_STM32_USART_40005000_IRQ_0
34+
35+
#define CONFIG_I2C_1_BASE_ADDRESS ST_STM32_I2C_V2_40005400_BASE_ADDRESS
36+
#define CONFIG_I2C_1_EVENT_IRQ_PRI ST_STM32_I2C_V2_40005400_IRQ_EVENT_PRIORITY
37+
#define CONFIG_I2C_1_ERROR_IRQ_PRI ST_STM32_I2C_V2_40005400_IRQ_ERROR_PRIORITY
38+
#define CONFIG_I2C_1_NAME ST_STM32_I2C_V2_40005400_LABEL
39+
#define CONFIG_I2C_1_EVENT_IRQ ST_STM32_I2C_V2_40005400_IRQ_EVENT
40+
#define CONFIG_I2C_1_ERROR_IRQ ST_STM32_I2C_V2_40005400_IRQ_ERROR
41+
#define CONFIG_I2C_1_BITRATE ST_STM32_I2C_V2_40005400_CLOCK_FREQUENCY
42+
43+
#define CONFIG_I2C_2_BASE_ADDRESS ST_STM32_I2C_V2_40005800_BASE_ADDRESS
44+
#define CONFIG_I2C_2_EVENT_IRQ_PRI ST_STM32_I2C_V2_40005800_IRQ_EVENT_PRIORITY
45+
#define CONFIG_I2C_2_ERROR_IRQ_PRI ST_STM32_I2C_V2_40005800_IRQ_ERROR_PRIORITY
46+
#define CONFIG_I2C_2_NAME ST_STM32_I2C_V2_40005800_LABEL
47+
#define CONFIG_I2C_2_EVENT_IRQ ST_STM32_I2C_V2_40005800_IRQ_EVENT
48+
#define CONFIG_I2C_2_ERROR_IRQ ST_STM32_I2C_V2_40005800_IRQ_ERROR
49+
#define CONFIG_I2C_2_BITRATE ST_STM32_I2C_V2_40005800_CLOCK_FREQUENCY
50+
51+
#define CONFIG_SPI_1_BASE_ADDRESS ST_STM32_SPI_FIFO_40013000_BASE_ADDRESS
52+
#define CONFIG_SPI_1_IRQ_PRI ST_STM32_SPI_FIFO_40013000_IRQ_0_PRIORITY
53+
#define CONFIG_SPI_1_NAME ST_STM32_SPI_FIFO_40013000_LABEL
54+
#define CONFIG_SPI_1_IRQ ST_STM32_SPI_FIFO_40013000_IRQ_0
55+
56+
#define CONFIG_SPI_3_BASE_ADDRESS ST_STM32_SPI_FIFO_40003C00_BASE_ADDRESS
57+
#define CONFIG_SPI_3_IRQ_PRI ST_STM32_SPI_FIFO_40003C00_IRQ_0_PRIORITY
58+
#define CONFIG_SPI_3_NAME ST_STM32_SPI_FIFO_40003C00_LABEL
59+
#define CONFIG_SPI_3_IRQ ST_STM32_SPI_FIFO_40003C00_IRQ_0
60+
61+
#define FLASH_DEV_BASE_ADDRESS ST_STM32L4_FLASH_CONTROLLER_40022000_BASE_ADDRESS_0
62+
#define FLASH_DEV_NAME ST_STM32L4_FLASH_CONTROLLER_40022000_LABEL
563

664
/* End of SoC Level DTS fixup file */

‎boards/arm/disco_l475_iot1/dts.fixup

-58
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,6 @@
44
* generated data matches the driver definitions.
55
*/
66

7-
#define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
8-
9-
#define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS
10-
#define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED
11-
#define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY
12-
#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL
13-
#define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0
14-
15-
#define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS
16-
#define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED
17-
#define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY
18-
#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL
19-
#define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0
20-
21-
#define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS
22-
#define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED
23-
#define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY
24-
#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL
25-
#define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0
26-
27-
#define CONFIG_UART_STM32_PORT_4_BASE_ADDRESS ST_STM32_UART_40004C00_BASE_ADDRESS
28-
#define CONFIG_UART_STM32_PORT_4_BAUD_RATE ST_STM32_UART_40004C00_CURRENT_SPEED
29-
#define CONFIG_UART_STM32_PORT_4_IRQ_PRI ST_STM32_UART_40004C00_IRQ_0_PRIORITY
30-
#define CONFIG_UART_STM32_PORT_4_NAME ST_STM32_UART_40004C00_LABEL
31-
#define PORT_4_IRQ ST_STM32_UART_40004C00_IRQ_0
32-
33-
#define CONFIG_UART_STM32_PORT_5_BASE_ADDRESS ST_STM32_UART_40005000_BASE_ADDRESS
34-
#define CONFIG_UART_STM32_PORT_5_BAUD_RATE ST_STM32_UART_40005000_CURRENT_SPEED
35-
#define CONFIG_UART_STM32_PORT_5_IRQ_PRI ST_STM32_UART_40005000_IRQ_0_PRIORITY
36-
#define CONFIG_UART_STM32_PORT_5_NAME ST_STM32_UART_40005000_LABEL
37-
#define PORT_5_IRQ ST_STM32_UART_40005000_IRQ_0
38-
39-
#define CONFIG_I2C_1_BASE_ADDRESS ST_STM32_I2C_V2_40005400_BASE_ADDRESS
40-
#define CONFIG_I2C_1_EVENT_IRQ_PRI ST_STM32_I2C_V2_40005400_IRQ_EVENT_PRIORITY
41-
#define CONFIG_I2C_1_ERROR_IRQ_PRI ST_STM32_I2C_V2_40005400_IRQ_ERROR_PRIORITY
42-
#define CONFIG_I2C_1_NAME ST_STM32_I2C_V2_40005400_LABEL
43-
#define CONFIG_I2C_1_EVENT_IRQ ST_STM32_I2C_V2_40005400_IRQ_EVENT
44-
#define CONFIG_I2C_1_ERROR_IRQ ST_STM32_I2C_V2_40005400_IRQ_ERROR
45-
#define CONFIG_I2C_1_BITRATE ST_STM32_I2C_V2_40005400_CLOCK_FREQUENCY
46-
47-
#define CONFIG_I2C_2_BASE_ADDRESS ST_STM32_I2C_V2_40005800_BASE_ADDRESS
48-
#define CONFIG_I2C_2_EVENT_IRQ_PRI ST_STM32_I2C_V2_40005800_IRQ_EVENT_PRIORITY
49-
#define CONFIG_I2C_2_ERROR_IRQ_PRI ST_STM32_I2C_V2_40005800_IRQ_ERROR_PRIORITY
50-
#define CONFIG_I2C_2_NAME ST_STM32_I2C_V2_40005800_LABEL
51-
#define CONFIG_I2C_2_EVENT_IRQ ST_STM32_I2C_V2_40005800_IRQ_EVENT
52-
#define CONFIG_I2C_2_ERROR_IRQ ST_STM32_I2C_V2_40005800_IRQ_ERROR
53-
#define CONFIG_I2C_2_BITRATE ST_STM32_I2C_V2_40005800_CLOCK_FREQUENCY
54-
557
#define CONFIG_HTS221_NAME ST_STM32_I2C_V2_40005800_ST_HTS221_5F_LABEL
568
#define CONFIG_HTS221_I2C_MASTER_DEV_NAME ST_STM32_I2C_V2_40005800_ST_HTS221_5F_BUS_NAME
579

@@ -67,16 +19,6 @@
6719
#define CONFIG_LPS22HB_I2C_ADDR ST_STM32_I2C_V2_40005800_ST_LPS22HB_PRESS_5D_BASE_ADDRESS
6820
#define CONFIG_LPS22HB_I2C_MASTER_DEV_NAME ST_STM32_I2C_V2_40005800_ST_LPS22HB_PRESS_5D_BUS_NAME
6921

70-
#define CONFIG_SPI_1_BASE_ADDRESS ST_STM32_SPI_FIFO_40013000_BASE_ADDRESS
71-
#define CONFIG_SPI_1_IRQ_PRI ST_STM32_SPI_FIFO_40013000_IRQ_0_PRIORITY
72-
#define CONFIG_SPI_1_NAME ST_STM32_SPI_FIFO_40013000_LABEL
73-
#define CONFIG_SPI_1_IRQ ST_STM32_SPI_FIFO_40013000_IRQ_0
74-
75-
#define CONFIG_SPI_3_BASE_ADDRESS ST_STM32_SPI_FIFO_40003C00_BASE_ADDRESS
76-
#define CONFIG_SPI_3_IRQ_PRI ST_STM32_SPI_FIFO_40003C00_IRQ_0_PRIORITY
77-
#define CONFIG_SPI_3_NAME ST_STM32_SPI_FIFO_40003C00_LABEL
78-
#define CONFIG_SPI_3_IRQ ST_STM32_SPI_FIFO_40003C00_IRQ_0
79-
8022
#define CONFIG_BT_SPI_DEV_NAME ST_STM32_SPI_FIFO_40003C00_ST_SPBTLE_RF_0_BUS_NAME
8123
#define CONFIG_BT_SPI_MAX_CLK_FREQ ST_STM32_SPI_FIFO_40003C00_ST_SPBTLE_RF_0_SPI_MAX_FREQUENCY
8224

‎boards/arm/nucleo_l432kc/dts.fixup

-31
This file was deleted.

‎boards/arm/nucleo_l476rg/dts.fixup

-37
This file was deleted.

‎boards/arm/stm32l476g_disco/dts.fixup

-37
This file was deleted.

‎boards/arm/stm32l496g_disco/dts.fixup

-37
This file was deleted.

0 commit comments

Comments
 (0)