summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-26 14:21:34 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-29 03:50:16 +0900
commit46abfcc99e04efa75ed293bd871092c31d0f3be3 (patch)
treee8574e16ce94aadb203124a6c8a52a105a64c194 /arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c
parent8353266825d7b7d673519bce3a54cdddf2c3d459 (diff)
downloadtalos-obmc-uboot-46abfcc99e04efa75ed293bd871092c31d0f3be3.tar.gz
talos-obmc-uboot-46abfcc99e04efa75ed293bd871092c31d0f3be3.zip
ARM: uniphier: rework struct uniphier_board_data
This commit reworks "struct uniphier_board_data" with an array of DRAM channel data in it. It will allow further cleanups by means of "for" statements that iterate over the DDR channels. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c')
-rw-r--r--arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c b/arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c
index 9718cc560f..6fdf910895 100644
--- a/arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c
+++ b/arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c
@@ -21,14 +21,14 @@ int ph1_sld3_memconf_init(const struct uniphier_board_data *bd)
tmp &= ~(SG_MEMCONF_CH2_SZ_MASK | SG_MEMCONF_CH2_NUM_MASK);
- switch (bd->dram_ch2_width) {
+ switch (bd->dram_ch[2].width) {
case 16:
tmp |= SG_MEMCONF_CH2_NUM_1;
- size_per_word = bd->dram_ch2_size;
+ size_per_word = bd->dram_ch[2].size;
break;
case 32:
tmp |= SG_MEMCONF_CH2_NUM_2;
- size_per_word = bd->dram_ch2_size >> 1;
+ size_per_word = bd->dram_ch[2].size >> 1;
break;
default:
pr_err("error: unsupported DRAM Ch2 width\n");
OpenPOWER on IntegriCloud