From c1e7b4eeba2686837104c42ac7ee03824f83d0d1 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Mon, 25 Feb 2019 14:26:03 -0800 Subject: [PATCH] uart/ns16550: Use DT_ prefix for remaining device configs Previous rename from CONFIG_* to DT_* left a few remaining CONFIG_*. So rename them manually now. Fix #13753 Signed-off-by: Daniel Leung --- boards/x86/up_squared/dts_fixup.h | 60 ++++++++++----------- drivers/serial/uart_ns16550.c | 30 +++++------ soc/arc/snps_arc_iot/dts_fixup.h | 32 +++++------ soc/arc/snps_emsk/dts_fixup.h | 12 ++--- soc/arc/snps_emsk/soc.h | 2 +- soc/arm/microchip_mec/mec1701/dts_fixup.h | 12 ++--- soc/nios2/nios2-qemu/dts_fixup.h | 4 +- soc/nios2/nios2f-zephyr/dts_fixup.h | 4 +- soc/x86/apollo_lake/soc.c | 2 +- soc/x86/atom/dts_fixup.h | 12 ++--- soc/x86/ia32/dts_fixup.h | 12 ++--- soc/x86/intel_quark/quark_x1000/dts_fixup.h | 12 ++--- soc/xtensa/intel_s1000/dts_fixup.h | 6 +-- 13 files changed, 100 insertions(+), 100 deletions(-) diff --git a/boards/x86/up_squared/dts_fixup.h b/boards/x86/up_squared/dts_fixup.h index 7e33e3cbe0caae..126353a582bda0 100644 --- a/boards/x86/up_squared/dts_fixup.h +++ b/boards/x86/up_squared/dts_fixup.h @@ -8,39 +8,39 @@ #ifdef CONFIG_SBL_FIXUP -#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_81434000_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_81434000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_81434000_LABEL -#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_81434000_IRQ_0 -#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_81434000_IRQ_0_PRIORITY -#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_81434000_IRQ_0_SENSE -#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_81434000_CLOCK_FREQUENCY - -#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_81432000_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_81432000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_81432000_LABEL -#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_81432000_IRQ_0 -#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_81432000_IRQ_0_PRIORITY -#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_81432000_IRQ_0_SENSE -#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_81432000_CLOCK_FREQUENCY +#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_81434000_BASE_ADDRESS +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_81434000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_81434000_LABEL +#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_81434000_IRQ_0 +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_81434000_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_81434000_IRQ_0_SENSE +#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_81434000_CLOCK_FREQUENCY + +#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_81432000_BASE_ADDRESS +#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_81432000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_81432000_LABEL +#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_81432000_IRQ_0 +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_81432000_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_81432000_IRQ_0_SENSE +#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_81432000_CLOCK_FREQUENCY #else -#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_91524000_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_91524000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_91524000_LABEL -#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_91524000_IRQ_0 -#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_91524000_IRQ_0_PRIORITY -#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_91524000_IRQ_0_SENSE -#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_91524000_CLOCK_FREQUENCY - -#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_91522000_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_91522000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_91522000_LABEL -#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_91522000_IRQ_0 -#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_91522000_IRQ_0_PRIORITY -#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_91522000_IRQ_0_SENSE -#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_91522000_CLOCK_FREQUENCY +#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_91524000_BASE_ADDRESS +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_91524000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_91524000_LABEL +#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_91524000_IRQ_0 +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_91524000_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_91524000_IRQ_0_SENSE +#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_91524000_CLOCK_FREQUENCY + +#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_91522000_BASE_ADDRESS +#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_91522000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_91522000_LABEL +#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_91522000_IRQ_0 +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_91522000_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_91522000_IRQ_0_SENSE +#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_91522000_CLOCK_FREQUENCY #endif diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c index 4e6d84d3ef24d4..14234572d05e21 100644 --- a/drivers/serial/uart_ns16550.c +++ b/drivers/serial/uart_ns16550.c @@ -779,7 +779,7 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_0 = { #endif /* CONFIG_UART_NS16550_PORT_0_PCI */ .port = DT_UART_NS16550_PORT_0_BASE_ADDR, - .baud_rate = CONFIG_UART_NS16550_PORT_0_BAUD_RATE, + .baud_rate = DT_UART_NS16550_PORT_0_BAUD_RATE, .options = CONFIG_UART_NS16550_PORT_0_OPTIONS, #ifdef CONFIG_UART_NS16550_PORT_0_DLF @@ -787,7 +787,7 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_0 = { #endif }; -DEVICE_AND_API_INIT(uart_ns16550_0, CONFIG_UART_NS16550_PORT_0_NAME, &uart_ns16550_init, +DEVICE_AND_API_INIT(uart_ns16550_0, DT_UART_NS16550_PORT_0_NAME, &uart_ns16550_init, &uart_ns16550_dev_data_0, &uart_ns16550_dev_cfg_0, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_ns16550_driver_api); @@ -798,7 +798,7 @@ static void irq_config_func_0(struct device *dev) ARG_UNUSED(dev); IRQ_CONNECT(DT_UART_NS16550_PORT_0_IRQ, - CONFIG_UART_NS16550_PORT_0_IRQ_PRI, + DT_UART_NS16550_PORT_0_IRQ_PRI, uart_ns16550_isr, DEVICE_GET(uart_ns16550_0), DT_UART_NS16550_PORT_0_IRQ_FLAGS); irq_enable(DT_UART_NS16550_PORT_0_IRQ); @@ -833,7 +833,7 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_1 = { #endif /* CONFIG_UART_NS16550_PORT_1_PCI */ .port = DT_UART_NS16550_PORT_1_BASE_ADDR, - .baud_rate = CONFIG_UART_NS16550_PORT_1_BAUD_RATE, + .baud_rate = DT_UART_NS16550_PORT_1_BAUD_RATE, .options = CONFIG_UART_NS16550_PORT_1_OPTIONS, #ifdef CONFIG_UART_NS16550_PORT_1_DLF @@ -841,7 +841,7 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_1 = { #endif }; -DEVICE_AND_API_INIT(uart_ns16550_1, CONFIG_UART_NS16550_PORT_1_NAME, &uart_ns16550_init, +DEVICE_AND_API_INIT(uart_ns16550_1, DT_UART_NS16550_PORT_1_NAME, &uart_ns16550_init, &uart_ns16550_dev_data_1, &uart_ns16550_dev_cfg_1, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_ns16550_driver_api); @@ -852,7 +852,7 @@ static void irq_config_func_1(struct device *dev) ARG_UNUSED(dev); IRQ_CONNECT(DT_UART_NS16550_PORT_1_IRQ, - CONFIG_UART_NS16550_PORT_1_IRQ_PRI, + DT_UART_NS16550_PORT_1_IRQ_PRI, uart_ns16550_isr, DEVICE_GET(uart_ns16550_1), DT_UART_NS16550_PORT_1_IRQ_FLAGS); irq_enable(DT_UART_NS16550_PORT_1_IRQ); @@ -908,7 +908,7 @@ static void irq_config_func_2(struct device *dev) IRQ_CONNECT(DT_UART_NS16550_PORT_2_IRQ, DT_UART_NS16550_PORT_2_IRQ_PRI, uart_ns16550_isr, DEVICE_GET(uart_ns16550_2), - CONFIG_UART_NS16550_PORT_2_IRQ_FLAGS); + DT_UART_NS16550_PORT_2_IRQ_FLAGS); irq_enable(DT_UART_NS16550_PORT_2_IRQ); } #endif @@ -922,7 +922,7 @@ static void irq_config_func_3(struct device *port); #endif static const struct uart_ns16550_device_config uart_ns16550_dev_cfg_3 = { - .sys_clk_freq = CONFIG_UART_NS16550_PORT_3_CLK_FREQ, + .sys_clk_freq = DT_UART_NS16550_PORT_3_CLK_FREQ, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = irq_config_func_3, @@ -940,8 +940,8 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_3 = { .pci_dev.bar = UART_NS16550_PORT_3_PCI_BAR, #endif /* CONFIG_UART_NS16550_PORT_3_PCI */ - .port = CONFIG_UART_NS16550_PORT_3_BASE_ADDR, - .baud_rate = CONFIG_UART_NS16550_PORT_3_BAUD_RATE, + .port = DT_UART_NS16550_PORT_3_BASE_ADDR, + .baud_rate = DT_UART_NS16550_PORT_3_BAUD_RATE, .options = CONFIG_UART_NS16550_PORT_3_OPTIONS, #ifdef CONFIG_UART_NS16550_PORT_3_DLF @@ -949,7 +949,7 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_3 = { #endif }; -DEVICE_AND_API_INIT(uart_ns16550_3, CONFIG_UART_NS16550_PORT_3_NAME, &uart_ns16550_init, +DEVICE_AND_API_INIT(uart_ns16550_3, DT_UART_NS16550_PORT_3_NAME, &uart_ns16550_init, &uart_ns16550_dev_data_3, &uart_ns16550_dev_cfg_3, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_ns16550_driver_api); @@ -959,11 +959,11 @@ static void irq_config_func_3(struct device *dev) { ARG_UNUSED(dev); - IRQ_CONNECT(CONFIG_UART_NS16550_PORT_3_IRQ, - CONFIG_UART_NS16550_PORT_3_IRQ_PRI, + IRQ_CONNECT(DT_UART_NS16550_PORT_3_IRQ, + DT_UART_NS16550_PORT_3_IRQ_PRI, uart_ns16550_isr, DEVICE_GET(uart_ns16550_3), - CONFIG_UART_NS16550_PORT_3_IRQ_FLAGS); - irq_enable(CONFIG_UART_NS16550_PORT_3_IRQ); + DT_UART_NS16550_PORT_3_IRQ_FLAGS); + irq_enable(DT_UART_NS16550_PORT_3_IRQ); } #endif diff --git a/soc/arc/snps_arc_iot/dts_fixup.h b/soc/arc/snps_arc_iot/dts_fixup.h index 6a31b920c3d14a..def132ed9486e9 100644 --- a/soc/arc/snps_arc_iot/dts_fixup.h +++ b/soc/arc/snps_arc_iot/dts_fixup.h @@ -17,33 +17,33 @@ * UART configuration */ #define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_80014000_BASE_ADDRESS -#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_80014000_IRQ_0 +#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_80014000_IRQ_0 #define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_80014000_CLOCK_FREQUENCY -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_80014000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_80014000_LABEL -#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_80014000_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_80014000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_80014000_LABEL +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_80014000_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_80014100_BASE_ADDRESS -#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_80014100_IRQ_0 +#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_80014100_IRQ_0 #define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_80014100_CLOCK_FREQUENCY -#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_80014100_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_80014100_LABEL -#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_80014100_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_80014100_CURRENT_SPEED +#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_80014100_LABEL +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_80014100_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_2_BASE_ADDR DT_NS16550_80014200_BASE_ADDRESS -#define DT_UART_NS16550_PORT_2_IRQ DT_NS16550_80014200_IRQ_0 +#define DT_UART_NS16550_PORT_2_IRQ DT_NS16550_80014200_IRQ_0 #define DT_UART_NS16550_PORT_2_CLK_FREQ DT_NS16550_80014200_CLOCK_FREQUENCY -#define CONFIG_UART_NS16550_PORT_2_BAUD_RATE DT_NS16550_80014200_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_2_NAME DT_NS16550_80014200_LABEL -#define CONFIG_UART_NS16550_PORT_2_IRQ_PRI DT_NS16550_80014200_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_2_BAUD_RATE DT_NS16550_80014200_CURRENT_SPEED +#define DT_UART_NS16550_PORT_2_NAME DT_NS16550_80014200_LABEL +#define DT_UART_NS16550_PORT_2_IRQ_PRI DT_NS16550_80014200_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_3_BASE_ADDR DT_NS16550_80014300_BASE_ADDRESS -#define DT_UART_NS16550_PORT_3_IRQ DT_NS16550_80014300_IRQ_0 +#define DT_UART_NS16550_PORT_3_IRQ DT_NS16550_80014300_IRQ_0 #define DT_UART_NS16550_PORT_3_CLK_FREQ DT_NS16550_80014300_CLOCK_FREQUENCY -#define CONFIG_UART_NS16550_PORT_3_BAUD_RATE DT_NS16550_80014300_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_3_NAME DT_NS16550_80014300_LABEL -#define CONFIG_UART_NS16550_PORT_3_IRQ_PRI DT_NS16550_80014300_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_3_BAUD_RATE DT_NS16550_80014300_CURRENT_SPEED +#define DT_UART_NS16550_PORT_3_NAME DT_NS16550_80014300_LABEL +#define DT_UART_NS16550_PORT_3_IRQ_PRI DT_NS16550_80014300_IRQ_0_PRIORITY /* End of SoC Level DTS fixup file */ diff --git a/soc/arc/snps_emsk/dts_fixup.h b/soc/arc/snps_emsk/dts_fixup.h index f74ef39ff7e069..5c9b39208bc505 100644 --- a/soc/arc/snps_emsk/dts_fixup.h +++ b/soc/arc/snps_emsk/dts_fixup.h @@ -13,16 +13,16 @@ #define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_F0008000_BASE_ADDRESS #define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_F0008000_IRQ_0 #define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_F0008000_CLOCK_FREQUENCY -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_F0008000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_F0008000_LABEL -#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_F0008000_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_F0008000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_F0008000_LABEL +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_F0008000_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_F0009000_BASE_ADDRESS #define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_F0009000_IRQ_0 #define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_F0009000_CLOCK_FREQUENCY -#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_F0009000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_F0009000_LABEL -#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_F0009000_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_F0009000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_F0009000_LABEL +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_F0009000_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_2_BASE_ADDR DT_NS16550_F000A000_BASE_ADDRESS #define DT_UART_NS16550_PORT_2_IRQ DT_NS16550_F000A000_IRQ_0 diff --git a/soc/arc/snps_emsk/soc.h b/soc/arc/snps_emsk/soc.h index 6bc948ad3fef79..638504995bb0ad 100644 --- a/soc/arc/snps_emsk/soc.h +++ b/soc/arc/snps_emsk/soc.h @@ -50,7 +50,7 @@ */ #define DT_UART_NS16550_PORT_0_IRQ_FLAGS 0 /* Default */ #define DT_UART_NS16550_PORT_1_IRQ_FLAGS 0 /* Default */ -#define CONFIG_UART_NS16550_PORT_2_IRQ_FLAGS 0 /* Default */ +#define DT_UART_NS16550_PORT_2_IRQ_FLAGS 0 /* Default */ #ifndef CONFIG_HAS_DTS /* I2C */ diff --git a/soc/arm/microchip_mec/mec1701/dts_fixup.h b/soc/arm/microchip_mec/mec1701/dts_fixup.h index 4e428dfdf74f6d..649ac0a3ced57d 100644 --- a/soc/arm/microchip_mec/mec1701/dts_fixup.h +++ b/soc/arm/microchip_mec/mec1701/dts_fixup.h @@ -9,16 +9,16 @@ #define CONFIG_NS16550_REG_SHIFT DT_NS16550_400F2400_REG_SHIFT #define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_400F2400_BASE_ADDRESS #define DT_UART_NS16550_PORT_0_CLK_FREQ 1843200 -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_400F2400_LABEL -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_400F2400_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_400F2400_LABEL +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_400F2400_CURRENT_SPEED #define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_400F2400_IRQ_0 -#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_0_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_0_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_0_IRQ_FLAGS 0 /* Deault */ #define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_400F2800_BASE_ADDRESS #define DT_UART_NS16550_PORT_1_CLK_FREQ 1843200 -#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_400F2800_LABEL -#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_400F2800_CURRENT_SPEED +#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_400F2800_LABEL +#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_400F2800_CURRENT_SPEED #define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_400F2800_IRQ_0 -#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_1_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_1_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_1_IRQ_FLAGS 0 /* Default */ diff --git a/soc/nios2/nios2-qemu/dts_fixup.h b/soc/nios2/nios2-qemu/dts_fixup.h index b86e7357a6647b..bbf73a1f15f60f 100644 --- a/soc/nios2/nios2-qemu/dts_fixup.h +++ b/soc/nios2/nios2-qemu/dts_fixup.h @@ -1,6 +1,6 @@ -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_440000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_440000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_440000_LABEL +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_440000_LABEL #define _RAM_ADDR CONFIG_SRAM_BASE_ADDRESS diff --git a/soc/nios2/nios2f-zephyr/dts_fixup.h b/soc/nios2/nios2f-zephyr/dts_fixup.h index 7c44c264f2d20a..d6a176c1f45185 100644 --- a/soc/nios2/nios2f-zephyr/dts_fixup.h +++ b/soc/nios2/nios2f-zephyr/dts_fixup.h @@ -1,6 +1,6 @@ -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_F0008000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_F0008000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_F0008000_LABEL +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_F0008000_LABEL #define _RAM_ADDR CONFIG_SRAM_BASE_ADDRESS diff --git a/soc/x86/apollo_lake/soc.c b/soc/x86/apollo_lake/soc.c index cb735558925d7a..7fb30be803604d 100644 --- a/soc/x86/apollo_lake/soc.c +++ b/soc/x86/apollo_lake/soc.c @@ -49,7 +49,7 @@ MMU_BOOT_REGION(DT_UART_NS16550_PORT_2_BASE_ADDR, 0x1000, #endif #ifdef CONFIG_UART_NS16550_PORT_3 -MMU_BOOT_REGION(CONFIG_UART_NS16550_PORT_3_BASE_ADDR, 0x1000, +MMU_BOOT_REGION(DT_UART_NS16550_PORT_3_BASE_ADDR, 0x1000, (MMU_ENTRY_READ | MMU_ENTRY_WRITE)); #endif diff --git a/soc/x86/atom/dts_fixup.h b/soc/x86/atom/dts_fixup.h index 71266e835c32e0..2bb83f7395b953 100644 --- a/soc/x86/atom/dts_fixup.h +++ b/soc/x86/atom/dts_fixup.h @@ -1,18 +1,18 @@ /* SoC level DTS fixup file */ #define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_3F8_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_3F8_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_3F8_LABEL +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_3F8_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_3F8_LABEL #define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_3F8_IRQ_0 -#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_3F8_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_3F8_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_3F8_IRQ_0_SENSE #define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_3F8_CLOCK_FREQUENCY #define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_2F8_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_2F8_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_2F8_LABEL +#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_2F8_CURRENT_SPEED +#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_2F8_LABEL #define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_2F8_IRQ_0 -#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_2F8_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_2F8_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_2F8_IRQ_0_SENSE #define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_2F8_CLOCK_FREQUENCY diff --git a/soc/x86/ia32/dts_fixup.h b/soc/x86/ia32/dts_fixup.h index bab6e48239b043..0ba0da0b322c92 100644 --- a/soc/x86/ia32/dts_fixup.h +++ b/soc/x86/ia32/dts_fixup.h @@ -1,18 +1,18 @@ /* SoC level DTS fixup file */ #define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_3F8_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_3F8_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_3F8_LABEL +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_3F8_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_3F8_LABEL #define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_3F8_IRQ_0 -#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_3F8_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_3F8_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_3F8_IRQ_0_SENSE #define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_3F8_CLOCK_FREQUENCY #define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_2F8_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_2F8_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_2F8_LABEL +#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_2F8_CURRENT_SPEED +#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_2F8_LABEL #define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_2F8_IRQ_0 -#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_2F8_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_2F8_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_2F8_IRQ_0_SENSE #define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_2F8_CLOCK_FREQUENCY diff --git a/soc/x86/intel_quark/quark_x1000/dts_fixup.h b/soc/x86/intel_quark/quark_x1000/dts_fixup.h index 1924c81bb020be..d5613ba1226623 100644 --- a/soc/x86/intel_quark/quark_x1000/dts_fixup.h +++ b/soc/x86/intel_quark/quark_x1000/dts_fixup.h @@ -1,16 +1,16 @@ #define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_9000F000_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_9000F000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_9000F000_LABEL +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_9000F000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_9000F000_LABEL #define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_9000F000_IRQ_0 -#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_9000F000_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_9000F000_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_9000F000_IRQ_0_SENSE #define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_9000F000_CLOCK_FREQUENCY #define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_9000B000_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_9000B000_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_9000B000_LABEL +#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_9000B000_CURRENT_SPEED +#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_9000B000_LABEL #define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_9000B000_IRQ_0 -#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_9000B000_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_9000B000_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_9000B000_IRQ_0_SENSE #define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_9000B000_CLOCK_FREQUENCY diff --git a/soc/xtensa/intel_s1000/dts_fixup.h b/soc/xtensa/intel_s1000/dts_fixup.h index fbdc5809aacbbb..481c23464afb0f 100644 --- a/soc/xtensa/intel_s1000/dts_fixup.h +++ b/soc/xtensa/intel_s1000/dts_fixup.h @@ -1,10 +1,10 @@ /* SoC level DTS fixup file */ #define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_80800_BASE_ADDRESS -#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_80800_CURRENT_SPEED -#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_80800_LABEL +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_80800_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_80800_LABEL #define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_80800_IRQ_0 -#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_80800_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_80800_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_80800_IRQ_0_SENSE #define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_80800_CLOCK_FREQUENCY