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

dm: ofnode: rename ofnode_read_prop() to ofnode_get_property()

Browse Source 
This function returns the pointer to the value of a node property.
The current name ofnode_read_prop() is confusing.  Follow the naming
of_get_property() from Linux.

The return type (const u32 *) is wrong.  DT property values can be
strings as well as integers.  This is why of_get_property/fdt_getprop
returns an opaque pointer.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada 2017-06-22 16:54:05 +09:00 committed by Simon Glass
parent cb7dbe1fb0
commit 61e51babdb
8 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/core/lists.c
View File

@ -141,8 +141,7 @@ int lists_bind_fdt(struct udevice *parent, ofnode node, struct udevice **devp)
name = ofnode_get_name(node);
dm_dbg("bind node %s\n", name);
compat_list = (const char *)ofnode_read_prop(node, "compatible",
&compat_length);
compat_list = ofnode_get_property(node, "compatible", &compat_length);
if (!compat_list) {
if (compat_length == -FDT_ERR_NOTFOUND) {
dm_dbg("Device '%s' has no compatible string\n", name);

4
drivers/core/ofnode.c
View File

@ -432,7 +432,7 @@ int ofnode_decode_display_timing(ofnode parent, int index,
return ret;
}
const u32 *ofnode_read_prop(ofnode node, const char *propname, int *lenp)
const void *ofnode_get_property(ofnode node, const char *propname, int *lenp)
{
if (ofnode_is_np(node))
return of_get_property(ofnode_to_np(node), propname, lenp);
@ -503,7 +503,7 @@ int ofnode_read_pci_addr(ofnode node, enum fdt_pci_space type,
* #size-cells. They need to be 3 and 2 accordingly. However,
* for simplicity we skip the check here.
*/
cell = ofnode_read_prop(node, propname, &len);
cell = ofnode_get_property(node, propname, &len);
if (!cell)
goto fail;

2
drivers/core/read.c
View File

@ -116,7 +116,7 @@ int dev_read_phandle(struct udevice *dev)
const u32 *dev_read_prop(struct udevice *dev, const char *propname, int *lenp)
{
return ofnode_read_prop(dev_ofnode(dev), propname, lenp);
return ofnode_get_property(dev_ofnode(dev), propname, lenp);
}
int dev_read_alias_seq(struct udevice *dev, int *devnump)

2
drivers/misc/cros_ec_sandbox.c
View File

@ -197,7 +197,7 @@ static int keyscan_read_fdt_matrix(struct ec_state *ec, ofnode node)
int upto;
int len;
cell = ofnode_read_prop(node, "linux,keymap", &len);
cell = ofnode_get_property(node, "linux,keymap", &len);
ec->matrix_count = len / 4;
ec->matrix = calloc(ec->matrix_count, sizeof(*ec->matrix));
if (!ec->matrix) {

2
drivers/pci/pci-uclass.c
View File

@ -763,7 +763,7 @@ static int decode_regions(struct pci_controller *hose, ofnode parent_node,
int len;
int i;
prop = ofnode_read_prop(node, "ranges", &len);
prop = ofnode_get_property(node, "ranges", &len);
if (!prop)
return -EINVAL;
pci_addr_cells = ofnode_read_simple_addr_cells(node);

2
drivers/pinctrl/pinctrl-uclass.c
View File

@ -134,7 +134,7 @@ static int pinconfig_post_bind(struct udevice *dev)
* If this node has "compatible" property, this is not
* a pin configuration node, but a normal device. skip.
*/
ofnode_read_prop(node, "compatible", &ret);
ofnode_get_property(node, "compatible", &ret);
if (ret >= 0)
continue;

4
include/dm/ofnode.h
View File

@ -473,14 +473,14 @@ int ofnode_decode_display_timing(ofnode node, int index,
struct display_timing *config);
/**
* ofnode_read_prop()- - read a node property
* ofnode_get_property()- - get a pointer to the value of a node property
*
* @node: node to read
* @propname: property to read
* @lenp: place to put length on success
* @return pointer to property, or NULL if not found
*/
const u32 *ofnode_read_prop(ofnode node, const char *propname, int *lenp);
const void *ofnode_get_property(ofnode node, const char *propname, int *lenp);
/**
* ofnode_is_available() - check if a node is marked available

2
include/dm/read.h
View File

@ -446,7 +446,7 @@ static inline int dev_read_phandle(struct udevice *dev)
static inline const u32 *dev_read_prop(struct udevice *dev,
const char *propname, int *lenp)
{
return ofnode_read_prop(dev_ofnode(dev), propname, lenp);
return ofnode_get_property(dev_ofnode(dev), propname, lenp);
}
static inline int dev_read_alias_seq(struct udevice *dev, int *devnump)