Skip to content

Commit 1bd9d4f

Browse files
ycsingmarull
ycsin
authored and
gmarull
committed
[nrf fromtree] zephyr: bulk update to DT_NODE_HAS_STATUS_OKAY
Change instances of: DT_NODE_HAS_STATUS(<node_id>, okay) to DT_NODE_HAS_STATUS_OKAY(<node_id>) Signed-off-by: Yong Cong Sin <[email protected]> Signed-off-by: Yong Cong Sin <[email protected]> (cherry picked from commit 52a2023)
1 parent 761c285 commit 1bd9d4f

File tree

180 files changed

+743
-738
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+743
-738
lines changed

‎arch/arm/core/cortex_m/fault.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ static inline bool z_arm_is_pc_valid(uintptr_t pc)
743743
return true;
744744
}
745745

746-
#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay)
746+
#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_itcm))
747747
/* Is it in the ITCM */
748748
if ((((uintptr_t)&__itcm_start) <= pc) && (pc < ((uintptr_t)&__itcm_end))) {
749749
return true;

‎boards/arm/v2m_musca_b1/pinmux.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static void arm_musca_b1_pinmux_defaults(void)
4040
scc[IOMUX_ALTF1_OUTSEL] = 0xffff;
4141
scc[IOMUX_ALTF1_OENSEL] = 0xffff;
4242

43-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
43+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
4444
/* clear bit 0/1 for GPIO0/1 to steer from ALTF1 */
4545
scc[IOMUX_MAIN_INSEL] &= ~(BIT(0) | BIT(1));
4646
scc[IOMUX_MAIN_OUTSEL] &= ~(BIT(0) | BIT(1));

‎boards/arm/v2m_musca_s1/pinmux.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static void arm_musca_s1_pinmux_defaults(void)
4040
scc[IOMUX_ALTF1_OUTSEL] = 0xffff;
4141
scc[IOMUX_ALTF1_OENSEL] = 0xffff;
4242

43-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
43+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
4444
/* clear bit 0/1 for GPIO0/1 to steer from ALTF1 */
4545
scc[IOMUX_MAIN_INSEL] &= ~(BIT(0) | BIT(1));
4646
scc[IOMUX_MAIN_OUTSEL] &= ~(BIT(0) | BIT(1));

‎boards/digilent/arty_a7/board.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(board, CONFIG_LOG_DEFAULT_LEVEL);
1616

1717
#define DAPLINK_QSPI_MUX_NODE DT_NODELABEL(daplink_qspi_mux)
1818

19-
#if DT_NODE_HAS_STATUS(DAPLINK_QSPI_MUX_NODE, okay)
19+
#if DT_NODE_HAS_STATUS_OKAY(DAPLINK_QSPI_MUX_NODE)
2020
int board_daplink_qspi_mux_select(enum board_daplink_qspi_mux_mode mode)
2121
{
2222
struct gpio_dt_spec mux = GPIO_DT_SPEC_GET(DAPLINK_QSPI_MUX_NODE, mux_gpios);
@@ -77,4 +77,4 @@ static int board_init(void)
7777
}
7878

7979
SYS_INIT(board_init, POST_KERNEL, CONFIG_BOARD_INIT_PRIORITY);
80-
#endif /* DT_NODE_HAS_STATUS(DAPLINK_QSPI_MUX_NODE, okay) */
80+
#endif /* DT_NODE_HAS_STATUS_OKAY(DAPLINK_QSPI_MUX_NODE) */

‎boards/nordic/nrf9160dk/board.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ LOG_MODULE_REGISTER(board_control, CONFIG_BOARD_NRF9160DK_LOG_LEVEL);
3232
GET_PORT(reset_input, gpios, 0) == 0 && \
3333
GET_PIN(reset_input, gpios, 0) == 18)
3434
#define USE_RESET_GPIO \
35-
(DT_NODE_HAS_STATUS(DT_NODELABEL(reset_input), okay) && \
35+
(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(reset_input)) && \
3636
!RESET_INPUT_IS_PINRESET)
3737

