Skip to content

Commit c1e7b4e

Browse files
dcpleungdcpleung
committed
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 zephyrproject-rtos#13753 Signed-off-by: Daniel Leung <[email protected]>
1 parent f5951cd commit c1e7b4e

File tree

13 files changed

+100
-100
lines changed

13 files changed

+100
-100
lines changed

‎boards/x86/up_squared/dts_fixup.h

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@
88

99
#ifdef CONFIG_SBL_FIXUP
1010

11-
#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_81434000_BASE_ADDRESS
12-
#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_81434000_CURRENT_SPEED
13-
#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_81434000_LABEL
14-
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_81434000_IRQ_0
15-
#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_81434000_IRQ_0_PRIORITY
16-
#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_81434000_IRQ_0_SENSE
17-
#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_81434000_CLOCK_FREQUENCY
18-
19-
#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_81432000_BASE_ADDRESS
20-
#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_81432000_CURRENT_SPEED
21-
#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_81432000_LABEL
22-
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_81432000_IRQ_0
23-
#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_81432000_IRQ_0_PRIORITY
24-
#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_81432000_IRQ_0_SENSE
25-
#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_81432000_CLOCK_FREQUENCY
11+
#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_81434000_BASE_ADDRESS
12+
#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_81434000_CURRENT_SPEED
13+
#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_81434000_LABEL
14+
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_81434000_IRQ_0
15+
#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_81434000_IRQ_0_PRIORITY
16+
#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_81434000_IRQ_0_SENSE
17+
#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_81434000_CLOCK_FREQUENCY
18+
19+
#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_81432000_BASE_ADDRESS
20+
#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_81432000_CURRENT_SPEED
21+
#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_81432000_LABEL
22+
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_81432000_IRQ_0
23+
#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_81432000_IRQ_0_PRIORITY
24+
#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_81432000_IRQ_0_SENSE
25+
#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_81432000_CLOCK_FREQUENCY
2626

2727
#else
2828

29-
#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_91524000_BASE_ADDRESS
30-
#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_91524000_CURRENT_SPEED
31-
#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_91524000_LABEL
32-
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_91524000_IRQ_0
33-
#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_91524000_IRQ_0_PRIORITY
34-
#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_91524000_IRQ_0_SENSE
35-
#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_91524000_CLOCK_FREQUENCY
36-
37-
#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_91522000_BASE_ADDRESS
38-
#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_91522000_CURRENT_SPEED
39-
#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_91522000_LABEL
40-
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_91522000_IRQ_0
41-
#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_91522000_IRQ_0_PRIORITY
42-
#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_91522000_IRQ_0_SENSE
43-
#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_91522000_CLOCK_FREQUENCY
29+
#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_91524000_BASE_ADDRESS
30+
#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_91524000_CURRENT_SPEED
31+
#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_91524000_LABEL
32+
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_91524000_IRQ_0
33+
#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_91524000_IRQ_0_PRIORITY
34+
#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_91524000_IRQ_0_SENSE
35+
#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_91524000_CLOCK_FREQUENCY
36+
37+
#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_91522000_BASE_ADDRESS
38+
#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_91522000_CURRENT_SPEED
39+
#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_91522000_LABEL
40+
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_91522000_IRQ_0
41+
#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_91522000_IRQ_0_PRIORITY
42+
#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_91522000_IRQ_0_SENSE
43+
#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_91522000_CLOCK_FREQUENCY
4444

4545
#endif
4646

‎drivers/serial/uart_ns16550.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -779,15 +779,15 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_0 = {
779779
#endif /* CONFIG_UART_NS16550_PORT_0_PCI */
780780

781781
.port = DT_UART_NS16550_PORT_0_BASE_ADDR,
782-
.baud_rate = CONFIG_UART_NS16550_PORT_0_BAUD_RATE,
782+
.baud_rate = DT_UART_NS16550_PORT_0_BAUD_RATE,
783783
.options = CONFIG_UART_NS16550_PORT_0_OPTIONS,
784784

785785
#ifdef CONFIG_UART_NS16550_PORT_0_DLF
786786
.dlf = CONFIG_UART_NS16550_PORT_0_DLF,
787787
#endif
788788
};
789789

