Skip to content

Commit 4b36638

Browse files
maass-hamburgkartben
authored andcommitted
drivers: flash: spi_nor: use existing DT macros
use existing DT macros for `ANY_INST_HAS..` defines. Signed-off-by: Fin Maaß <[email protected]>
1 parent ae05388 commit 4b36638

File tree

1 file changed

+8
-21
lines changed

1 file changed

+8
-21
lines changed

drivers/flash/spi_nor.c

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,14 @@ LOG_MODULE_REGISTER(spi_nor, CONFIG_FLASH_LOG_LEVEL);
4545
#define SPI_NOR_MAX_ADDR_WIDTH 4
4646
#define SPI_NOR_3B_ADDR_MAX 0xFFFFFF
4747

48-
#define ANY_INST_HAS_TRUE_(idx, bool_prop) \
49-
COND_CODE_1(DT_INST_PROP(idx, bool_prop), (1,), ())
50-
51-
#define ANY_INST_HAS_TRUE(bool_prop) \
52-
COND_CODE_1(IS_EMPTY(DT_INST_FOREACH_STATUS_OKAY_VARGS(ANY_INST_HAS_TRUE_, bool_prop)), \
53-
(0), (1))
54-
55-
#define ANY_INST_HAS_PROP_(idx, prop_name) \
56-
COND_CODE_1(DT_INST_NODE_HAS_PROP(idx, prop_name), (1,), ())
57-
#define ANY_INST_HAS_PROP(prop_name) \
58-
COND_CODE_1(IS_EMPTY(DT_INST_FOREACH_STATUS_OKAY_VARGS(ANY_INST_HAS_PROP_, prop_name)), \
59-
(0), (1))
60-
61-
#define ANY_INST_HAS_MXICY_MX25R_POWER_MODE ANY_INST_HAS_PROP(mxicy_mx25r_power_mode)
62-
#define ANY_INST_HAS_DPD ANY_INST_HAS_TRUE(has_dpd)
63-
#define ANY_INST_HAS_T_EXIT_DPD ANY_INST_HAS_PROP(t_exit_dpd)
64-
#define ANY_INST_HAS_DPD_WAKEUP_SEQUENCE ANY_INST_HAS_PROP(dpd_wakeup_sequence)
65-
#define ANY_INST_HAS_RESET_GPIOS ANY_INST_HAS_PROP(reset_gpios)
66-
#define ANY_INST_HAS_WP_GPIOS ANY_INST_HAS_PROP(wp_gpios)
67-
#define ANY_INST_HAS_HOLD_GPIOS ANY_INST_HAS_PROP(hold_gpios)
68-
#define ANY_INST_USE_4B_ADDR_OPCODES ANY_INST_HAS_TRUE(use_4b_addr_opcodes)
48+
#define ANY_INST_HAS_MXICY_MX25R_POWER_MODE DT_ANY_INST_HAS_PROP_STATUS_OKAY(mxicy_mx25r_power_mode)
49+
#define ANY_INST_HAS_DPD DT_ANY_INST_HAS_BOOL_STATUS_OKAY(has_dpd)
50+
#define ANY_INST_HAS_T_EXIT_DPD DT_ANY_INST_HAS_PROP_STATUS_OKAY(t_exit_dpd)
51+
#define ANY_INST_HAS_DPD_WAKEUP_SEQUENCE DT_ANY_INST_HAS_PROP_STATUS_OKAY(dpd_wakeup_sequence)
52+
#define ANY_INST_HAS_RESET_GPIOS DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
53+
#define ANY_INST_HAS_WP_GPIOS DT_ANY_INST_HAS_PROP_STATUS_OKAY(wp_gpios)
54+
#define ANY_INST_HAS_HOLD_GPIOS DT_ANY_INST_HAS_PROP_STATUS_OKAY(hold_gpios)
55+
#define ANY_INST_USE_4B_ADDR_OPCODES DT_ANY_INST_HAS_BOOL_STATUS_OKAY(use_4b_addr_opcodes)
6956

7057
#ifdef CONFIG_SPI_NOR_ACTIVE_DWELL_MS
7158
#define ACTIVE_DWELL_MS CONFIG_SPI_NOR_ACTIVE_DWELL_MS

0 commit comments

Comments
 (0)