diff --git a/drivers/serial/Kconfig.stm32 b/drivers/serial/Kconfig.stm32 index a871861834f..bfb7a6230cc 100644 --- a/drivers/serial/Kconfig.stm32 +++ b/drivers/serial/Kconfig.stm32 @@ -27,14 +27,6 @@ config UART_STM32_PORT_1 Enable support for USART1 port in the driver. Say y here if you want to use USART1 device. -config UART_STM32_PORT_1_NAME - string "Device Name for STM32 USART1 Port" - default "UART_1" - depends on UART_STM32_PORT_1 - help - This is the device name for USART1 port, and is - included in the device struct. - # --- port 2 --- config UART_STM32_PORT_2 @@ -45,14 +37,6 @@ config UART_STM32_PORT_2 Enable support for USART2 port in the driver. Say y here if you want to use USART2 device. -config UART_STM32_PORT_2_NAME - string "Device Name for STM32 USART2 Port" - default "UART_2" - depends on UART_STM32_PORT_2 - help - This is the device name for USART2 port, and is - included in the device struct. - # --- port 3 --- config UART_STM32_PORT_3 @@ -63,14 +47,6 @@ config UART_STM32_PORT_3 Enable support for USART3 port in the driver. Say y here if you want to use USART3 device. -config UART_STM32_PORT_3_NAME - string "Device Name for STM32 USART3 Port" - default "UART_3" - depends on UART_STM32_PORT_3 - help - This is the device name for USART3 port, and is - included in the device struct. - # --- port 4 --- config UART_STM32_PORT_4 @@ -81,14 +57,6 @@ config UART_STM32_PORT_4 Enable support for UART4 port in the driver. Say y here if you want to use UART4 device. -config UART_STM32_PORT_4_NAME - string "Device Name for STM32 UART4 Port" - default "UART_4" - depends on UART_STM32_PORT_4 - help - This is the device name for UART4 port, and is - included in the device struct. - # --- port 5 --- config UART_STM32_PORT_5 @@ -99,14 +67,6 @@ config UART_STM32_PORT_5 Enable support for UART5 port in the driver. Say y here if you want to use UART5 device. -config UART_STM32_PORT_5_NAME - string "Device Name for STM32 UART5 Port" - default "UART_5" - depends on UART_STM32_PORT_5 - help - This is the device name for UART5 port, and is - included in the device struct. - # --- port 6 --- config UART_STM32_PORT_6 @@ -117,14 +77,6 @@ config UART_STM32_PORT_6 Enable support for USART6 port in the driver. Say y here if you want to use USART6 device. -config UART_STM32_PORT_6_NAME - string "Device Name for STM32 USART6 Port" - default "UART_6" - depends on UART_STM32_PORT_6 - help - This is the device name for USART6 port, and is - included in the device struct. - # --- port 7 --- config UART_STM32_PORT_7 @@ -135,14 +87,6 @@ config UART_STM32_PORT_7 Enable support for UART7 port in the driver. Say y here if you want to use UART7 device. -config UART_STM32_PORT_7_NAME - string "Device Name for STM32 UART7 Port" - default "UART_7" - depends on UART_STM32_PORT_7 - help - This is the device name for UART7 port, and is - included in the device struct. - # --- port 8 --- config UART_STM32_PORT_8 @@ -153,14 +97,6 @@ config UART_STM32_PORT_8 Enable support for UART8 port in the driver. Say y here if you want to use UART8 device. -config UART_STM32_PORT_8_NAME - string "Device Name for STM32 UART8 Port" - default "UART_8" - depends on UART_STM32_PORT_8 - help - This is the device name for UART8 port, and is - included in the device struct. - # --- port 9 --- config UART_STM32_PORT_9 @@ -171,14 +107,6 @@ config UART_STM32_PORT_9 Enable support for UART9 port in the driver. Say y here if you want to use UART9 device. -config UART_STM32_PORT_9_NAME - string "Device Name for STM32 UART9 Port" - default "UART_9" - depends on UART_STM32_PORT_9 - help - This is the device name for UART9 port, and is - included in the device struct. - # --- port 10 --- config UART_STM32_PORT_10 @@ -189,12 +117,4 @@ config UART_STM32_PORT_10 Enable support for UART10 port in the driver. Say y here if you want to use UART10 device. -config UART_STM32_PORT_10_NAME - string "Device Name for STM32 UART10 Port" - default "UART_10" - depends on UART_STM32_PORT_10 - help - This is the device name for UART10 port, and is - included in the device struct. - endif # UART_STM32 diff --git a/dts/arm/96b_carbon.fixup b/dts/arm/96b_carbon.fixup index f2ea618b4b3..e563eb52942 100644 --- a/dts/arm/96b_carbon.fixup +++ b/dts/arm/96b_carbon.fixup @@ -10,9 +10,11 @@ #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40011000_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40011000_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40011000_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40011000_LABEL #define PORT_1_IRQ ST_STM32_USART_40011000_IRQ_0 #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/disco_l475_iot1.fixup b/dts/arm/disco_l475_iot1.fixup index ac9af9a7608..3571e20cc9c 100644 --- a/dts/arm/disco_l475_iot1.fixup +++ b/dts/arm/disco_l475_iot1.fixup @@ -9,24 +9,29 @@ #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL #define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 #define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL #define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0 #define CONFIG_UART_STM32_PORT_4_BASE_ADDRESS ST_STM32_USART_40004C00_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_4_BAUD_RATE ST_STM32_USART_40004C00_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_4_IRQ_PRI ST_STM32_USART_40004C00_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_4_NAME ST_STM32_USART_40004C00_LABEL #define PORT_4_IRQ ST_STM32_USART_40004C00_IRQ_0 #define CONFIG_UART_STM32_PORT_5_BASE_ADDRESS ST_STM32_USART_40005000_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_5_BAUD_RATE ST_STM32_USART_40005000_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_5_IRQ_PRI ST_STM32_USART_40005000_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_5_NAME ST_STM32_USART_40005000_LABEL #define PORT_5_IRQ ST_STM32_USART_40005000_IRQ_0 diff --git a/dts/arm/nucleo_f103rb.fixup b/dts/arm/nucleo_f103rb.fixup index ff2881d88f1..47278730579 100644 --- a/dts/arm/nucleo_f103rb.fixup +++ b/dts/arm/nucleo_f103rb.fixup @@ -10,4 +10,5 @@ #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/nucleo_f334r8.fixup b/dts/arm/nucleo_f334r8.fixup index ff2881d88f1..47278730579 100644 --- a/dts/arm/nucleo_f334r8.fixup +++ b/dts/arm/nucleo_f334r8.fixup @@ -10,4 +10,5 @@ #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/nucleo_f401re.fixup b/dts/arm/nucleo_f401re.fixup index f2ea618b4b3..e563eb52942 100644 --- a/dts/arm/nucleo_f401re.fixup +++ b/dts/arm/nucleo_f401re.fixup @@ -10,9 +10,11 @@ #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40011000_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40011000_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40011000_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40011000_LABEL #define PORT_1_IRQ ST_STM32_USART_40011000_IRQ_0 #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/nucleo_f411re.fixup b/dts/arm/nucleo_f411re.fixup index f2ea618b4b3..e563eb52942 100644 --- a/dts/arm/nucleo_f411re.fixup +++ b/dts/arm/nucleo_f411re.fixup @@ -10,9 +10,11 @@ #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40011000_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40011000_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40011000_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40011000_LABEL #define PORT_1_IRQ ST_STM32_USART_40011000_IRQ_0 #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/nucleo_f413zh.fixup b/dts/arm/nucleo_f413zh.fixup index b8fb1c8750f..3a2e2db48cb 100644 --- a/dts/arm/nucleo_f413zh.fixup +++ b/dts/arm/nucleo_f413zh.fixup @@ -10,4 +10,5 @@ #define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL #define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0 diff --git a/dts/arm/nucleo_l432kc.fixup b/dts/arm/nucleo_l432kc.fixup index fd498423455..3eb576254b8 100644 --- a/dts/arm/nucleo_l432kc.fixup +++ b/dts/arm/nucleo_l432kc.fixup @@ -9,19 +9,23 @@ #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL #define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 #define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL #define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0 #define CONFIG_UART_STM32_PORT_4_BASE_ADDRESS ST_STM32_USART_40004C00_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_4_BAUD_RATE ST_STM32_USART_40004C00_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_4_IRQ_PRI ST_STM32_USART_40004C00_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_4_NAME ST_STM32_USART_40004C00_LABEL #define PORT_4_IRQ ST_STM32_USART_40004C00_IRQ_0 diff --git a/dts/arm/nucleo_l476rg.fixup b/dts/arm/nucleo_l476rg.fixup index ac9af9a7608..3571e20cc9c 100644 --- a/dts/arm/nucleo_l476rg.fixup +++ b/dts/arm/nucleo_l476rg.fixup @@ -9,24 +9,29 @@ #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL #define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 #define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL #define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0 #define CONFIG_UART_STM32_PORT_4_BASE_ADDRESS ST_STM32_USART_40004C00_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_4_BAUD_RATE ST_STM32_USART_40004C00_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_4_IRQ_PRI ST_STM32_USART_40004C00_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_4_NAME ST_STM32_USART_40004C00_LABEL #define PORT_4_IRQ ST_STM32_USART_40004C00_IRQ_0 #define CONFIG_UART_STM32_PORT_5_BASE_ADDRESS ST_STM32_USART_40005000_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_5_BAUD_RATE ST_STM32_USART_40005000_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_5_IRQ_PRI ST_STM32_USART_40005000_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_5_NAME ST_STM32_USART_40005000_LABEL #define PORT_5_IRQ ST_STM32_USART_40005000_IRQ_0 diff --git a/dts/arm/olimexino_stm32.fixup b/dts/arm/olimexino_stm32.fixup index 61065ddeb7a..376eaaf9ee7 100644 --- a/dts/arm/olimexino_stm32.fixup +++ b/dts/arm/olimexino_stm32.fixup @@ -10,14 +10,17 @@ #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL #define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 #define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL #define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0 diff --git a/dts/arm/st/stm32f103Xb.dtsi b/dts/arm/st/stm32f103Xb.dtsi index f70a8f3ee31..3944b6d94c5 100644 --- a/dts/arm/st/stm32f103Xb.dtsi +++ b/dts/arm/st/stm32f103Xb.dtsi @@ -25,6 +25,7 @@ reg = <0x40013800 0x400>; interrupts = <37 0>; status = "disabled"; + label = "UART_1"; }; usart2: uart@40004400 { @@ -32,6 +33,7 @@ reg = <0x40004400 0x400>; interrupts = <38 0>; status = "disabled"; + label = "UART_2"; }; usart3: uart@40004800 { @@ -39,6 +41,7 @@ reg = <0x40004800 0x400>; interrupts = <39 0>; status = "disabled"; + label = "UART_3"; }; }; }; diff --git a/dts/arm/st/stm32f103Xe.dtsi b/dts/arm/st/stm32f103Xe.dtsi index 04efc99cbdf..ea4750a5ddc 100644 --- a/dts/arm/st/stm32f103Xe.dtsi +++ b/dts/arm/st/stm32f103Xe.dtsi @@ -25,6 +25,7 @@ reg = <0x40013800 0x400>; interrupts = <37 0>; status = "disabled"; + label = "UART_1"; }; usart2: uart@40004400 { @@ -32,6 +33,7 @@ reg = <0x40004400 0x400>; interrupts = <38 0>; status = "disabled"; + label = "UART_2"; }; usart3: uart@40004800 { @@ -39,6 +41,7 @@ reg = <0x40004800 0x400>; interrupts = <39 0>; status = "disabled"; + label = "UART_3"; }; }; }; diff --git a/dts/arm/st/stm32f107.dtsi b/dts/arm/st/stm32f107.dtsi index 1b98a7c0db9..7595714fb24 100644 --- a/dts/arm/st/stm32f107.dtsi +++ b/dts/arm/st/stm32f107.dtsi @@ -22,6 +22,7 @@ reg = <0x40013800 0x400>; interrupts = <37 0>; status = "disabled"; + label = "UART_1"; }; usart2: uart@40004400 { @@ -29,6 +30,7 @@ reg = <0x40004400 0x400>; interrupts = <38 0>; status = "disabled"; + label = "UART_2"; }; usart3: uart@40004800 { @@ -36,6 +38,7 @@ reg = <0x40004800 0x400>; interrupts = <39 0>; status = "disabled"; + label = "UART_3"; }; }; }; diff --git a/dts/arm/st/stm32f334.dtsi b/dts/arm/st/stm32f334.dtsi index 0248b139ff1..45fa1566b54 100644 --- a/dts/arm/st/stm32f334.dtsi +++ b/dts/arm/st/stm32f334.dtsi @@ -22,6 +22,7 @@ reg = <0x40013800 0x400>; interrupts = <37 0>; status = "disabled"; + label = "UART_1"; }; usart2: uart@40004400 { @@ -29,6 +30,7 @@ reg = <0x40004400 0x400>; interrupts = <38 0>; status = "disabled"; + label = "UART_2"; }; usart3: uart@40004800 { @@ -36,6 +38,7 @@ reg = <0x40004800 0x400>; interrupts = <39 0>; status = "disabled"; + label = "UART_3"; }; }; }; diff --git a/dts/arm/st/stm32f373.dtsi b/dts/arm/st/stm32f373.dtsi index 0248b139ff1..45fa1566b54 100644 --- a/dts/arm/st/stm32f373.dtsi +++ b/dts/arm/st/stm32f373.dtsi @@ -22,6 +22,7 @@ reg = <0x40013800 0x400>; interrupts = <37 0>; status = "disabled"; + label = "UART_1"; }; usart2: uart@40004400 { @@ -29,6 +30,7 @@ reg = <0x40004400 0x400>; interrupts = <38 0>; status = "disabled"; + label = "UART_2"; }; usart3: uart@40004800 { @@ -36,6 +38,7 @@ reg = <0x40004800 0x400>; interrupts = <39 0>; status = "disabled"; + label = "UART_3"; }; }; }; diff --git a/dts/arm/st/stm32f4.dtsi b/dts/arm/st/stm32f4.dtsi index 0eaff4ce396..2b521a5edd6 100644 --- a/dts/arm/st/stm32f4.dtsi +++ b/dts/arm/st/stm32f4.dtsi @@ -22,6 +22,7 @@ reg = <0x40011000 0x400>; interrupts = <37 0>; status = "disabled"; + label = "UART_1"; }; usart2: uart@40004400 { @@ -29,6 +30,7 @@ reg = <0x40004400 0x400>; interrupts = <38 0>; status = "disabled"; + label = "UART_2"; }; usart3: uart@40004800 { @@ -36,6 +38,7 @@ reg = <0x40004800 0x400>; interrupts = <39 0>; status = "disabled"; + label = "UART_3"; }; uart4: uart@40004c00 { @@ -43,6 +46,7 @@ reg = <0x40004c00 0x400>; interrupts = <52 0>; status = "disabled"; + label = "UART_4"; }; uart5: uart@40005000 { @@ -50,6 +54,7 @@ reg = <0x40005000 0x400>; interrupts = <53 0>; status = "disabled"; + label = "UART_5"; }; usart6: uart@40011400 { @@ -57,6 +62,7 @@ reg = <0x40011400 0x400>; interrupts = <71 0>; status = "disabled"; + label = "UART_6"; }; uart7: uart@40007800 { @@ -64,6 +70,7 @@ reg = <0x40007800 0x400>; interrupts = <82 0>; status = "disabled"; + label = "UART_7"; }; uart8: uart@40007c00 { @@ -71,6 +78,7 @@ reg = <0x40007c00 0x400>; interrupts = <83 0>; status = "disabled"; + label = "UART_8"; }; uart9: uart@40011800 { @@ -78,6 +86,7 @@ reg = <0x40011800 0x400>; interrupts = <88 0>; status = "disabled"; + label = "UART_9"; }; uart10: uart@40011c00 { @@ -85,6 +94,7 @@ reg = <0x40011c00 0x400>; interrupts = <89 0>; status = "disabled"; + label = "UART_10"; }; }; }; diff --git a/dts/arm/st/stm32l432.dtsi b/dts/arm/st/stm32l432.dtsi index 1b3c7bee59f..9da68ccd2f1 100644 --- a/dts/arm/st/stm32l432.dtsi +++ b/dts/arm/st/stm32l432.dtsi @@ -22,6 +22,7 @@ reg = <0x40013800 0x400>; interrupts = <37 0>; status = "disabled"; + label = "UART_1"; }; usart2: uart@40004400 { @@ -29,6 +30,7 @@ reg = <0x40004400 0x400>; interrupts = <38 0>; status = "disabled"; + label = "UART_2"; }; usart3: uart@40004800 { @@ -36,6 +38,7 @@ reg = <0x40004800 0x400>; interrupts = <39 0>; status = "disabled"; + label = "UART_3"; }; uart4: uart@40004c00 { @@ -43,6 +46,7 @@ reg = <0x40004c00 0x400>; interrupts = <52 0>; status = "disabled"; + label = "UART_4"; }; }; }; diff --git a/dts/arm/st/stm32l475.dtsi b/dts/arm/st/stm32l475.dtsi index 19329faaf7a..edcdee5d765 100644 --- a/dts/arm/st/stm32l475.dtsi +++ b/dts/arm/st/stm32l475.dtsi @@ -22,6 +22,7 @@ reg = <0x40013800 0x400>; interrupts = <37 0>; status = "disabled"; + label = "UART_1"; }; usart2: uart@40004400 { @@ -29,6 +30,7 @@ reg = <0x40004400 0x400>; interrupts = <38 0>; status = "disabled"; + label = "UART_2"; }; usart3: uart@40004800 { @@ -36,6 +38,7 @@ reg = <0x40004800 0x400>; interrupts = <39 0>; status = "disabled"; + label = "UART_3"; }; uart4: uart@40004c00 { @@ -43,6 +46,7 @@ reg = <0x40004c00 0x400>; interrupts = <52 0>; status = "disabled"; + label = "UART_4"; }; uart5: uart@40005000 { @@ -50,6 +54,7 @@ reg = <0x40005000 0x400>; interrupts = <53 0>; status = "disabled"; + label = "UART_5"; }; }; }; diff --git a/dts/arm/stm3210c_eval.fixup b/dts/arm/stm3210c_eval.fixup index ff2881d88f1..47278730579 100644 --- a/dts/arm/stm3210c_eval.fixup +++ b/dts/arm/stm3210c_eval.fixup @@ -10,4 +10,5 @@ #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/stm32373c_eval.fixup b/dts/arm/stm32373c_eval.fixup index ff2881d88f1..47278730579 100644 --- a/dts/arm/stm32373c_eval.fixup +++ b/dts/arm/stm32373c_eval.fixup @@ -10,4 +10,5 @@ #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/stm32_mini_a15.fixup b/dts/arm/stm32_mini_a15.fixup index 101fe65a09d..4112783d618 100644 --- a/dts/arm/stm32_mini_a15.fixup +++ b/dts/arm/stm32_mini_a15.fixup @@ -10,4 +10,5 @@ #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL #define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 diff --git a/dts/arm/stm32f4_disco.fixup b/dts/arm/stm32f4_disco.fixup index f2ea618b4b3..e563eb52942 100644 --- a/dts/arm/stm32f4_disco.fixup +++ b/dts/arm/stm32f4_disco.fixup @@ -10,9 +10,11 @@ #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40011000_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40011000_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40011000_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40011000_LABEL #define PORT_1_IRQ ST_STM32_USART_40011000_IRQ_0 #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/stm32l496g_disco.fixup b/dts/arm/stm32l496g_disco.fixup index ac9af9a7608..3571e20cc9c 100644 --- a/dts/arm/stm32l496g_disco.fixup +++ b/dts/arm/stm32l496g_disco.fixup @@ -9,24 +9,29 @@ #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL #define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 #define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL #define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 #define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL #define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0 #define CONFIG_UART_STM32_PORT_4_BASE_ADDRESS ST_STM32_USART_40004C00_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_4_BAUD_RATE ST_STM32_USART_40004C00_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_4_IRQ_PRI ST_STM32_USART_40004C00_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_4_NAME ST_STM32_USART_40004C00_LABEL #define PORT_4_IRQ ST_STM32_USART_40004C00_IRQ_0 #define CONFIG_UART_STM32_PORT_5_BASE_ADDRESS ST_STM32_USART_40005000_BASE_ADDRESS #define CONFIG_UART_STM32_PORT_5_BAUD_RATE ST_STM32_USART_40005000_CURRENT_SPEED #define CONFIG_UART_STM32_PORT_5_IRQ_PRI ST_STM32_USART_40005000_IRQ_0_PRIORITY +#define CONFIG_UART_STM32_PORT_5_NAME ST_STM32_USART_40005000_LABEL #define PORT_5_IRQ ST_STM32_USART_40005000_IRQ_0