3838
struct switch_cfg {
@@ -47,7 +47,7 @@ struct switch_cfg {
4747
#endif
4848
};
4949

50-
#define ROUTING_ENABLED(_name) DT_NODE_HAS_STATUS(DT_NODELABEL(_name), okay)
50+
#define ROUTING_ENABLED(_name) DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(_name))
5151
#define SWITCH_CFG(_name, _idx) \
5252
{ \
5353
.gpio = GET_DEV(_name, control_gpios, _idx), \

‎boards/nordic/nrf9160dk/nrf52840_reset.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#define RESET_NODE DT_NODELABEL(nrf52840_reset)
1414

15-
#if DT_NODE_HAS_STATUS(RESET_NODE, okay)
15+
#if DT_NODE_HAS_STATUS_OKAY(RESET_NODE)
1616

1717
#define RESET_GPIO_CTRL DT_GPIO_CTLR(RESET_NODE, gpios)
1818
#define RESET_GPIO_PIN DT_GPIO_PIN(RESET_NODE, gpios)
@@ -65,4 +65,4 @@ int bt_hci_transport_setup(const struct device *h4)
6565
return 0;
6666
}
6767

68-
#endif /* DT_NODE_HAS_STATUS(RESET_NODE, okay) */
68+
#endif /* DT_NODE_HAS_STATUS_OKAY(RESET_NODE) */

‎boards/nxp/frdm_mcxa156/board.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,52 +66,52 @@ static int frdm_mcxa156_init(void)
6666
CLOCK_SetClockDiv(kCLOCK_DivAHBCLK, 1U); /* !< Set AHBCLKDIV divider to value 1 */
6767
CLOCK_SetClockDiv(kCLOCK_DivFRO_HF_DIV, 1U); /* !< Set FROHFDIV divider to value 1 */
6868

69-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(porta), okay)
69+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porta))
7070
RESET_ReleasePeripheralReset(kPORT0_RST_SHIFT_RSTn);
7171
#endif
7272

73-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(portb), okay)
73+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portb))
7474
RESET_ReleasePeripheralReset(kPORT1_RST_SHIFT_RSTn);
7575
#endif
7676

77-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(portc), okay)
77+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portc))
7878
RESET_ReleasePeripheralReset(kPORT2_RST_SHIFT_RSTn);
7979
#endif
8080

81-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(portd), okay)
81+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portd))
8282
RESET_ReleasePeripheralReset(kPORT3_RST_SHIFT_RSTn);
8383
#endif
8484

85-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(porte), okay)
85+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porte))
8686
RESET_ReleasePeripheralReset(kPORT4_RST_SHIFT_RSTn);
8787
#endif
8888

89-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
89+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
9090
RESET_ReleasePeripheralReset(kGPIO0_RST_SHIFT_RSTn);
9191
CLOCK_EnableClock(kCLOCK_GateGPIO0);
9292
#endif
9393

94-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
94+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
9595
RESET_ReleasePeripheralReset(kGPIO1_RST_SHIFT_RSTn);
9696
CLOCK_EnableClock(kCLOCK_GateGPIO1);
9797
#endif
9898

99-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
99+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
100100
RESET_ReleasePeripheralReset(kGPIO2_RST_SHIFT_RSTn);
101101
CLOCK_EnableClock(kCLOCK_GateGPIO2);
102102
#endif
103103

104-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
104+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
105105
RESET_ReleasePeripheralReset(kGPIO3_RST_SHIFT_RSTn);
106106
CLOCK_EnableClock(kCLOCK_GateGPIO3);
107107
#endif
108108

109-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
109+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
110110
RESET_ReleasePeripheralReset(kGPIO4_RST_SHIFT_RSTn);
111111
CLOCK_EnableClock(kCLOCK_GateGPIO4);
112112
#endif
113113

114-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
114+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
115115
CLOCK_SetClockDiv(kCLOCK_DivLPUART0, 1u);
116116
CLOCK_AttachClk(kFRO12M_to_LPUART0);
117117
#endif

