From: Masahiro Yamada Date: Mon, 17 Jul 2017 03:18:39 +0000 (+0900) Subject: dm: ofnode: change return type of dev_read_prop() to opaque pointer X-Git-Tag: v2017.09-rc1~55 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fd73621cba2c4b20e8a65e0b4c40c9026018e434;p=oweals%2Fu-boot.git dm: ofnode: change return type of dev_read_prop() to opaque pointer 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 Acked-by: Simon Glass --- diff --git a/drivers/core/read.c b/drivers/core/read.c index eafe727f03..8570583693 100644 --- a/drivers/core/read.c +++ b/drivers/core/read.c @@ -114,7 +114,7 @@ int dev_read_phandle(struct udevice *dev) return fdt_get_phandle(gd->fdt_blob, ofnode_to_offset(node)); } -const u32 *dev_read_prop(struct udevice *dev, const char *propname, int *lenp) +const void *dev_read_prop(struct udevice *dev, const char *propname, int *lenp) { return ofnode_get_property(dev_ofnode(dev), propname, lenp); } diff --git a/include/dm/read.h b/include/dm/read.h index b86a2f5fec..edf468fdd1 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -266,7 +266,7 @@ int dev_read_phandle(struct udevice *dev); * @lenp: place to put length on success * @return pointer to property, or NULL if not found */ -const u32 *dev_read_prop(struct udevice *dev, const char *propname, int *lenp); +const void *dev_read_prop(struct udevice *dev, const char *propname, int *lenp); /** * dev_read_alias_seq() - Get the alias sequence number of a node @@ -443,8 +443,8 @@ static inline int dev_read_phandle(struct udevice *dev) return fdt_get_phandle(gd->fdt_blob, dev_of_offset(dev)); } -static inline const u32 *dev_read_prop(struct udevice *dev, - const char *propname, int *lenp) +static inline const void *dev_read_prop(struct udevice *dev, + const char *propname, int *lenp) { return ofnode_get_property(dev_ofnode(dev), propname, lenp); }