diff options
| author | Fabio Baltieri <fabiobaltieri@google.com> | 2021-06-24 16:28:16 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-28 12:56:28 +0000 |
| commit | bcaeebb1efb5f26ee6ef63e19b97894a3b89ab22 (patch) | |
| tree | d84514b1655a9725141ad4fd0eaa53b80bca2862 | |
| parent | 3d5563af348f24cd21317252fdea2f2c87103f7e (diff) | |
| download | chrome-ec-bcaeebb1efb5f26ee6ef63e19b97894a3b89ab22.tar.gz | |
zephyr: drivers: use DEVICE_DT_INST_DEFINE for device definitions
Use DEVICE_DT_INST_DEFINE for drivers defined within the zephyr shim.
This ensures that the static nodes used by DEVICE_DT_GET are defined and
usable.
BRANCH=none
BUG=none
TEST=zmake configure -b -B ~/build-volteer/ zephyr/projects/volteer/volteer
TEST=zmake configure -b -B ~/build-it8xxx2_evb/ zephyr/projects/it8xxx2_evb
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: Icc04e489cf3ecdcd68862e16dab025376602b7ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2985461
Reviewed-by: Yuval Peress <peress@chromium.org>
| -rw-r--r-- | zephyr/drivers/cros_bbram/cros_bbram_it8xxx2.c | 7 | ||||
| -rw-r--r-- | zephyr/drivers/cros_bbram/cros_bbram_npcx.c | 11 | ||||
| -rw-r--r-- | zephyr/drivers/cros_flash/cros_flash_npcx.c | 7 | ||||
| -rw-r--r-- | zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c | 7 | ||||
| -rw-r--r-- | zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c | 7 |
5 files changed, 19 insertions, 20 deletions
diff --git a/zephyr/drivers/cros_bbram/cros_bbram_it8xxx2.c b/zephyr/drivers/cros_bbram/cros_bbram_it8xxx2.c index 1f6737f587..cf2586ff96 100644 --- a/zephyr/drivers/cros_bbram/cros_bbram_it8xxx2.c +++ b/zephyr/drivers/cros_bbram/cros_bbram_it8xxx2.c @@ -72,7 +72,6 @@ static const struct cros_bbram_it8xxx2_config cros_bbram_cfg = { .size = DT_INST_REG_SIZE_BY_NAME(0, memory), }; -DEVICE_DEFINE(cros_bbram_it8xxx2_0, DT_INST_LABEL(0), bbram_it8xxx2_init, - NULL, NULL, &cros_bbram_cfg, PRE_KERNEL_1, - CONFIG_CROS_BBRAM_IT8XXX2_INIT_PRIORITY, - &cros_bbram_it8xxx2_driver_api); +DEVICE_DT_INST_DEFINE(0, bbram_it8xxx2_init, NULL, NULL, &cros_bbram_cfg, + PRE_KERNEL_1, CONFIG_CROS_BBRAM_IT8XXX2_INIT_PRIORITY, + &cros_bbram_it8xxx2_driver_api); diff --git a/zephyr/drivers/cros_bbram/cros_bbram_npcx.c b/zephyr/drivers/cros_bbram/cros_bbram_npcx.c index 20698df85b..8f1d96ff91 100644 --- a/zephyr/drivers/cros_bbram/cros_bbram_npcx.c +++ b/zephyr/drivers/cros_bbram/cros_bbram_npcx.c @@ -140,10 +140,11 @@ static int bbram_npcx_init(const struct device *dev) .size = DT_INST_REG_SIZE_BY_NAME(inst, memory), \ .status_reg_addr = DT_INST_REG_ADDR_BY_NAME(inst, status), \ }; \ - DEVICE_DEFINE(cros_bbram_npcx_##inst, DT_INST_LABEL(inst), \ - bbram_npcx_init, NULL, &cros_bbram_data_##inst, \ - &cros_bbram_cfg_##inst, PRE_KERNEL_1, \ - CONFIG_CROS_BBRAM_NPCX_INIT_PRIORITY, \ - &cros_bbram_npcx_driver_api); + DEVICE_DT_INST_DEFINE(inst, \ + bbram_npcx_init, NULL, \ + &cros_bbram_data_##inst, \ + &cros_bbram_cfg_##inst, PRE_KERNEL_1, \ + CONFIG_CROS_BBRAM_NPCX_INIT_PRIORITY, \ + &cros_bbram_npcx_driver_api); DT_INST_FOREACH_STATUS_OKAY(CROS_BBRAM_INIT); diff --git a/zephyr/drivers/cros_flash/cros_flash_npcx.c b/zephyr/drivers/cros_flash/cros_flash_npcx.c index e58e15782b..92ebc98c2f 100644 --- a/zephyr/drivers/cros_flash/cros_flash_npcx.c +++ b/zephyr/drivers/cros_flash/cros_flash_npcx.c @@ -518,6 +518,7 @@ static const struct cros_flash_npcx_config cros_flash_cfg = { static struct cros_flash_npcx_data cros_flash_data; -DEVICE_DEFINE(cros_flash_npcx_0, DT_INST_LABEL(0), flash_npcx_init, NULL, - &cros_flash_data, &cros_flash_cfg, PRE_KERNEL_1, - CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &cros_flash_npcx_driver_api); +DEVICE_DT_INST_DEFINE(0, flash_npcx_init, NULL, &cros_flash_data, + &cros_flash_cfg, PRE_KERNEL_1, + CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, + &cros_flash_npcx_driver_api); diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c index 501f8ec309..85b2a1a8ee 100644 --- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c +++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c @@ -182,7 +182,6 @@ static const struct cros_kb_raw_ite_config cros_kb_raw_cfg = { .irq = DT_INST_IRQN(0), }; -DEVICE_DEFINE(cros_kb_raw_ite_0, DT_INST_LABEL(0), kb_raw_ite_init, NULL, - NULL, &cros_kb_raw_cfg, PRE_KERNEL_1, - CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, - &cros_kb_raw_ite_driver_api); +DEVICE_DT_INST_DEFINE(0, kb_raw_ite_init, NULL, NULL, &cros_kb_raw_cfg, + PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, + &cros_kb_raw_ite_driver_api); diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c index 138f3c0051..99164e46fd 100644 --- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c +++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c @@ -231,10 +231,9 @@ static const struct cros_kb_raw_npcx_config cros_kb_raw_cfg = { /* Verify there's exactly 1 enabled cros,kb-raw-npcx node. */ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1); -DEVICE_DEFINE(cros_kb_raw_npcx_0, DT_LABEL(DT_DRV_INST(0)), kb_raw_npcx_init, - NULL, NULL, &cros_kb_raw_cfg, PRE_KERNEL_1, - CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, - &cros_kb_raw_npcx_driver_api); +DEVICE_DT_INST_DEFINE(0, kb_raw_npcx_init, NULL, NULL, &cros_kb_raw_cfg, + PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, + &cros_kb_raw_npcx_driver_api); /* KBS register structure check */ NPCX_REG_SIZE_CHECK(kbs_reg, 0x010); |