diff options
| author | Tom Rini <trini@konsulko.com> | 2017-10-09 20:19:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-09 20:19:39 -0400 |
| commit | ebdd65258bad89b2da6cce4265c858ee0d5a9440 (patch) | |
| tree | f2002a9b676849b0697ab9cb494b7ed4f45e8130 /drivers/core | |
| parent | 74d90d17eebfeeefd91776e3deb7901c122bef7f (diff) | |
| parent | 04d0da51578e12bd7c490aa70ed581ee5f9dcfea (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/device.c | 1 | ||||
| -rw-r--r-- | drivers/core/ofnode.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index de63e5335a8..9a46a7bbe5e 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -254,6 +254,7 @@ static void *alloc_priv(int size, uint flags) void *priv; if (flags & DM_FLAG_ALLOC_PRIV_DMA) { + size = ROUND(size, ARCH_DMA_MINALIGN); priv = memalign(ARCH_DMA_MINALIGN, size); if (priv) { memset(priv, '\0', size); diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index c6ca13fabf1..0030ab962ef 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -468,8 +468,10 @@ fdt_addr_t ofnode_get_addr_size(ofnode node, const char *property, int na, ns; int psize; const struct device_node *np = ofnode_to_np(node); - const __be32 *prop = of_get_property(np, "reg", &psize); + const __be32 *prop = of_get_property(np, property, &psize); + if (!prop) + return FDT_ADDR_T_NONE; na = of_n_addr_cells(np); ns = of_n_addr_cells(np); *sizep = of_read_number(prop + na, ns); |