diff options
author | Marek Vasut <marex@denx.de> | 2015-08-01 22:25:29 +0200 |
---|---|---|
committer | Marek Vasut <marex@denx.de> | 2015-08-08 14:14:27 +0200 |
commit | 99f453e9533f590fe40432b62c131625d7e91e46 (patch) | |
tree | 79f256ba93f39b3553ed95ea0d9a979f2d09807a | |
parent | 1e8a85f8c570932529a20b5634845b2a998b4262 (diff) | |
download | u-boot-imx-99f453e9533f590fe40432b62c131625d7e91e46.zip u-boot-imx-99f453e9533f590fe40432b62c131625d7e91e46.tar.gz u-boot-imx-99f453e9533f590fe40432b62c131625d7e91e46.tar.bz2 |
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>
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/sdram.h | 2 | ||||
-rw-r--r-- | drivers/ddr/altera/sdram.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/sdram.h b/arch/arm/mach-socfpga/include/mach/sdram.h index d57257d..89240b8 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 295747b..68a9b60 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; |