From 9bd2a42d601fddd7ff636d872763f51bd19b619d Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Thu, 20 Apr 2017 17:10:10 +0200 Subject: [PATCH] dts: Align uart "baud-rate" property to device tree spec "current-speed" Devicetree.org specifies that serial devices property used to set baud rate is "current-speed", while zephyr uses "baud-rate". Align property name in order to keep zephyr dts files compatible with device tree specification and could be re-used from/to Linux for instance. We also cleanup a few SoCs that set "baud-rate" in the SoC dts and not the board. Jira: ZEP-2048 Change-Id: I097e7439ee46fe77c628b56531772950382fafcc Signed-off-by: Erwan Gouriou Signed-off-by: Kumar Gala --- drivers/serial/uart_cc32xx.c | 2 +- dts/arm/96b_carbon.dts | 4 ++-- dts/arm/96b_carbon.fixup | 5 ++--- dts/arm/cc3200_launchxl.dts | 2 +- dts/arm/frdm_k64f.dts | 4 ++-- dts/arm/frdm_k64f.fixup | 12 ++++++------ dts/arm/frdm_kw41z.dts | 1 + dts/arm/frdm_kw41z.fixup | 2 +- dts/arm/hexiwear_k64.dts | 4 ++-- dts/arm/hexiwear_k64.fixup | 12 ++++++------ dts/arm/hexiwear_kw40z.dts | 2 +- dts/arm/hexiwear_kw40z.fixup | 2 +- dts/arm/nucleo_f103rb.dts | 2 +- dts/arm/nucleo_f103rb.fixup | 2 +- dts/arm/nucleo_f334r8.dts | 2 +- dts/arm/nucleo_f334r8.fixup | 2 +- dts/arm/nucleo_f401re.dts | 4 ++-- dts/arm/nucleo_f401re.fixup | 5 ++--- dts/arm/nucleo_f411re.dts | 4 ++-- dts/arm/nucleo_f411re.fixup | 5 ++--- dts/arm/nucleo_l476rg.dts | 2 +- dts/arm/nucleo_l476rg.fixup | 10 +++++----- dts/arm/nxp/nxp_kw41z.dtsi | 1 - dts/arm/olimexino_stm32.dts | 2 +- dts/arm/olimexino_stm32.fixup | 6 +++--- dts/arm/stm3210c_eval.dts | 2 +- dts/arm/stm3210c_eval.fixup | 2 +- dts/arm/stm32373c_eval.dts | 2 +- dts/arm/stm32373c_eval.fixup | 2 +- dts/arm/stm32_mini_a15.dts | 2 +- dts/arm/stm32_mini_a15.fixup | 2 +- dts/arm/v2m_beetle.dts | 4 ++-- dts/arm/v2m_beetle.fixup | 4 ++-- dts/common/yaml/uart.yaml | 2 +- 34 files changed, 59 insertions(+), 62 deletions(-) diff --git a/drivers/serial/uart_cc32xx.c b/drivers/serial/uart_cc32xx.c index 232a74c6c28..a61af59579b 100644 --- a/drivers/serial/uart_cc32xx.c +++ b/drivers/serial/uart_cc32xx.c @@ -62,7 +62,7 @@ static int uart_cc32xx_init(struct device *dev) /* This also calls MAP_UARTEnable() to enable the FIFOs: */ MAP_UARTConfigSetExpClk((unsigned long)config->base, MAP_PRCMPeripheralClockGet(PRCM_UARTA0), - TI_CC32XX_UART_4000C000_BAUD_RATE, + TI_CC32XX_UART_4000C000_CURRENT_SPEED, (UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | UART_CONFIG_PAR_NONE)); MAP_UARTFlowControlSet((unsigned long)config->base, diff --git a/dts/arm/96b_carbon.dts b/dts/arm/96b_carbon.dts index 5e0f8b65add..18b97383d51 100644 --- a/dts/arm/96b_carbon.dts +++ b/dts/arm/96b_carbon.dts @@ -19,11 +19,11 @@ }; &usart1 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; &usart2 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; diff --git a/dts/arm/96b_carbon.fixup b/dts/arm/96b_carbon.fixup index 197a9ac1fd9..f2ea618b4b3 100644 --- a/dts/arm/96b_carbon.fixup +++ b/dts/arm/96b_carbon.fixup @@ -8,12 +8,11 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #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_BAUD_RATE +#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 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_BAUD_RATE +#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 PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 - diff --git a/dts/arm/cc3200_launchxl.dts b/dts/arm/cc3200_launchxl.dts index 3e9dd4fee04..199122a14db 100644 --- a/dts/arm/cc3200_launchxl.dts +++ b/dts/arm/cc3200_launchxl.dts @@ -19,5 +19,5 @@ &uart0 { status = "ok"; - baud-rate = <115200>; + current-speed = <115200>; }; diff --git a/dts/arm/frdm_k64f.dts b/dts/arm/frdm_k64f.dts index 8e0c7f9d8bd..1578fb981e5 100644 --- a/dts/arm/frdm_k64f.dts +++ b/dts/arm/frdm_k64f.dts @@ -30,12 +30,12 @@ &uart0 { status = "ok"; - baud-rate = <115200>; + current-speed = <115200>; }; #ifdef CONFIG_BLUETOOTH &uart3 { status = "ok"; - baud-rate = <115200>; + current-speed = <115200>; }; #endif diff --git a/dts/arm/frdm_k64f.fixup b/dts/arm/frdm_k64f.fixup index d2e90c53c5d..469af049333 100644 --- a/dts/arm/frdm_k64f.fixup +++ b/dts/arm/frdm_k64f.fixup @@ -1,19 +1,19 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_MCUX_0_BAUD_RATE NXP_K64F_UART_4006A000_BAUD_RATE +#define CONFIG_UART_MCUX_0_BAUD_RATE NXP_K64F_UART_4006A000_CURRENT_SPEED #define CONFIG_UART_MCUX_0_IRQ_PRI NXP_K64F_UART_4006A000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_1_BAUD_RATE NXP_K64F_UART_4006B000_BAUD_RATE +#define CONFIG_UART_MCUX_1_BAUD_RATE NXP_K64F_UART_4006B000_CURRENT_SPEED #define CONFIG_UART_MCUX_1_IRQ_PRI NXP_K64F_UART_4006B000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_2_BAUD_RATE NXP_K64F_UART_4006C000_BAUD_RATE +#define CONFIG_UART_MCUX_2_BAUD_RATE NXP_K64F_UART_4006C000_CURRENT_SPEED #define CONFIG_UART_MCUX_2_IRQ_PRI NXP_K64F_UART_4006C000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_3_BAUD_RATE NXP_K64F_UART_4006D000_BAUD_RATE +#define CONFIG_UART_MCUX_3_BAUD_RATE NXP_K64F_UART_4006D000_CURRENT_SPEED #define CONFIG_UART_MCUX_3_IRQ_PRI NXP_K64F_UART_4006D000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_4_BAUD_RATE NXP_K64F_UART_400EA000_BAUD_RATE +#define CONFIG_UART_MCUX_4_BAUD_RATE NXP_K64F_UART_400EA000_CURRENT_SPEED #define CONFIG_UART_MCUX_4_IRQ_PRI NXP_K64F_UART_400EA000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_5_BAUD_RATE NXP_K64F_UART_400EB000_BAUD_RATE +#define CONFIG_UART_MCUX_5_BAUD_RATE NXP_K64F_UART_400EB000_CURRENT_SPEED #define CONFIG_UART_MCUX_5_IRQ_PRI NXP_K64F_UART_400EB000_IRQ_0_PRIORITY diff --git a/dts/arm/frdm_kw41z.dts b/dts/arm/frdm_kw41z.dts index ed1450495b5..ff0e8f9c849 100644 --- a/dts/arm/frdm_kw41z.dts +++ b/dts/arm/frdm_kw41z.dts @@ -25,4 +25,5 @@ &lpuart0 { status = "ok"; + current-speed = <115200>; }; diff --git a/dts/arm/frdm_kw41z.fixup b/dts/arm/frdm_kw41z.fixup index 337f5f42452..229a60fdf28 100644 --- a/dts/arm/frdm_kw41z.fixup +++ b/dts/arm/frdm_kw41z.fixup @@ -1,4 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_MCUX_LPUART_0_BAUD_RATE NXP_KW41Z_LPUART_40054000_BAUD_RATE +#define CONFIG_UART_MCUX_LPUART_0_BAUD_RATE NXP_KW41Z_LPUART_40054000_CURRENT_SPEED #define CONFIG_UART_MCUX_LPUART_0_IRQ_PRI NXP_KW41Z_LPUART_40054000_IRQ_0_PRIORITY diff --git a/dts/arm/hexiwear_k64.dts b/dts/arm/hexiwear_k64.dts index f4230eb8113..b03db74908c 100644 --- a/dts/arm/hexiwear_k64.dts +++ b/dts/arm/hexiwear_k64.dts @@ -31,12 +31,12 @@ &uart0 { status = "ok"; - baud-rate = <115200>; + current-speed = <115200>; }; #ifdef CONFIG_BLUETOOTH &uart4 { status = "ok"; - baud-rate = <115200>; + current-speed = <115200>; }; #endif diff --git a/dts/arm/hexiwear_k64.fixup b/dts/arm/hexiwear_k64.fixup index d2e90c53c5d..469af049333 100644 --- a/dts/arm/hexiwear_k64.fixup +++ b/dts/arm/hexiwear_k64.fixup @@ -1,19 +1,19 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_MCUX_0_BAUD_RATE NXP_K64F_UART_4006A000_BAUD_RATE +#define CONFIG_UART_MCUX_0_BAUD_RATE NXP_K64F_UART_4006A000_CURRENT_SPEED #define CONFIG_UART_MCUX_0_IRQ_PRI NXP_K64F_UART_4006A000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_1_BAUD_RATE NXP_K64F_UART_4006B000_BAUD_RATE +#define CONFIG_UART_MCUX_1_BAUD_RATE NXP_K64F_UART_4006B000_CURRENT_SPEED #define CONFIG_UART_MCUX_1_IRQ_PRI NXP_K64F_UART_4006B000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_2_BAUD_RATE NXP_K64F_UART_4006C000_BAUD_RATE +#define CONFIG_UART_MCUX_2_BAUD_RATE NXP_K64F_UART_4006C000_CURRENT_SPEED #define CONFIG_UART_MCUX_2_IRQ_PRI NXP_K64F_UART_4006C000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_3_BAUD_RATE NXP_K64F_UART_4006D000_BAUD_RATE +#define CONFIG_UART_MCUX_3_BAUD_RATE NXP_K64F_UART_4006D000_CURRENT_SPEED #define CONFIG_UART_MCUX_3_IRQ_PRI NXP_K64F_UART_4006D000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_4_BAUD_RATE NXP_K64F_UART_400EA000_BAUD_RATE +#define CONFIG_UART_MCUX_4_BAUD_RATE NXP_K64F_UART_400EA000_CURRENT_SPEED #define CONFIG_UART_MCUX_4_IRQ_PRI NXP_K64F_UART_400EA000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_5_BAUD_RATE NXP_K64F_UART_400EB000_BAUD_RATE +#define CONFIG_UART_MCUX_5_BAUD_RATE NXP_K64F_UART_400EB000_CURRENT_SPEED #define CONFIG_UART_MCUX_5_IRQ_PRI NXP_K64F_UART_400EB000_IRQ_0_PRIORITY diff --git a/dts/arm/hexiwear_kw40z.dts b/dts/arm/hexiwear_kw40z.dts index abe80348103..23964e8265e 100644 --- a/dts/arm/hexiwear_kw40z.dts +++ b/dts/arm/hexiwear_kw40z.dts @@ -24,5 +24,5 @@ &lpuart0 { status = "ok"; - baud-rate = <115200>; + current-speed = <115200>; }; diff --git a/dts/arm/hexiwear_kw40z.fixup b/dts/arm/hexiwear_kw40z.fixup index 337f5f42452..229a60fdf28 100644 --- a/dts/arm/hexiwear_kw40z.fixup +++ b/dts/arm/hexiwear_kw40z.fixup @@ -1,4 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_MCUX_LPUART_0_BAUD_RATE NXP_KW41Z_LPUART_40054000_BAUD_RATE +#define CONFIG_UART_MCUX_LPUART_0_BAUD_RATE NXP_KW41Z_LPUART_40054000_CURRENT_SPEED #define CONFIG_UART_MCUX_LPUART_0_IRQ_PRI NXP_KW41Z_LPUART_40054000_IRQ_0_PRIORITY diff --git a/dts/arm/nucleo_f103rb.dts b/dts/arm/nucleo_f103rb.dts index b98bc107b55..f40da9dec43 100644 --- a/dts/arm/nucleo_f103rb.dts +++ b/dts/arm/nucleo_f103rb.dts @@ -19,6 +19,6 @@ }; &usart2 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; diff --git a/dts/arm/nucleo_f103rb.fixup b/dts/arm/nucleo_f103rb.fixup index 4b3ec44ea99..ff2881d88f1 100644 --- a/dts/arm/nucleo_f103rb.fixup +++ b/dts/arm/nucleo_f103rb.fixup @@ -8,6 +8,6 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #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_BAUD_RATE +#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 PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/nucleo_f334r8.dts b/dts/arm/nucleo_f334r8.dts index 9c50350823b..8878ed8c15c 100644 --- a/dts/arm/nucleo_f334r8.dts +++ b/dts/arm/nucleo_f334r8.dts @@ -19,6 +19,6 @@ }; &usart2 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; diff --git a/dts/arm/nucleo_f334r8.fixup b/dts/arm/nucleo_f334r8.fixup index 4b3ec44ea99..ff2881d88f1 100644 --- a/dts/arm/nucleo_f334r8.fixup +++ b/dts/arm/nucleo_f334r8.fixup @@ -8,6 +8,6 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #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_BAUD_RATE +#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 PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/nucleo_f401re.dts b/dts/arm/nucleo_f401re.dts index 997ade2560c..dfef02613ca 100644 --- a/dts/arm/nucleo_f401re.dts +++ b/dts/arm/nucleo_f401re.dts @@ -19,11 +19,11 @@ }; &usart1 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; &usart2 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; diff --git a/dts/arm/nucleo_f401re.fixup b/dts/arm/nucleo_f401re.fixup index 197a9ac1fd9..f2ea618b4b3 100644 --- a/dts/arm/nucleo_f401re.fixup +++ b/dts/arm/nucleo_f401re.fixup @@ -8,12 +8,11 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #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_BAUD_RATE +#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 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_BAUD_RATE +#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 PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 - diff --git a/dts/arm/nucleo_f411re.dts b/dts/arm/nucleo_f411re.dts index cdf3f4c452f..ca237541b9d 100644 --- a/dts/arm/nucleo_f411re.dts +++ b/dts/arm/nucleo_f411re.dts @@ -19,11 +19,11 @@ }; &usart1 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; &usart2 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; diff --git a/dts/arm/nucleo_f411re.fixup b/dts/arm/nucleo_f411re.fixup index 197a9ac1fd9..f2ea618b4b3 100644 --- a/dts/arm/nucleo_f411re.fixup +++ b/dts/arm/nucleo_f411re.fixup @@ -8,12 +8,11 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #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_BAUD_RATE +#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 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_BAUD_RATE +#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 PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 - diff --git a/dts/arm/nucleo_l476rg.dts b/dts/arm/nucleo_l476rg.dts index 04aff092acb..2df09d911a9 100644 --- a/dts/arm/nucleo_l476rg.dts +++ b/dts/arm/nucleo_l476rg.dts @@ -19,6 +19,6 @@ }; &usart2 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; diff --git a/dts/arm/nucleo_l476rg.fixup b/dts/arm/nucleo_l476rg.fixup index 410a78c5bdd..ac9af9a7608 100644 --- a/dts/arm/nucleo_l476rg.fixup +++ b/dts/arm/nucleo_l476rg.fixup @@ -7,26 +7,26 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #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_BAUD_RATE +#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 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_BAUD_RATE +#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 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_BAUD_RATE +#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 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_BAUD_RATE +#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 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_BAUD_RATE +#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 PORT_5_IRQ ST_STM32_USART_40005000_IRQ_0 diff --git a/dts/arm/nxp/nxp_kw41z.dtsi b/dts/arm/nxp/nxp_kw41z.dtsi index e6aff70ba30..5ea7850b372 100644 --- a/dts/arm/nxp/nxp_kw41z.dtsi +++ b/dts/arm/nxp/nxp_kw41z.dtsi @@ -49,7 +49,6 @@ reg = <0x40054000 0x18>; interrupts = <12 0>; - baud-rate = <115200>; pinctrl-0 = <&lpuart0_default>; pinctrl-names = "default"; diff --git a/dts/arm/olimexino_stm32.dts b/dts/arm/olimexino_stm32.dts index b0a0383badc..ce819f91f53 100644 --- a/dts/arm/olimexino_stm32.dts +++ b/dts/arm/olimexino_stm32.dts @@ -19,6 +19,6 @@ }; &usart1 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; diff --git a/dts/arm/olimexino_stm32.fixup b/dts/arm/olimexino_stm32.fixup index b3ac22140fd..61065ddeb7a 100644 --- a/dts/arm/olimexino_stm32.fixup +++ b/dts/arm/olimexino_stm32.fixup @@ -8,16 +8,16 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #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_BAUD_RATE +#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 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_BAUD_RATE +#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 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_BAUD_RATE +#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 PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0 diff --git a/dts/arm/stm3210c_eval.dts b/dts/arm/stm3210c_eval.dts index e3388e6a395..84ae83b1296 100644 --- a/dts/arm/stm3210c_eval.dts +++ b/dts/arm/stm3210c_eval.dts @@ -19,6 +19,6 @@ }; &usart2 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; diff --git a/dts/arm/stm3210c_eval.fixup b/dts/arm/stm3210c_eval.fixup index 4b3ec44ea99..ff2881d88f1 100644 --- a/dts/arm/stm3210c_eval.fixup +++ b/dts/arm/stm3210c_eval.fixup @@ -8,6 +8,6 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #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_BAUD_RATE +#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 PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/stm32373c_eval.dts b/dts/arm/stm32373c_eval.dts index e649a3387f5..0392c2b5a1c 100644 --- a/dts/arm/stm32373c_eval.dts +++ b/dts/arm/stm32373c_eval.dts @@ -19,6 +19,6 @@ }; &usart2 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; diff --git a/dts/arm/stm32373c_eval.fixup b/dts/arm/stm32373c_eval.fixup index 4b3ec44ea99..ff2881d88f1 100644 --- a/dts/arm/stm32373c_eval.fixup +++ b/dts/arm/stm32373c_eval.fixup @@ -8,6 +8,6 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #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_BAUD_RATE +#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 PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 diff --git a/dts/arm/stm32_mini_a15.dts b/dts/arm/stm32_mini_a15.dts index 39ed058625b..6f1de84a067 100644 --- a/dts/arm/stm32_mini_a15.dts +++ b/dts/arm/stm32_mini_a15.dts @@ -19,6 +19,6 @@ }; &usart1 { - baud-rate = <115200>; + current-speed = <115200>; status = "ok"; }; diff --git a/dts/arm/stm32_mini_a15.fixup b/dts/arm/stm32_mini_a15.fixup index cb4f5bfc123..101fe65a09d 100644 --- a/dts/arm/stm32_mini_a15.fixup +++ b/dts/arm/stm32_mini_a15.fixup @@ -8,6 +8,6 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #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_BAUD_RATE +#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 PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 diff --git a/dts/arm/v2m_beetle.dts b/dts/arm/v2m_beetle.dts index 6296de35a4a..13150cb669f 100644 --- a/dts/arm/v2m_beetle.dts +++ b/dts/arm/v2m_beetle.dts @@ -34,14 +34,14 @@ compatible = "arm,cmsdk-uart"; reg = <0x40004000 0x14>; interrupts = ; - baud-rate = <115200>; + current-speed = <115200>; }; uart1: uart@40005000 { compatible = "arm,cmsdk-uart"; reg = <0x40005000 0x14>; interrupts = ; - baud-rate = <115200>; + current-speed = <115200>; }; }; }; diff --git a/dts/arm/v2m_beetle.fixup b/dts/arm/v2m_beetle.fixup index 44f0b70cf8d..4fa75f4e65b 100644 --- a/dts/arm/v2m_beetle.fixup +++ b/dts/arm/v2m_beetle.fixup @@ -2,8 +2,8 @@ #define CMSDK_APB_UART_0_IRQ ARM_CMSDK_UART_40004000_IRQ_0 #define CONFIG_UART_CMSDK_APB_PORT0_IRQ_PRI ARM_CMSDK_UART_40004000_IRQ_0_PRIORITY -#define CONFIG_UART_CMSDK_APB_PORT0_BAUD_RATE ARM_CMSDK_UART_40004000_BAUD_RATE +#define CONFIG_UART_CMSDK_APB_PORT0_BAUD_RATE ARM_CMSDK_UART_40004000_CURRENT_SPEED #define CMSDK_APB_UART_1_IRQ ARM_CMSDK_UART_40005000_IRQ_0 #define CONFIG_UART_CMSDK_APB_PORT1_IRQ_PRI ARM_CMSDK_UART_40005000_IRQ_0_PRIORITY -#define CONFIG_UART_CMSDK_APB_PORT1_BAUD_RATE ARM_CMSDK_UART_40005000_BAUD_RATE +#define CONFIG_UART_CMSDK_APB_PORT1_BAUD_RATE ARM_CMSDK_UART_40005000_CURRENT_SPEED diff --git a/dts/common/yaml/uart.yaml b/dts/common/yaml/uart.yaml index 6622395c577..dfd4af35594 100644 --- a/dts/common/yaml/uart.yaml +++ b/dts/common/yaml/uart.yaml @@ -12,7 +12,7 @@ properties: category: optional description: Clock frequency information for UART operation generation: define - - baud-rate: + - current-speed: type: int category: required description: Initial baud rate setting for UART