From 4c24b1d85789f63b2f2b69986e87fb6068df2ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20Le=20Gourri=C3=A9rec?= Date: Fri, 16 Jun 2017 17:42:01 +0200 Subject: [PATCH] uart: Use DTS labels for Stellaris driver. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update driver to use DTS-generated #defines for port names, and not obsolete Kconfig variables. Signed-off-by: Geoffrey Le Gourriérec --- drivers/serial/uart_stellaris.c | 9 ++++++--- dts/arm/qemu_cortex_m3.fixup | 3 --- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c index b697f10b110..d359efe0a2b 100644 --- a/drivers/serial/uart_stellaris.c +++ b/drivers/serial/uart_stellaris.c @@ -644,7 +644,8 @@ static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_0 = { .baud_rate = TI_STELLARIS_UART_4000C000_CURRENT_SPEED, }; -DEVICE_AND_API_INIT(uart_stellaris0, CONFIG_UART_STELLARIS_PORT_0_NAME, &uart_stellaris_init, +DEVICE_AND_API_INIT(uart_stellaris0, TI_STELLARIS_UART_4000C000_LABEL, + &uart_stellaris_init, &uart_stellaris_dev_data_0, &uart_stellaris_dev_cfg_0, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_stellaris_driver_api); @@ -681,7 +682,8 @@ static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_1 = { .baud_rate = TI_STELLARIS_UART_4000D000_CURRENT_SPEED, }; -DEVICE_AND_API_INIT(uart_stellaris1, CONFIG_UART_STELLARIS_PORT_1_NAME, &uart_stellaris_init, +DEVICE_AND_API_INIT(uart_stellaris1, TI_STELLARIS_UART_4000D000_LABEL, + &uart_stellaris_init, &uart_stellaris_dev_data_1, &uart_stellaris_dev_cfg_1, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_stellaris_driver_api); @@ -718,7 +720,8 @@ static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_2 = { .baud_rate = TI_STELLARIS_UART_4000E000_CURRENT_SPEED, }; -DEVICE_AND_API_INIT(uart_stellaris2, CONFIG_UART_STELLARIS_PORT_2_NAME, &uart_stellaris_init, +DEVICE_AND_API_INIT(uart_stellaris2, TI_STELLARIS_UART_4000E000_LABEL, + &uart_stellaris_init, &uart_stellaris_dev_data_2, &uart_stellaris_dev_cfg_2, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_stellaris_driver_api); diff --git a/dts/arm/qemu_cortex_m3.fixup b/dts/arm/qemu_cortex_m3.fixup index 20975620edb..af1312e9de4 100644 --- a/dts/arm/qemu_cortex_m3.fixup +++ b/dts/arm/qemu_cortex_m3.fixup @@ -1,4 +1 @@ #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