summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-26 14:21:52 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-29 03:50:16 +0900
commita191e0dee02b3fb041880131535fe6b307e6b70d (patch)
treeefec7083e8b9cdbc94c3657204be4ecb13a4e78a /arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
parent7c9cac9c227b1a05ed1a63931f3c03950e9e6603 (diff)
downloadtalos-obmc-uboot-a191e0dee02b3fb041880131535fe6b307e6b70d.tar.gz
talos-obmc-uboot-a191e0dee02b3fb041880131535fe6b307e6b70d.zip
ARM: uniphier: deprecate umc_dram_init_{start, poll}
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/dram/umc-ph1-pro4.c')
-rw-r--r--arch/arm/mach-uniphier/dram/umc-ph1-pro4.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/dram/umc-ph1-pro4.c b/arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
index 9569c1070a..93d2e2c2a1 100644
--- a/arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
@@ -8,6 +8,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/sizes.h>
+#include <asm/processor.h>
#include "../init.h"
#include "ddrphy-regs.h"
@@ -133,8 +134,9 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
int nr_phy = width / 16;
int phy, ret;
- umc_dram_init_start(dc_base);
- umc_dram_init_poll(dc_base);
+ writel(UMC_INITSET_INIT1EN, dc_base + UMC_INITSET);
+ while (readl(dc_base + UMC_INITSET) & UMC_INITSTAT_INIT1ST)
+ cpu_relax();
for (phy = 0; phy < nr_phy; phy++) {
writel(0x00000100 | ((1 << (phy + 1)) - 1),
OpenPOWER on IntegriCloud