790-
DEVICE_AND_API_INIT(uart_ns16550_0, CONFIG_UART_NS16550_PORT_0_NAME, &uart_ns16550_init,
790+
DEVICE_AND_API_INIT(uart_ns16550_0, DT_UART_NS16550_PORT_0_NAME, &uart_ns16550_init,
791791
&uart_ns16550_dev_data_0, &uart_ns16550_dev_cfg_0,
792792
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
793793
&uart_ns16550_driver_api);
@@ -798,7 +798,7 @@ static void irq_config_func_0(struct device *dev)
798798
ARG_UNUSED(dev);
799799

800800
IRQ_CONNECT(DT_UART_NS16550_PORT_0_IRQ,
801-
CONFIG_UART_NS16550_PORT_0_IRQ_PRI,
801+
DT_UART_NS16550_PORT_0_IRQ_PRI,
802802
uart_ns16550_isr, DEVICE_GET(uart_ns16550_0),
803803
DT_UART_NS16550_PORT_0_IRQ_FLAGS);
804804
irq_enable(DT_UART_NS16550_PORT_0_IRQ);
@@ -833,15 +833,15 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_1 = {
833833
#endif /* CONFIG_UART_NS16550_PORT_1_PCI */
834834

835835
.port = DT_UART_NS16550_PORT_1_BASE_ADDR,
836-
.baud_rate = CONFIG_UART_NS16550_PORT_1_BAUD_RATE,
836+
.baud_rate = DT_UART_NS16550_PORT_1_BAUD_RATE,
837837
.options = CONFIG_UART_NS16550_PORT_1_OPTIONS,
838838

839839
#ifdef CONFIG_UART_NS16550_PORT_1_DLF
840840
.dlf = CONFIG_UART_NS16550_PORT_1_DLF,
841841
#endif
842842
};
843843

844-
DEVICE_AND_API_INIT(uart_ns16550_1, CONFIG_UART_NS16550_PORT_1_NAME, &uart_ns16550_init,
844+
DEVICE_AND_API_INIT(uart_ns16550_1, DT_UART_NS16550_PORT_1_NAME, &uart_ns16550_init,
845845
&uart_ns16550_dev_data_1, &uart_ns16550_dev_cfg_1,
846846
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
847847
&uart_ns16550_driver_api);
@@ -852,7 +852,7 @@ static void irq_config_func_1(struct device *dev)
852852
ARG_UNUSED(dev);
853853

854854
IRQ_CONNECT(DT_UART_NS16550_PORT_1_IRQ,
855-
CONFIG_UART_NS16550_PORT_1_IRQ_PRI,
855+
DT_UART_NS16550_PORT_1_IRQ_PRI,
856856
uart_ns16550_isr, DEVICE_GET(uart_ns16550_1),
857857
DT_UART_NS16550_PORT_1_IRQ_FLAGS);
858858
irq_enable(DT_UART_NS16550_PORT_1_IRQ);
@@ -908,7 +908,7 @@ static void irq_config_func_2(struct device *dev)
908908
IRQ_CONNECT(DT_UART_NS16550_PORT_2_IRQ,
909909
DT_UART_NS16550_PORT_2_IRQ_PRI,
910910
uart_ns16550_isr, DEVICE_GET(uart_ns16550_2),
911-
CONFIG_UART_NS16550_PORT_2_IRQ_FLAGS);
911+
DT_UART_NS16550_PORT_2_IRQ_FLAGS);
912912
irq_enable(DT_UART_NS16550_PORT_2_IRQ);
913913
}
914914
#endif
@@ -922,7 +922,7 @@ static void irq_config_func_3(struct device *port);
922922
#endif
923923

