From: Marek Vasut <marex@denx.de>
Date: Sat, 1 Aug 2015 20:25:29 +0000 (+0200)
Subject: ddr: altera: sdram: Clean up sdram_mmr_init_full() part 8
X-Git-Tag: KARO-TX6-2015-09-18~570
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=751613d650dea354a6876be0a84fb99345e7ae24

ddr: altera: sdram: Clean up sdram_mmr_init_full() part 8

Fix the return value so that standard errno return values can be used.

Signed-off-by: Marek Vasut <marex@denx.de>
---

diff --git a/arch/arm/mach-socfpga/include/mach/sdram.h b/arch/arm/mach-socfpga/include/mach/sdram.h
index d57257df24..89240b8c06 100644
--- a/arch/arm/mach-socfpga/include/mach/sdram.h
+++ b/arch/arm/mach-socfpga/include/mach/sdram.h
@@ -9,7 +9,7 @@
 #ifndef __ASSEMBLY__
 
 unsigned long sdram_calculate_size(void);
-unsigned sdram_mmr_init_full(unsigned int sdr_phy_reg);
+int sdram_mmr_init_full(unsigned int sdr_phy_reg);
 int sdram_calibration_full(void);
 
 extern int sdram_calibration(void);
diff --git a/drivers/ddr/altera/sdram.c b/drivers/ddr/altera/sdram.c
index 295747b3fa..68a9b60e79 100644
--- a/drivers/ddr/altera/sdram.c
+++ b/drivers/ddr/altera/sdram.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
+#include <errno.h>
 #include <div64.h>
 #include <watchdog.h>
 #include <asm/arch/fpga_manager.h>
@@ -621,7 +622,7 @@ static void sdr_load_regs(struct socfpga_sdram_config *cfg)
  *
  * Initialize the SDRAM MMR.
  */
-unsigned sdram_mmr_init_full(unsigned int sdr_phy_reg)
+int sdram_mmr_init_full(unsigned int sdr_phy_reg)
 {
 	unsigned long status = 0;
 	struct socfpga_sdram_config *cfg = &sdram_config;