From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 4 Mar 2016 06:54:29 +0000 (+0900)
Subject: ARM: uniphier: fix build error when CONFIG_CMD_DDRMPHY_DUMP=y
X-Git-Tag: v2016.03~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=51244a60805fb91112f61ef268f58fc6d47a3d0a;p=oweals%2Fu-boot.git

ARM: uniphier: fix build error when CONFIG_CMD_DDRMPHY_DUMP=y

The build fails if compiled with CONFIG_CMD_DDRMPHY_DUMP=y since commit
46abfcc99e04 ("ARM: uniphier: rework struct uniphier_board_data").

Fixes: 46abfcc99e04 ("ARM: uniphier: rework struct uniphier_board_data")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
index c18f099f2c..7ac93786be 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
@@ -28,28 +28,14 @@ static int get_nr_ch(void)
 {
 	const struct uniphier_board_data *bd = uniphier_get_board_param();
 
-	return bd->dram_ch2_width ? 3 : 2;
+	return bd->dram_ch[2].size ? 3 : 2;
 }
 
 static int get_nr_datx8(int ch)
 {
-	unsigned int width;
-
 	const struct uniphier_board_data *bd = uniphier_get_board_param();
 
-	switch (ch) {
-	case 0:
-		width = bd->dram_ch0_width;
-		break;
-	case 1:
-		width = bd->dram_ch1_width;
-		break;
-	default:
-		width = bd->dram_ch2_width;
-		break;
-	}
-
-	return width / 8;
+	return bd->dram_ch[ch].width / 8;
 }
 
 static void print_bdl(void __iomem *reg, int n)