924924
static const struct uart_ns16550_device_config uart_ns16550_dev_cfg_3 = {
925-
.sys_clk_freq = CONFIG_UART_NS16550_PORT_3_CLK_FREQ,
925+
.sys_clk_freq = DT_UART_NS16550_PORT_3_CLK_FREQ,
926926

927927
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
928928
.irq_config_func = irq_config_func_3,
@@ -940,16 +940,16 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_3 = {
940940
.pci_dev.bar = UART_NS16550_PORT_3_PCI_BAR,
941941
#endif /* CONFIG_UART_NS16550_PORT_3_PCI */
942942

943-
.port = CONFIG_UART_NS16550_PORT_3_BASE_ADDR,
944-
.baud_rate = CONFIG_UART_NS16550_PORT_3_BAUD_RATE,
943+
.port = DT_UART_NS16550_PORT_3_BASE_ADDR,
944+
.baud_rate = DT_UART_NS16550_PORT_3_BAUD_RATE,
945945
.options = CONFIG_UART_NS16550_PORT_3_OPTIONS,
946946

947947
#ifdef CONFIG_UART_NS16550_PORT_3_DLF
948948
.dlf = CONFIG_UART_NS16550_PORT_3_DLF,
949949
#endif
950950
};
951951

952-
DEVICE_AND_API_INIT(uart_ns16550_3, CONFIG_UART_NS16550_PORT_3_NAME, &uart_ns16550_init,
952+
DEVICE_AND_API_INIT(uart_ns16550_3, DT_UART_NS16550_PORT_3_NAME, &uart_ns16550_init,
953953
&uart_ns16550_dev_data_3, &uart_ns16550_dev_cfg_3,
954954
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
955955
&uart_ns16550_driver_api);
@@ -959,11 +959,11 @@ static void irq_config_func_3(struct device *dev)
959959
{
960960
ARG_UNUSED(dev);
961961

962-
IRQ_CONNECT(CONFIG_UART_NS16550_PORT_3_IRQ,
963-
CONFIG_UART_NS16550_PORT_3_IRQ_PRI,
962+
IRQ_CONNECT(DT_UART_NS16550_PORT_3_IRQ,
963+
DT_UART_NS16550_PORT_3_IRQ_PRI,
964964
uart_ns16550_isr, DEVICE_GET(uart_ns16550_3),
965-
CONFIG_UART_NS16550_PORT_3_IRQ_FLAGS);
966-
irq_enable(CONFIG_UART_NS16550_PORT_3_IRQ);
965+
DT_UART_NS16550_PORT_3_IRQ_FLAGS);
966+
irq_enable(DT_UART_NS16550_PORT_3_IRQ);
967967
}
968968
#endif
969969

‎soc/arc/snps_arc_iot/dts_fixup.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,33 @@
1717
* UART configuration
1818
*/
1919
#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_80014000_BASE_ADDRESS
20-
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_80014000_IRQ_0
20+
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_80014000_IRQ_0
2121
#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_80014000_CLOCK_FREQUENCY
22-
#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_80014000_CURRENT_SPEED
23-
#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_80014000_LABEL
24-
#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_80014000_IRQ_0_PRIORITY
22+
#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_80014000_CURRENT_SPEED
23+
#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_80014000_LABEL
24+
#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_80014000_IRQ_0_PRIORITY
2525

2626
#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_80014100_BASE_ADDRESS
27-
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_80014100_IRQ_0
27+
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_80014100_IRQ_0
2828
#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_80014100_CLOCK_FREQUENCY
29-
#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_80014100_CURRENT_SPEED
30-
#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_80014100_LABEL
31-
#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_80014100_IRQ_0_PRIORITY
29+
#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_80014100_CURRENT_SPEED
30+
#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_80014100_LABEL
31+
#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_80014100_IRQ_0_PRIORITY
3232

3333
#define DT_UART_NS16550_PORT_2_BASE_ADDR DT_NS16550_80014200_BASE_ADDRESS
34-
#define DT_UART_NS16550_PORT_2_IRQ DT_NS16550_80014200_IRQ_0
34+
#define DT_UART_NS16550_PORT_2_IRQ DT_NS16550_80014200_IRQ_0
3535
#define DT_UART_NS16550_PORT_2_CLK_FREQ DT_NS16550_80014200_CLOCK_FREQUENCY
36-
#define CONFIG_UART_NS16550_PORT_2_BAUD_RATE DT_NS16550_80014200_CURRENT_SPEED
37-
#define CONFIG_UART_NS16550_PORT_2_NAME DT_NS16550_80014200_LABEL
38-
#define CONFIG_UART_NS16550_PORT_2_IRQ_PRI DT_NS16550_80014200_IRQ_0_PRIORITY
36+
#define DT_UART_NS16550_PORT_2_BAUD_RATE DT_NS16550_80014200_CURRENT_SPEED
37+
#define DT_UART_NS16550_PORT_2_NAME DT_NS16550_80014200_LABEL
38+
#define DT_UART_NS16550_PORT_2_IRQ_PRI DT_NS16550_80014200_IRQ_0_PRIORITY
3939

4040

4141
#define DT_UART_NS16550_PORT_3_BASE_ADDR DT_NS16550_80014300_BASE_ADDRESS
42-
#define DT_UART_NS16550_PORT_3_IRQ DT_NS16550_80014300_IRQ_0
42+
#define DT_UART_NS16550_PORT_3_IRQ DT_NS16550_80014300_IRQ_0
4343
#define DT_UART_NS16550_PORT_3_CLK_FREQ DT_NS16550_80014300_CLOCK_FREQUENCY
44-
#define CONFIG_UART_NS16550_PORT_3_BAUD_RATE DT_NS16550_80014300_CURRENT_SPEED
45-
#define CONFIG_UART_NS16550_PORT_3_NAME DT_NS16550_80014300_LABEL
46-
#define CONFIG_UART_NS16550_PORT_3_IRQ_PRI DT_NS16550_80014300_IRQ_0_PRIORITY
44+
#define DT_UART_NS16550_PORT_3_BAUD_RATE DT_NS16550_80014300_CURRENT_SPEED
45+
#define DT_UART_NS16550_PORT_3_NAME DT_NS16550_80014300_LABEL
46+
#define DT_UART_NS16550_PORT_3_IRQ_PRI DT_NS16550_80014300_IRQ_0_PRIORITY
4747

4848

4949
/* End of SoC Level DTS fixup file */

‎soc/arc/snps_emsk/dts_fixup.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_F0008000_BASE_ADDRESS
1414
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_F0008000_IRQ_0
1515
#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_F0008000_CLOCK_FREQUENCY
16-
#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_F0008000_CURRENT_SPEED
17-
#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_F0008000_LABEL
18-
#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_F0008000_IRQ_0_PRIORITY
16+
#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_F0008000_CURRENT_SPEED
17+
#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_F0008000_LABEL
18+
#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_F0008000_IRQ_0_PRIORITY
1919

2020
#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_F0009000_BASE_ADDRESS
2121
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_F0009000_IRQ_0
2222
#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_F0009000_CLOCK_FREQUENCY
23-
#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_F0009000_CURRENT_SPEED
24-
#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_F0009000_LABEL
25-
#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_F0009000_IRQ_0_PRIORITY
23+
#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_F0009000_CURRENT_SPEED
24+
#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_F0009000_LABEL
25+
#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_F0009000_IRQ_0_PRIORITY
2626

2727
#define DT_UART_NS16550_PORT_2_BASE_ADDR DT_NS16550_F000A000_BASE_ADDRESS
2828
#define DT_UART_NS16550_PORT_2_IRQ DT_NS16550_F000A000_IRQ_0

‎soc/arc/snps_emsk/soc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
*/
5151
#define DT_UART_NS16550_PORT_0_IRQ_FLAGS 0 /* Default */
5252
#define DT_UART_NS16550_PORT_1_IRQ_FLAGS 0 /* Default */
53-
#define CONFIG_UART_NS16550_PORT_2_IRQ_FLAGS 0 /* Default */
53+
#define DT_UART_NS16550_PORT_2_IRQ_FLAGS 0 /* Default */
5454

5555
#ifndef CONFIG_HAS_DTS
5656
/* I2C */

‎soc/arm/microchip_mec/mec1701/dts_fixup.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
#define CONFIG_NS16550_REG_SHIFT DT_NS16550_400F2400_REG_SHIFT
1010
#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_400F2400_BASE_ADDRESS
1111
#define DT_UART_NS16550_PORT_0_CLK_FREQ 1843200
12-
#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_400F2400_LABEL
13-
#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_400F2400_CURRENT_SPEED
12+
#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_400F2400_LABEL
13+
#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_400F2400_CURRENT_SPEED
1414
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_400F2400_IRQ_0
15-
#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_0_IRQ_0_PRIORITY
15+
#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_0_IRQ_0_PRIORITY
1616
#define DT_UART_NS16550_PORT_0_IRQ_FLAGS 0 /* Deault */
1717

1818
#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_400F2800_BASE_ADDRESS
1919
#define DT_UART_NS16550_PORT_1_CLK_FREQ 1843200
20-
#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_400F2800_LABEL
21-
#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_400F2800_CURRENT_SPEED
20+
#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_400F2800_LABEL
21+
#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_400F2800_CURRENT_SPEED
2222
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_400F2800_IRQ_0
23-
#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_1_IRQ_0_PRIORITY
23+
#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_1_IRQ_0_PRIORITY
2424
#define DT_UART_NS16550_PORT_1_IRQ_FLAGS 0 /* Default */

‎soc/nios2/nios2-qemu/dts_fixup.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_440000_CURRENT_SPEED
1+
#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_440000_CURRENT_SPEED
22

3-
#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_440000_LABEL
3+
#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_440000_LABEL
44

55
#define _RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
66

‎soc/nios2/nios2f-zephyr/dts_fixup.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_F0008000_CURRENT_SPEED
1+
#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_F0008000_CURRENT_SPEED
22

3-
#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_F0008000_LABEL
3+
#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_F0008000_LABEL
44

55
#define _RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
66

‎soc/x86/apollo_lake/soc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ MMU_BOOT_REGION(DT_UART_NS16550_PORT_2_BASE_ADDR, 0x1000,
4949
#endif
5050

5151
#ifdef CONFIG_UART_NS16550_PORT_3
52-
MMU_BOOT_REGION(CONFIG_UART_NS16550_PORT_3_BASE_ADDR, 0x1000,
52+
MMU_BOOT_REGION(DT_UART_NS16550_PORT_3_BASE_ADDR, 0x1000,
5353
(MMU_ENTRY_READ | MMU_ENTRY_WRITE));
5454
#endif
5555

‎soc/x86/atom/dts_fixup.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/* SoC level DTS fixup file */
22

33
#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_3F8_BASE_ADDRESS
4-
#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_3F8_CURRENT_SPEED
5-
#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_3F8_LABEL
4+
#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_3F8_CURRENT_SPEED
5+
#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_3F8_LABEL
66
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_3F8_IRQ_0
7-
#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_3F8_IRQ_0_PRIORITY
7+
#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_3F8_IRQ_0_PRIORITY
88
#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_3F8_IRQ_0_SENSE
99
#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_3F8_CLOCK_FREQUENCY
1010

1111
#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_2F8_BASE_ADDRESS
12-
#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_2F8_CURRENT_SPEED
13-
#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_2F8_LABEL
12+
#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_2F8_CURRENT_SPEED
13+
#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_2F8_LABEL
1414
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_2F8_IRQ_0
15-
#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_2F8_IRQ_0_PRIORITY
15+
#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_2F8_IRQ_0_PRIORITY
1616
#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_2F8_IRQ_0_SENSE
1717
#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_2F8_CLOCK_FREQUENCY
1818

‎soc/x86/ia32/dts_fixup.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/* SoC level DTS fixup file */
22

33
#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_3F8_BASE_ADDRESS
4-
#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_3F8_CURRENT_SPEED
5-
#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_3F8_LABEL
4+
#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_3F8_CURRENT_SPEED
5+
#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_3F8_LABEL
66
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_3F8_IRQ_0
7-
#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_3F8_IRQ_0_PRIORITY
7+
#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_3F8_IRQ_0_PRIORITY
88
#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_3F8_IRQ_0_SENSE
99
#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_3F8_CLOCK_FREQUENCY
1010

1111
#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_2F8_BASE_ADDRESS
12-
#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_2F8_CURRENT_SPEED
13-
#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_2F8_LABEL
12+
#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_2F8_CURRENT_SPEED
13+
#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_2F8_LABEL
1414
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_2F8_IRQ_0
15-
#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_2F8_IRQ_0_PRIORITY
15+
#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_2F8_IRQ_0_PRIORITY
1616
#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_2F8_IRQ_0_SENSE
1717
#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_2F8_CLOCK_FREQUENCY
1818

‎soc/x86/intel_quark/quark_x1000/dts_fixup.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_9000F000_BASE_ADDRESS
2-
#define CONFIG_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_9000F000_CURRENT_SPEED
3-
#define CONFIG_UART_NS16550_PORT_0_NAME DT_NS16550_9000F000_LABEL
2+
#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_9000F000_CURRENT_SPEED
3+
#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_9000F000_LABEL
44
#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_9000F000_IRQ_0
5-
#define CONFIG_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_9000F000_IRQ_0_PRIORITY
5+
#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_9000F000_IRQ_0_PRIORITY
66
#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_9000F000_IRQ_0_SENSE
77
#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_9000F000_CLOCK_FREQUENCY
88

99
#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_9000B000_BASE_ADDRESS
10-
#define CONFIG_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_9000B000_CURRENT_SPEED
11-
#define CONFIG_UART_NS16550_PORT_1_NAME DT_NS16550_9000B000_LABEL
10+
#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_9000B000_CURRENT_SPEED
11+
#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_9000B000_LABEL
1212
#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_9000B000_IRQ_0
13-
#define CONFIG_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_9000B000_IRQ_0_PRIORITY
13+
#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_9000B000_IRQ_0_PRIORITY
1414
#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_9000B000_IRQ_0_SENSE
1515
#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_9000B000_CLOCK_FREQUENCY
1616

0 commit comments

Comments
 (0)