diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-01 09:34:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-01 09:34:35 -0400 |
| commit | bb1bb4bb5df9df4d3f07e39a632daaff79e4b77e (patch) | |
| tree | 1ed8d0b3622961997a32cd648d5d1bd3de7a855a /drivers/core | |
| parent | 82679624f9aa6d1be733c46f3555d5166b6f5b72 (diff) | |
| parent | d60ae4c59df55c08dc96202ff58fed21ab3afb7d (diff) | |
| download | u-boot-bb1bb4bb5df9df4d3f07e39a632daaff79e4b77e.zip u-boot-bb1bb4bb5df9df4d3f07e39a632daaff79e4b77e.tar.gz u-boot-bb1bb4bb5df9df4d3f07e39a632daaff79e4b77e.tar.bz2 | |
Merge tag 'dm-pull-29oct19' of git://git.denx.de/u-boot-dm
- Fix for patman with email addresses containing commas
- Bootstage improvements for TPL, SPL
- Various sandbox and dm improvements and fixes
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/ofnode.c | 2 | ||||
| -rw-r--r-- | drivers/core/regmap.c | 2 | ||||
| -rw-r--r-- | drivers/core/uclass.c | 11 |
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 297f0a0..8f0eab2 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -57,7 +57,7 @@ int ofnode_read_s32_default(ofnode node, const char *propname, s32 def) int ofnode_read_u64(ofnode node, const char *propname, u64 *outp) { - const fdt64_t *cell; + const unaligned_fdt64_t *cell; int len; assert(ofnode_valid(node)); diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c index d1d12ee..e9e55c9 100644 --- a/drivers/core/regmap.c +++ b/drivers/core/regmap.c @@ -462,5 +462,5 @@ int regmap_update_bits(struct regmap *map, uint offset, uint mask, uint val) reg &= ~mask; - return regmap_write(map, offset, reg | val); + return regmap_write(map, offset, reg | (val & mask)); } diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index 36f4d1c..c520ef1 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -6,6 +6,8 @@ * Pavel Herrmann <morpheus.ibis@gmail.com> */ +#define LOG_CATEGORY LOGC_DM + #include <common.h> #include <dm.h> #include <errno.h> @@ -303,7 +305,7 @@ int uclass_find_device_by_seq(enum uclass_id id, int seq_or_req_seq, int ret; *devp = NULL; - debug("%s: %d %d\n", __func__, find_req_seq, seq_or_req_seq); + log_debug("%d %d\n", find_req_seq, seq_or_req_seq); if (seq_or_req_seq == -1) return -ENODEV; ret = uclass_get(id, &uc); @@ -311,15 +313,16 @@ int uclass_find_device_by_seq(enum uclass_id id, int seq_or_req_seq, return ret; uclass_foreach_dev(dev, uc) { - debug(" - %d %d '%s'\n", dev->req_seq, dev->seq, dev->name); + log_debug(" - %d %d '%s'\n", + dev->req_seq, dev->seq, dev->name); if ((find_req_seq ? dev->req_seq : dev->seq) == seq_or_req_seq) { *devp = dev; - debug(" - found\n"); + log_debug(" - found\n"); return 0; } } - debug(" - not found\n"); + log_debug(" - not found\n"); return -ENODEV; } |