Merge branch 'master' of git://git.denx.de/u-boot-mips

diff --combined test/dm/test-fdt.c
index 66d0df5,552d700..8b72fe4
--- 1/test/dm/test-fdt.c
--- 2/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@@ -425,7 -425,7 +425,7 @@@ static const struct udevice_id fdt_dumm
  };
  
  UCLASS_DRIVER(fdt_dummy) = {
 -      .name           = "fdt_dummy",
 +      .name           = "fdt-dummy",
        .id             = UCLASS_TEST_DUMMY,
        .flags          = DM_UC_FLAG_SEQ_ALIAS,
  };
@@@ -461,3 -461,45 +461,45 @@@ static int dm_test_fdt_translation(stru
        return 0;
  }
  DM_TEST(dm_test_fdt_translation, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+ 
+ /* Test devfdt_remap_addr_index() */
+ static int dm_test_fdt_remap_addr_flat(struct unit_test_state *uts)
+ {
+       struct udevice *dev;
+       fdt_addr_t addr;
+       void *paddr;
+ 
+       ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, true, &dev));
+ 
+       addr = devfdt_get_addr(dev);
+       ut_asserteq(0x8000, addr);
+ 
+       paddr = map_physmem(addr, 0, MAP_NOCACHE);
+       ut_assertnonnull(paddr);
+       ut_asserteq_ptr(paddr, devfdt_remap_addr(dev));
+ 
+       return 0;
+ }
+ DM_TEST(dm_test_fdt_remap_addr_flat,
+       DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT | DM_TESTF_FLAT_TREE);
+ 
+ /* Test dev_remap_addr_index() */
+ static int dm_test_fdt_remap_addr_live(struct unit_test_state *uts)
+ {
+       struct udevice *dev;
+       fdt_addr_t addr;
+       void *paddr;
+ 
+       ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, true, &dev));
+ 
+       addr = dev_read_addr(dev);
+       ut_asserteq(0x8000, addr);
+ 
+       paddr = map_physmem(addr, 0, MAP_NOCACHE);
+       ut_assertnonnull(paddr);
+       ut_asserteq_ptr(paddr, dev_remap_addr(dev));
+ 
+       return 0;
+ }
+ DM_TEST(dm_test_fdt_remap_addr_live,
+       DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);