summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier/memconf/memconf-pxs2.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-04-25 13:45:32 -0400
committerTom Rini <trini@konsulko.com>2016-04-25 13:45:32 -0400
commit9f69ab86d0592d528a0372f01fa23684291243fa (patch)
tree0ad01e07d0097f36840f78b3ac49dbf811ac2f02 /arch/arm/mach-uniphier/memconf/memconf-pxs2.c
parente6a365289974fe030372c0fb0151df7940992d39 (diff)
parentb75e072c1c53cade2c3944433d852d7d6046661b (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/memconf/memconf-pxs2.c')
-rw-r--r--arch/arm/mach-uniphier/memconf/memconf-pxs2.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-uniphier/memconf/memconf-pxs2.c b/arch/arm/mach-uniphier/memconf/memconf-pxs2.c
index bf14d0d283..e98eb48e04 100644
--- a/arch/arm/mach-uniphier/memconf/memconf-pxs2.c
+++ b/arch/arm/mach-uniphier/memconf/memconf-pxs2.c
@@ -49,6 +49,9 @@ int uniphier_pxs2_memconf_init(const struct uniphier_board_data *bd)
case SZ_512M:
tmp |= SG_MEMCONF_CH2_SZ_512M;
break;
+ case SZ_1G:
+ tmp |= SG_MEMCONF_CH2_SZ_1G;
+ break;
default:
pr_err("error: unsupported DRAM Ch2 size\n");
return -EINVAL;