diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-22 17:07:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-22 17:07:48 -0500 |
| commit | 0c9e85f67cd86d2d7a3424ea3ebff0e6db7a3915 (patch) | |
| tree | 1ac6999d2934173b7575540b310fda3147aaf67a /arch/arm/mach-uniphier/dram/umc-ld20.c | |
| parent | afdf09ac260f7ec245c85b94a5de5f92af06bc25 (diff) | |
| parent | 2c2ab3d495a1a9fbfcec58f469255595a86e3aad (diff) | |
| download | u-boot-0c9e85f67cd86d2d7a3424ea3ebff0e6db7a3915.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Allow to disable SPL (mainly for ATF)
- Refactor SoC init code
- Update DRAM settings
- Add PXs3 SoC support (DT, pinctrl driver, SoC code)
Diffstat (limited to 'arch/arm/mach-uniphier/dram/umc-ld20.c')
| -rw-r--r-- | arch/arm/mach-uniphier/dram/umc-ld20.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-uniphier/dram/umc-ld20.c b/arch/arm/mach-uniphier/dram/umc-ld20.c index ecbe101617..61f62ae6d7 100644 --- a/arch/arm/mach-uniphier/dram/umc-ld20.c +++ b/arch/arm/mach-uniphier/dram/umc-ld20.c @@ -1,14 +1,15 @@ /* * Copyright (C) 2016 Socionext Inc. * - * based on commit 5e1cb0f1caeabc6c99469dd997cb6b4f46834443 of Diag + * based on commit 1f6feb76e7f9753f51955444e422486521f9b3a3 of Diag * * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <linux/bitops.h> -#include <linux/err.h> +#include <linux/compat.h> +#include <linux/errno.h> #include <linux/io.h> #include <linux/sizes.h> #include <asm/processor.h> @@ -581,7 +582,7 @@ static int umc_dc_init(void __iomem *dc_base, unsigned int freq, writel(umc_memconf0a[freq_e][size_e], dc_base + UMC_MEMCONF0A); writel(umc_memconf0b[freq_e][size_e], dc_base + UMC_MEMCONF0B); writel(umc_memconfch[freq_e][size_e], dc_base + UMC_MEMCONFCH); - writel(0x00000008, dc_base + UMC_MEMMAPSET); + writel(0x00000000, dc_base + UMC_MEMMAPSET); writel(umc_cmdctla[freq_e], dc_base + UMC_CMDCTLA); writel(umc_cmdctlb[freq_e], dc_base + UMC_CMDCTLB); |