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

[u-boot] / arch / arm / mach-uniphier / dram / cmd_ddrphy.c

diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
index 7a9f76caeb7e7e3e78ef2896d0024d363729437d..6ac261d23fe86b8a80b7cf274aa3e427ddb7bc29 100644 (file)
--- a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2014      Panasonic Corporation
+ * Copyright (C) 2015-2016 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <mapmem.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 
@@ -51,7 +52,7 @@ static void dump_loop(unsigned long *base,
        int p, dx;
 
        for (p = 0; *base; base++, p++) {
-               phy = map_sysmem(*base, SZ_4K);
+               phy = ioremap(*base, SZ_4K);
 
                for (dx = 0; dx < NR_DATX8_PER_DDRPHY; dx++) {
                        printf("PHY%dDX%d:", p, dx);
@@ -59,7 +60,7 @@ static void dump_loop(unsigned long *base,
                        printf("\n");
                }
 
-               unmap_sysmem(phy);
+               iounmap(phy);
        }
 }
 
@@ -172,7 +173,7 @@ static void reg_dump(unsigned long *base)
        printf("\n--- DDR PHY registers ---\n");
 
        for (p = 0; *base; base++, p++) {
-               phy = map_sysmem(*base, SZ_4K);
+               phy = ioremap(*base, SZ_4K);
 
                printf("== PHY%d (base: %p) ==\n", p, phy);
                printf(" No: Name      : Address  : Data\n");
@@ -206,7 +207,7 @@ static void reg_dump(unsigned long *base)
                REG_DUMP(dx[1].gcr);
                REG_DUMP(dx[1].gtr);
 
-               unmap_sysmem(phy);
+               iounmap(phy);
        }
 }
 
@@ -257,7 +258,7 @@ static int do_ddr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 U_BOOT_CMD(
        ddr,    2,      1,      do_ddr,
        "UniPhier DDR PHY parameters dumper",
-       "- dump all of the followings\n"
+       "- dump all of the following\n"
        "ddr wbdl - dump Write Bit Delay\n"
        "ddr rbdl - dump Read Bit Delay\n"
        "ddr wld - dump Write Leveling\n"