From 05329caf3034bcb5ffaafb54d13ffe5682e78908 Mon Sep 17 00:00:00 2001 From: Swift Tian Date: Sat, 19 Oct 2024 13:29:47 +0800 Subject: [PATCH 1/2] tests: mspi: fix incorrect DT macro used in api test DT macro should be used is DT_ENUM* for enum type bindings Signed-off-by: Swift Tian --- tests/drivers/mspi/api/src/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/drivers/mspi/api/src/main.c b/tests/drivers/mspi/api/src/main.c index d6b632f29c10a5..9f48e898f38044 100644 --- a/tests/drivers/mspi/api/src/main.c +++ b/tests/drivers/mspi/api/src/main.c @@ -31,8 +31,8 @@ static struct gpio_dt_spec ce_gpios[] = MSPI_CE_GPIOS_DT_SPEC_GET(MSPI_BUS_NODE) #if TEST_MSPI_REINIT struct mspi_cfg hardware_cfg = { .channel_num = 0, - .op_mode = DT_PROP_OR(MSPI_BUS_NODE, op_mode, MSPI_OP_MODE_CONTROLLER), - .duplex = DT_PROP_OR(MSPI_BUS_NODE, duplex, MSPI_HALF_DUPLEX), + .op_mode = DT_ENUM_IDX_OR(MSPI_BUS_NODE, op_mode, MSPI_OP_MODE_CONTROLLER), + .duplex = DT_ENUM_IDX_OR(MSPI_BUS_NODE, duplex, MSPI_HALF_DUPLEX), .dqs_support = DT_PROP_OR(MSPI_BUS_NODE, dqs_support, false), .ce_group = ce_gpios, .num_ce_gpios = ARRAY_SIZE(ce_gpios), From f3be9f90c77f73f8266c6195060745c3f81cebf4 Mon Sep 17 00:00:00 2001 From: Swift Tian Date: Sat, 19 Oct 2024 13:33:33 +0800 Subject: [PATCH 2/2] drivers: mspi: fix incorrect DT macro used in controller emulator DT_INST* should be used in MSPI_CONFIG or device tree value capture will fail sliently and fall back to defaults. Signed-off-by: Swift Tian --- drivers/mspi/mspi_emul.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mspi/mspi_emul.c b/drivers/mspi/mspi_emul.c index 99f0f0f3d4dfe1..57b28bfc06f56e 100644 --- a/drivers/mspi/mspi_emul.c +++ b/drivers/mspi/mspi_emul.c @@ -860,8 +860,8 @@ static struct emul_mspi_driver_api emul_mspi_driver_api = { #define MSPI_CONFIG(n) \ { \ .channel_num = EMUL_MSPI_INST_ID, \ - .op_mode = DT_ENUM_IDX_OR(n, op_mode, MSPI_OP_MODE_CONTROLLER), \ - .duplex = DT_ENUM_IDX_OR(n, duplex, MSPI_HALF_DUPLEX), \ + .op_mode = DT_INST_ENUM_IDX_OR(n, op_mode, MSPI_OP_MODE_CONTROLLER),\ + .duplex = DT_INST_ENUM_IDX_OR(n, duplex, MSPI_HALF_DUPLEX), \ .max_freq = DT_INST_PROP(n, clock_frequency), \ .dqs_support = DT_INST_PROP_OR(n, dqs_support, false), \ .sw_multi_periph = DT_INST_PROP(n, software_multiperipheral), \