dm: core: Update of_read_fmap_entry() for livetree

[u-boot] / drivers / misc / cros_ec.c

diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index feaa5d85676c6cbbb561f4b9295fd4457630e843..6f299d407a4c12bcd8136f0f29d73c67043b0153 100644 (file)
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Chromium OS cros_ec driver
  *
  * Copyright (c) 2012 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -42,8 +41,6 @@ enum {
        CROS_EC_CMD_HASH_TIMEOUT_MS = 2000,
 };
 
-DECLARE_GLOBAL_DATA_PTR;
-
 void cros_ec_dump_data(const char *name, int cmd, const uint8_t *data, int len)
 {
 #ifdef DEBUG
@@ -1031,15 +1028,14 @@ int cros_ec_decode_ec_flash(struct udevice *dev, struct fdt_cros_ec *config)
                return -1;
        }
 
-       if (of_read_fmap_entry(flash_node, "flash", &config->flash)) {
+       if (ofnode_read_fmap_entry(flash_node,  &config->flash)) {
                debug("Failed to decode flash node in chrome-ec\n");
                return -1;
        }
 
        config->flash_erase_value = ofnode_read_s32_default(flash_node,
                                                            "erase-value", -1);
-       for (node = ofnode_first_subnode(flash_node); ofnode_valid(node);
-            node = ofnode_next_subnode(node)) {
+       ofnode_for_each_subnode(node, flash_node) {
                const char *name = ofnode_get_name(node);
                enum ec_flash_region region;
 
@@ -1054,7 +1050,7 @@ int cros_ec_decode_ec_flash(struct udevice *dev, struct fdt_cros_ec *config)
                        return -1;
                }
 
-               if (of_read_fmap_entry(node, "reg", &config->region[region])) {
+               if (ofnode_read_fmap_entry(node, &config->region[region])) {
                        debug("Failed to decode flash region in chrome-ec'\n");
                        return -1;
                }