leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: core: Update of_read_fmap_entry() for livetree

Browse Source 
Update this function to take an ofnode so that it can work with livetree.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2018-06-11 13:07:17 -06:00
parent 008dcddf99
commit 5e0a7341cd
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/core/of_extra.c
View File

@ -10,15 +10,15 @@
#include <dm/of_extra.h> #include <dm/of_extra.h>
#include <dm/ofnode.h> #include <dm/ofnode.h>
int of_read_fmap_entry(ofnode node, const char *name, int ofnode_read_fmap_entry(ofnode node, struct fmap_entry *entry)
struct fmap_entry *entry)
{ {
const char *prop; const char *prop;
u32 reg[2]; u32 reg[2];
if (ofnode_read_u32_array(node, "reg", reg, 2)) { if (ofnode_read_u32_array(node, "reg", reg, 2)) {
debug("Node '%s' has bad/missing 'reg' property\n", name); debug("Node '%s' has bad/missing 'reg' property\n",
return -FDT_ERR_NOTFOUND; ofnode_get_name(node));
return -log_ret(ENOENT);
} }
entry->offset = reg[0]; entry->offset = reg[0];
entry->length = reg[1]; entry->length = reg[1];

4
drivers/misc/cros_ec.c
View File

@ -1028,7 +1028,7 @@ int cros_ec_decode_ec_flash(struct udevice *dev, struct fdt_cros_ec *config)
return -1; 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"); debug("Failed to decode flash node in chrome-ec\n");
return -1; return -1;
} }
@ -1050,7 +1050,7 @@ int cros_ec_decode_ec_flash(struct udevice *dev, struct fdt_cros_ec *config)
return -1; 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"); debug("Failed to decode flash region in chrome-ec'\n");
return -1; return -1;
} }

6
include/dm/of_extra.h
View File

@ -34,12 +34,10 @@ struct fmap_entry {
/** /**
* Read a flash entry from the fdt * Read a flash entry from the fdt
* *
* @param node Reference to node to read * @param node Reference to node to read
* @param name Name of node being read
* @param entry Place to put offset and size of this node * @param entry Place to put offset and size of this node
* @return 0 if ok, -ve on error * @return 0 if ok, -ve on error
*/ */
int of_read_fmap_entry(ofnode node, const char *name, int ofnode_read_fmap_entry(ofnode node, struct fmap_entry *entry);
struct fmap_entry *entry);
#endif #endif