diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-02-26 14:21:52 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-02-29 03:50:16 +0900 |
| commit | a191e0dee02b3fb041880131535fe6b307e6b70d (patch) | |
| tree | efec7083e8b9cdbc94c3657204be4ecb13a4e78a /arch/arm/mach-uniphier/dram/umc-ph1-sld8.c | |
| parent | 7c9cac9c227b1a05ed1a63931f3c03950e9e6603 (diff) | |
| download | talos-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-sld8.c')
| -rw-r--r-- | arch/arm/mach-uniphier/dram/umc-ph1-sld8.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/dram/umc-ph1-sld8.c b/arch/arm/mach-uniphier/dram/umc-ph1-sld8.c index 43e53fd562..d873130f9a 100644 --- a/arch/arm/mach-uniphier/dram/umc-ph1-sld8.c +++ b/arch/arm/mach-uniphier/dram/umc-ph1-sld8.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" @@ -148,8 +149,9 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base, void __iomem *phy_base = dc_base + 0x00001000; int 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(); writel(0x00000101, dc_base + UMC_DIOCTLA); |
