dm: core: Add functions to read 8/16-bit integers
Add functions to read 8/16-bit integers like the existing functions for 32/64-bit to simplify read of 8/16-bit integers from device tree properties. Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
committed by
Tom Rini
parent
7a0d88076b
commit
b471bdc47b
@@ -488,6 +488,44 @@ static void *of_find_property_value_of_size(const struct device_node *np,
|
||||
return prop->value;
|
||||
}
|
||||
|
||||
int of_read_u8(const struct device_node *np, const char *propname, u8 *outp)
|
||||
{
|
||||
const u8 *val;
|
||||
|
||||
debug("%s: %s: ", __func__, propname);
|
||||
if (!np)
|
||||
return -EINVAL;
|
||||
val = of_find_property_value_of_size(np, propname, sizeof(*outp));
|
||||
if (IS_ERR(val)) {
|
||||
debug("(not found)\n");
|
||||
return PTR_ERR(val);
|
||||
}
|
||||
|
||||
*outp = *val;
|
||||
debug("%#x (%d)\n", *outp, *outp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int of_read_u16(const struct device_node *np, const char *propname, u16 *outp)
|
||||
{
|
||||
const __be16 *val;
|
||||
|
||||
debug("%s: %s: ", __func__, propname);
|
||||
if (!np)
|
||||
return -EINVAL;
|
||||
val = of_find_property_value_of_size(np, propname, sizeof(*outp));
|
||||
if (IS_ERR(val)) {
|
||||
debug("(not found)\n");
|
||||
return PTR_ERR(val);
|
||||
}
|
||||
|
||||
*outp = be16_to_cpup(val);
|
||||
debug("%#x (%d)\n", *outp, *outp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int of_read_u32(const struct device_node *np, const char *propname, u32 *outp)
|
||||
{
|
||||
return of_read_u32_index(np, propname, 0, outp);
|
||||
|
||||
@@ -31,6 +31,68 @@ bool ofnode_name_eq(ofnode node, const char *name)
|
||||
return (strlen(name) == len) && !strncmp(node_name, name, len);
|
||||
}
|
||||
|
||||
int ofnode_read_u8(ofnode node, const char *propname, u8 *outp)
|
||||
{
|
||||
const u8 *cell;
|
||||
int len;
|
||||
|
||||
assert(ofnode_valid(node));
|
||||
debug("%s: %s: ", __func__, propname);
|
||||
|
||||
if (ofnode_is_np(node))
|
||||
return of_read_u8(ofnode_to_np(node), propname, outp);
|
||||
|
||||
cell = fdt_getprop(gd->fdt_blob, ofnode_to_offset(node), propname,
|
||||
&len);
|
||||
if (!cell || len < sizeof(*cell)) {
|
||||
debug("(not found)\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
*outp = *cell;
|
||||
debug("%#x (%d)\n", *outp, *outp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
u8 ofnode_read_u8_default(ofnode node, const char *propname, u8 def)
|
||||
{
|
||||
assert(ofnode_valid(node));
|
||||
ofnode_read_u8(node, propname, &def);
|
||||
|
||||
return def;
|
||||
}
|
||||
|
||||
int ofnode_read_u16(ofnode node, const char *propname, u16 *outp)
|
||||
{
|
||||
const fdt16_t *cell;
|
||||
int len;
|
||||
|
||||
assert(ofnode_valid(node));
|
||||
debug("%s: %s: ", __func__, propname);
|
||||
|
||||
if (ofnode_is_np(node))
|
||||
return of_read_u16(ofnode_to_np(node), propname, outp);
|
||||
|
||||
cell = fdt_getprop(gd->fdt_blob, ofnode_to_offset(node), propname,
|
||||
&len);
|
||||
if (!cell || len < sizeof(*cell)) {
|
||||
debug("(not found)\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
*outp = be16_to_cpup(cell);
|
||||
debug("%#x (%d)\n", *outp, *outp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
u16 ofnode_read_u16_default(ofnode node, const char *propname, u16 def)
|
||||
{
|
||||
assert(ofnode_valid(node));
|
||||
ofnode_read_u16(node, propname, &def);
|
||||
|
||||
return def;
|
||||
}
|
||||
|
||||
int ofnode_read_u32(ofnode node, const char *propname, u32 *outp)
|
||||
{
|
||||
return ofnode_read_u32_index(node, propname, 0, outp);
|
||||
|
||||
@@ -13,6 +13,27 @@
|
||||
#include <asm/io.h>
|
||||
#include <linux/ioport.h>
|
||||
|
||||
int dev_read_u8(const struct udevice *dev, const char *propname, u8 *outp)
|
||||
{
|
||||
return ofnode_read_u8(dev_ofnode(dev), propname, outp);
|
||||
}
|
||||
|
||||
u8 dev_read_u8_default(const struct udevice *dev, const char *propname, u8 def)
|
||||
{
|
||||
return ofnode_read_u8_default(dev_ofnode(dev), propname, def);
|
||||
}
|
||||
|
||||
int dev_read_u16(const struct udevice *dev, const char *propname, u16 *outp)
|
||||
{
|
||||
return ofnode_read_u16(dev_ofnode(dev), propname, outp);
|
||||
}
|
||||
|
||||
u16 dev_read_u16_default(const struct udevice *dev, const char *propname,
|
||||
u16 def)
|
||||
{
|
||||
return ofnode_read_u16_default(dev_ofnode(dev), propname, def);
|
||||
}
|
||||
|
||||
int dev_read_u32(const struct udevice *dev, const char *propname, u32 *outp)
|
||||
{
|
||||
return ofnode_read_u32(dev_ofnode(dev), propname, outp);
|
||||
|
||||
Reference in New Issue
Block a user