From f13af297417650cce5ecd8f402f8d52ed3b985f0 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 16 May 2017 21:07:38 -0500 Subject: [PATCH] arm: ti: cc32xx: dts: use label to generate TI CC32xx uart name Now that we can utilize label in the device tree we can convert to getting the device name for the TI CC32xx UART out of the device tree instead of from Kconfig. Signed-off-by: Kumar Gala --- drivers/serial/Kconfig.cc32xx | 7 ------- drivers/serial/uart_cc32xx.c | 2 +- dts/arm/cc3200_launchxl.fixup | 1 + dts/arm/cc3220sf_launchxl.fixup | 1 + dts/arm/ti/cc32xx.dtsi | 2 ++ 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/serial/Kconfig.cc32xx b/drivers/serial/Kconfig.cc32xx index 5b755fdc81d..22d23866f47 100644 --- a/drivers/serial/Kconfig.cc32xx +++ b/drivers/serial/Kconfig.cc32xx @@ -6,10 +6,3 @@ menuconfig UART_CC32XX depends on SOC_FAMILY_TISIMPLELINK help This option enables the CC32XX UART driver, for UART_0. - -config UART_CC32XX_NAME - string "Device Name for CC32XX UART" - default "UART_0" - depends on UART_CC32XX - help - This is the UART's device name binding. diff --git a/drivers/serial/uart_cc32xx.c b/drivers/serial/uart_cc32xx.c index 829254bc627..27858b025b2 100644 --- a/drivers/serial/uart_cc32xx.c +++ b/drivers/serial/uart_cc32xx.c @@ -306,7 +306,7 @@ static const struct uart_driver_api uart_cc32xx_driver_api = { #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ }; -DEVICE_AND_API_INIT(uart_cc32xx_0, CONFIG_UART_CONSOLE_ON_DEV_NAME, +DEVICE_AND_API_INIT(uart_cc32xx_0, CONFIG_UART_CC32XX_NAME, uart_cc32xx_init, &uart_cc32xx_dev_data_0, &uart_cc32xx_dev_cfg_0, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, diff --git a/dts/arm/cc3200_launchxl.fixup b/dts/arm/cc3200_launchxl.fixup index af1312e9de4..b11d43b3b35 100644 --- a/dts/arm/cc3200_launchxl.fixup +++ b/dts/arm/cc3200_launchxl.fixup @@ -1 +1,2 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS +#define CONFIG_UART_CC32XX_NAME TI_CC32XX_UART_4000C000_LABEL diff --git a/dts/arm/cc3220sf_launchxl.fixup b/dts/arm/cc3220sf_launchxl.fixup index af1312e9de4..b11d43b3b35 100644 --- a/dts/arm/cc3220sf_launchxl.fixup +++ b/dts/arm/cc3220sf_launchxl.fixup @@ -1 +1,2 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS +#define CONFIG_UART_CC32XX_NAME TI_CC32XX_UART_4000C000_LABEL diff --git a/dts/arm/ti/cc32xx.dtsi b/dts/arm/ti/cc32xx.dtsi index c88db0e2e2f..ca2d4163e11 100644 --- a/dts/arm/ti/cc32xx.dtsi +++ b/dts/arm/ti/cc32xx.dtsi @@ -36,6 +36,7 @@ reg = <0x4000C000 0x4c>; interrupts = ; status = "disabled"; + label = "UART_0"; }; uart1: uart@4000D000 { @@ -43,6 +44,7 @@ reg = <0x4000D000 0x4c>; interrupts = ; status = "disabled"; + label = "UART_1"; }; };