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 /test | |
parent | 82679624f9aa6d1be733c46f3555d5166b6f5b72 (diff) | |
parent | d60ae4c59df55c08dc96202ff58fed21ab3afb7d (diff) | |
download | u-boot-bb1bb4bb5df9df4d3f07e39a632daaff79e4b77e.tar.gz |
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 'test')
-rw-r--r-- | test/dm/regmap.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/test/dm/regmap.c b/test/dm/regmap.c index 82de295cb8..6fd1f20656 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -99,18 +99,27 @@ static int dm_test_regmap_rw(struct unit_test_state *uts) struct regmap *map; uint reg; + sandbox_set_enable_memio(true); ut_assertok(uclass_get_device(UCLASS_SYSCON, 0, &dev)); map = syscon_get_regmap(dev); ut_assertok_ptr(map); ut_assertok(regmap_write(map, 0, 0xcacafafa)); - ut_assertok(regmap_write(map, 3, 0x55aa2211)); + ut_assertok(regmap_write(map, 5, 0x55aa2211)); ut_assertok(regmap_read(map, 0, ®)); - ut_assertok(regmap_read(map, 3, ®)); + ut_asserteq(0xcacafafa, reg); + ut_assertok(regmap_read(map, 5, ®)); + ut_asserteq(0x55aa2211, reg); + ut_assertok(regmap_read(map, 0, ®)); + ut_asserteq(0xcacafafa, reg); ut_assertok(regmap_update_bits(map, 0, 0xff00ff00, 0x55aa2211)); - ut_assertok(regmap_update_bits(map, 3, 0x00ff00ff, 0xcacafada)); + ut_assertok(regmap_read(map, 0, ®)); + ut_asserteq(0x55ca22fa, reg); + ut_assertok(regmap_update_bits(map, 5, 0x00ff00ff, 0xcacafada)); + ut_assertok(regmap_read(map, 5, ®)); + ut_asserteq(0x55ca22da, reg); return 0; } @@ -130,6 +139,7 @@ static int dm_test_regmap_getset(struct unit_test_state *uts) u32 val3; }; + sandbox_set_enable_memio(true); ut_assertok(uclass_get_device(UCLASS_SYSCON, 0, &dev)); map = syscon_get_regmap(dev); ut_assertok_ptr(map); @@ -138,7 +148,9 @@ static int dm_test_regmap_getset(struct unit_test_state *uts) regmap_set(map, struct layout, val3, 0x55aa2211); ut_assertok(regmap_get(map, struct layout, val0, ®)); + ut_asserteq(0xcacafafa, reg); ut_assertok(regmap_get(map, struct layout, val3, ®)); + ut_asserteq(0x55aa2211, reg); return 0; } @@ -159,6 +171,7 @@ static int dm_test_regmap_poll(struct unit_test_state *uts) start = get_timer(0); + ut_assertok(regmap_write(map, 0, 0x0)); ut_asserteq(-ETIMEDOUT, regmap_read_poll_timeout_test(map, 0, reg, (reg == 0xcacafafa), |