From 22874ef30137c141bb3cbba1bd0b30d6a6397a05 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 16 May 2017 21:10:47 -0500 Subject: [PATCH] arm: ti: stellaris: dts: use label to generate TI Stellaris uart name Now that we can utilize label in the device tree we can convert to getting the device name for the TI Stellaris UART out of the device tree instead of from Kconfig. Signed-off-by: Kumar Gala --- drivers/serial/Kconfig.stellaris | 24 ------------------------ dts/arm/qemu_cortex_m3.fixup | 3 +++ dts/arm/ti/lm3s6965.dtsi | 3 +++ 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/drivers/serial/Kconfig.stellaris b/drivers/serial/Kconfig.stellaris index 587811ff9e8..8c0e1d91d0e 100644 --- a/drivers/serial/Kconfig.stellaris +++ b/drivers/serial/Kconfig.stellaris @@ -17,14 +17,6 @@ menuconfig UART_STELLARIS_PORT_0 This tells the driver to configure the UART port at boot, depending on the additional configure options below. -config UART_STELLARIS_PORT_0_NAME - string "Port 0 Device Name" - default "UART_0" - depends on UART_STELLARIS_PORT_0 - help - This is the device name for UART, and is included in the device - struct. - # ---------- Port 1 ---------- menuconfig UART_STELLARIS_PORT_1 @@ -35,14 +27,6 @@ menuconfig UART_STELLARIS_PORT_1 This tells the driver to configure the UART port at boot, depending on the additional configure options below. -config UART_STELLARIS_PORT_1_NAME - string "Port 1 Device Name" - default "UART_1" - depends on UART_STELLARIS_PORT_1 - help - This is the device name for UART, and is included in the device - struct. - # ---------- Port 2 ---------- menuconfig UART_STELLARIS_PORT_2 @@ -52,11 +36,3 @@ menuconfig UART_STELLARIS_PORT_2 help This tells the driver to configure the UART port at boot, depending on the additional configure options below. - -config UART_STELLARIS_PORT_2_NAME - string "Port 2 Device Name" - default "UART_2" - depends on UART_STELLARIS_PORT_2 - help - This is the device name for UART, and is included in the device - struct. diff --git a/dts/arm/qemu_cortex_m3.fixup b/dts/arm/qemu_cortex_m3.fixup index af1312e9de4..20975620edb 100644 --- a/dts/arm/qemu_cortex_m3.fixup +++ b/dts/arm/qemu_cortex_m3.fixup @@ -1 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS +#define CONFIG_UART_STELLARIS_PORT_0_NAME TI_STELLARIS_UART_4000C000_LABEL +#define CONFIG_UART_STELLARIS_PORT_1_NAME TI_STELLARIS_UART_4000D000_LABEL +#define CONFIG_UART_STELLARIS_PORT_2_NAME TI_STELLARIS_UART_4000E000_LABEL diff --git a/dts/arm/ti/lm3s6965.dtsi b/dts/arm/ti/lm3s6965.dtsi index 007c6a26ef1..026ac89a19c 100644 --- a/dts/arm/ti/lm3s6965.dtsi +++ b/dts/arm/ti/lm3s6965.dtsi @@ -22,6 +22,7 @@ reg = <0x4000C000 0x4c>; interrupts = <5 3>; status = "disabled"; + label = "UART_0"; }; uart1: uart@4000D000 { @@ -29,6 +30,7 @@ reg = <0x4000D000 0x4c>; interrupts = <6 3>; status = "disabled"; + label = "UART_1"; }; uart2: uart@4000E000 { @@ -36,6 +38,7 @@ reg = <0x4000E000 0x4c>; interrupts = <33 3>; status = "disabled"; + label = "UART_2"; }; }; };