diff --git a/drivers/serial/Kconfig.cmsdk_apb b/drivers/serial/Kconfig.cmsdk_apb index 8c14229b418..736b08c2325 100644 --- a/drivers/serial/Kconfig.cmsdk_apb +++ b/drivers/serial/Kconfig.cmsdk_apb @@ -24,14 +24,6 @@ config UART_CMSDK_APB_PORT0 help Build the driver to utilize UART controller Port 0. -config UART_CMSDK_APB_PORT0_NAME - string "Device Name for UART 0" - default "UART_0" - depends on UART_CMSDK_APB_PORT0 - help - This is the device name for UART, and is included in the device - struct. - # ---------- Port 1 ---------- config UART_CMSDK_APB_PORT1 @@ -40,14 +32,6 @@ config UART_CMSDK_APB_PORT1 help Build the driver to utilize UART controller Port 1. -config UART_CMSDK_APB_PORT1_NAME - string "Device Name for UART 1" - default "UART_1" - depends on UART_CMSDK_APB_PORT1 - help - This is the device name for UART, and is included in the device - struct. - # ---------- Port 2 ---------- config UART_CMSDK_APB_PORT2 @@ -56,14 +40,6 @@ config UART_CMSDK_APB_PORT2 help Build the driver to utilize UART controller Port 2. -config UART_CMSDK_APB_PORT2_NAME - string "Device Name for UART 2" - default "UART_2" - depends on UART_CMSDK_APB_PORT2 - help - This is the device name for UART, and is included in the device - struct. - # ---------- Port 3 ---------- config UART_CMSDK_APB_PORT3 @@ -72,14 +48,6 @@ config UART_CMSDK_APB_PORT3 help Build the driver to utilize UART controller Port 3. -config UART_CMSDK_APB_PORT3_NAME - string "Device Name for UART 3" - default "UART_3" - depends on UART_CMSDK_APB_PORT3 - help - This is the device name for UART, and is included in the device - struct. - # ---------- Port 4 ---------- config UART_CMSDK_APB_PORT4 @@ -88,12 +56,4 @@ config UART_CMSDK_APB_PORT4 help Build the driver to utilize UART controller Port 4. -config UART_CMSDK_APB_PORT4_NAME - string "Device Name for UART 4" - default "UART_4" - depends on UART_CMSDK_APB_PORT4 - help - This is the device name for UART, and is included in the device - struct. - endif # UART_CMSDK_APB diff --git a/dts/arm/mps2_an385.dts b/dts/arm/mps2_an385.dts index 657f10008f9..5253d03e73a 100644 --- a/dts/arm/mps2_an385.dts +++ b/dts/arm/mps2_an385.dts @@ -53,6 +53,7 @@ reg = <0x40004000 0x1000>; interrupts = ; current-speed = <115200>; + label = "UART_0"; }; uart1: uart@40005000 { @@ -60,6 +61,7 @@ reg = <0x40005000 0x1000>; interrupts = ; current-speed = <115200>; + label = "UART_1"; }; uart2: uart@40006000 { @@ -67,6 +69,7 @@ reg = <0x40006000 0x1000>; interrupts = ; current-speed = <115200>; + label = "UART_2"; }; uart3: uart@40007000 { @@ -74,6 +77,7 @@ reg = <0x40007000 0x1000>; interrupts = ; current-speed = <115200>; + label = "UART_3"; }; wdog0: wdog@40008000 { @@ -86,6 +90,7 @@ reg = <0x40009000 0x1000>; interrupts = ; current-speed = <115200>; + label = "UART_4"; }; gpio0: gpio@40010000 { diff --git a/dts/arm/mps2_an385.fixup b/dts/arm/mps2_an385.fixup index a6925004421..96b75d95db4 100644 --- a/dts/arm/mps2_an385.fixup +++ b/dts/arm/mps2_an385.fixup @@ -17,30 +17,35 @@ #define CMSDK_APB_UART_0_IRQ_RX ARM_CMSDK_UART_40004000_IRQ_1 #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_CURRENT_SPEED +#define CONFIG_UART_CMSDK_APB_PORT0_NAME ARM_CMSDK_UART_40004000_LABEL #define CMSDK_APB_UART1 ARM_CMSDK_UART_40005000_BASE_ADDRESS_0 #define CMSDK_APB_UART_1_IRQ_TX ARM_CMSDK_UART_40005000_IRQ_0 #define CMSDK_APB_UART_1_IRQ_RX ARM_CMSDK_UART_40005000_IRQ_1 #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_CURRENT_SPEED +#define CONFIG_UART_CMSDK_APB_PORT1_NAME ARM_CMSDK_UART_40005000_LABEL #define CMSDK_APB_UART2 ARM_CMSDK_UART_40006000_BASE_ADDRESS_0 #define CMSDK_APB_UART_2_IRQ_TX ARM_CMSDK_UART_40006000_IRQ_0 #define CMSDK_APB_UART_2_IRQ_RX ARM_CMSDK_UART_40006000_IRQ_1 #define CONFIG_UART_CMSDK_APB_PORT2_IRQ_PRI ARM_CMSDK_UART_40006000_IRQ_0_PRIORITY #define CONFIG_UART_CMSDK_APB_PORT2_BAUD_RATE ARM_CMSDK_UART_40006000_CURRENT_SPEED +#define CONFIG_UART_CMSDK_APB_PORT2_NAME ARM_CMSDK_UART_40006000_LABEL #define CMSDK_APB_UART3 ARM_CMSDK_UART_40007000_BASE_ADDRESS_0 #define CMSDK_APB_UART_3_IRQ_TX ARM_CMSDK_UART_40007000_IRQ_0 #define CMSDK_APB_UART_3_IRQ_RX ARM_CMSDK_UART_40007000_IRQ_1 #define CONFIG_UART_CMSDK_APB_PORT3_IRQ_PRI ARM_CMSDK_UART_40007000_IRQ_0_PRIORITY #define CONFIG_UART_CMSDK_APB_PORT3_BAUD_RATE ARM_CMSDK_UART_40007000_CURRENT_SPEED +#define CONFIG_UART_CMSDK_APB_PORT3_NAME ARM_CMSDK_UART_40007000_LABEL #define CMSDK_APB_UART4 ARM_CMSDK_UART_40009000_BASE_ADDRESS_0 #define CMSDK_APB_UART_4_IRQ_TX ARM_CMSDK_UART_40009000_IRQ_0 #define CMSDK_APB_UART_4_IRQ_RX ARM_CMSDK_UART_40009000_IRQ_1 #define CONFIG_UART_CMSDK_APB_PORT4_IRQ_PRI ARM_CMSDK_UART_40009000_IRQ_0_PRIORITY #define CONFIG_UART_CMSDK_APB_PORT4_BAUD_RATE ARM_CMSDK_UART_40009000_CURRENT_SPEED +#define CONFIG_UART_CMSDK_APB_PORT4_NAME ARM_CMSDK_UART_40009000_LABEL /* CMSDK APB Watchdog */ #define CMSDK_APB_WDOG ARM_CMSDK_WATCHDOG_40008000_BASE_ADDRESS_0 diff --git a/dts/arm/v2m_beetle.dts b/dts/arm/v2m_beetle.dts index 05ae6de4bac..7002c1c3fa4 100644 --- a/dts/arm/v2m_beetle.dts +++ b/dts/arm/v2m_beetle.dts @@ -53,6 +53,7 @@ reg = <0x40004000 0x1000>; interrupts = ; current-speed = <115200>; + label = "UART_0"; }; uart1: uart@40005000 { @@ -60,6 +61,7 @@ reg = <0x40005000 0x1000>; interrupts = ; current-speed = <115200>; + label = "UART_1"; }; wdog0: wdog@40008000 { diff --git a/dts/arm/v2m_beetle.fixup b/dts/arm/v2m_beetle.fixup index b96d42e823d..6d35f948d0d 100644 --- a/dts/arm/v2m_beetle.fixup +++ b/dts/arm/v2m_beetle.fixup @@ -16,11 +16,13 @@ #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_CURRENT_SPEED +#define CONFIG_UART_CMSDK_APB_PORT0_NAME ARM_CMSDK_UART_40004000_LABEL #define CMSDK_APB_UART1 ARM_CMSDK_UART_40005000_BASE_ADDRESS_0 #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_CURRENT_SPEED +#define CONFIG_UART_CMSDK_APB_PORT1_NAME ARM_CMSDK_UART_40005000_LABEL /* CMSDK APB Watchdog */ #define CMSDK_APB_WDOG ARM_CMSDK_WATCHDOG_40008000_BASE_ADDRESS_0