‎boards/nxp/frdm_mcxn236/board.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,84 +88,84 @@ static int frdm_mcxn236_init(void)
8888
/* Set AHBCLKDIV divider to value 1 */
8989
CLOCK_SetClkDiv(kCLOCK_DivAhbClk, 1U);
9090

91-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm1), okay)
91+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm1))
9292
CLOCK_SetClkDiv(kCLOCK_DivFlexcom1Clk, 1u);
9393
CLOCK_AttachClk(kFRO12M_to_FLEXCOMM1);
9494
#endif
9595

96-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm2), okay)
96+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm2))
9797
CLOCK_SetClkDiv(kCLOCK_DivFlexcom2Clk, 1u);
9898
CLOCK_AttachClk(kFRO12M_to_FLEXCOMM2);
9999
#endif
100100

101-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm3), okay)
101+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm3))
102102
CLOCK_SetClkDiv(kCLOCK_DivFlexcom3Clk, 1u);
103103
CLOCK_AttachClk(kFRO12M_to_FLEXCOMM3);
104104
#endif
105105

106-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm4), okay)
106+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm4))
107107
CLOCK_SetClkDiv(kCLOCK_DivFlexcom4Clk, 1u);
108108
CLOCK_AttachClk(kFRO12M_to_FLEXCOMM4);
109109
#endif
110110

111-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm5), okay)
111+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm5))
112112
CLOCK_SetClkDiv(kCLOCK_DivFlexcom5Clk, 1u);
113113
CLOCK_AttachClk(kFRO12M_to_FLEXCOMM5);
114114
#endif
115115

116-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(os_timer), okay)
116+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(os_timer))
117117
CLOCK_AttachClk(kCLK_1M_to_OSTIMER);
118118
#endif
119119

120-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
120+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
121121
CLOCK_EnableClock(kCLOCK_Gpio0);
122122
#endif
123123

124-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
124+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
125125
CLOCK_EnableClock(kCLOCK_Gpio1);
126126
#endif
127127

128-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
128+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
129129
CLOCK_EnableClock(kCLOCK_Gpio2);
130130
#endif
131131

132-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
132+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
133133
CLOCK_EnableClock(kCLOCK_Gpio3);
134134
#endif
135135

136-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
136+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
137137
CLOCK_EnableClock(kCLOCK_Gpio4);
138138
#endif
139139

140-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio5), okay)
140+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio5))
141141
CLOCK_EnableClock(kCLOCK_Gpio5);
142142
#endif
143143

144-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(wwdt0), okay)
144+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(wwdt0))
145145
CLOCK_SetClkDiv(kCLOCK_DivWdt0Clk, 1u);
146146
#endif
147147

148-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer0), okay)
148+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer0))
149149
CLOCK_SetClkDiv(kCLOCK_DivCtimer0Clk, 1U);
150150
CLOCK_AttachClk(kPLL0_to_CTIMER0);
151151
#endif
152152

153-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer1), okay)
153+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer1))
154154
CLOCK_SetClkDiv(kCLOCK_DivCtimer1Clk, 1U);
155155
CLOCK_AttachClk(kPLL0_to_CTIMER1);
156156
#endif
157157

158-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer2), okay)
158+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer2))
159159
CLOCK_SetClkDiv(kCLOCK_DivCtimer2Clk, 1U);
160160
CLOCK_AttachClk(kPLL0_to_CTIMER2);
161161
#endif
162162

163-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer3), okay)
163+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer3))
164164
CLOCK_SetClkDiv(kCLOCK_DivCtimer3Clk, 1U);
165165
CLOCK_AttachClk(kPLL0_to_CTIMER3);
166166
#endif
167167

168-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer4), okay)
168+
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer4))
169169
CLOCK_SetClkDiv(kCLOCK_DivCtimer4Clk, 1U);
170170
CLOCK_AttachClk(kPLL0_to_CTIMER4);
171171
#endif

0 commit comments

Comments
 (0)