arm: freescale: Rename initdram() to fsl_initdram()

This function name shadows a global name but is in fact different. This
is very confusing. Rename it to help with the following refactoring.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-04-06 12:47:04 -06:00 committed by Tom Rini
parent 6bacc73621
commit 3eace37e50
13 changed files with 24 additions and 12 deletions

View File

@ -5,6 +5,7 @@
*/
#include <common.h>
#include <fsl_ddr_sdram.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/system.h>
@ -876,7 +877,7 @@ void update_early_mmu_table(void)
__weak int dram_init(void)
{
initdram();
fsl_initdram();
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
/* This will break-before-make MMU for DDR */
update_early_mmu_table();

View File

@ -164,7 +164,7 @@ void board_mem_sleep_setup(void)
}
#endif
int initdram(void)
int fsl_initdram(void)
{
phys_size_t dram_size;

View File

@ -162,7 +162,7 @@ int dram_init(void)
* before accessing DDR SPD.
*/
select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
return initdram();
return fsl_initdram();
}
#ifdef CONFIG_FSL_ESDHC

View File

@ -108,7 +108,7 @@ found:
#endif
}
int initdram(void)
int fsl_initdram(void)
{
phys_size_t dram_size;

View File

@ -7,6 +7,7 @@
#include <common.h>
#include <i2c.h>
#include <fdt_support.h>
#include <fsl_ddr_sdram.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/fsl_serdes.h>
@ -153,7 +154,7 @@ int dram_init(void)
* before accessing DDR SPD.
*/
select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
initdram();
fsl_initdram();
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
/* This will break-before-make MMU for DDR */
update_early_mmu_table();

View File

@ -170,7 +170,7 @@ int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
}
#endif
int initdram(void)
int fsl_initdram(void)
{
phys_size_t dram_size;

View File

@ -92,7 +92,7 @@ found:
popts->cpo_sample = 0x70;
}
int initdram(void)
int fsl_initdram(void)
{
phys_size_t dram_size;

View File

@ -7,6 +7,7 @@
#include <common.h>
#include <i2c.h>
#include <fdt_support.h>
#include <fsl_ddr_sdram.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/fsl_serdes.h>
@ -149,7 +150,7 @@ int dram_init(void)
* before accessing DDR SPD.
*/
select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
initdram();
fsl_initdram();
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
/* This will break-before-make MMU for DDR */
update_early_mmu_table();

View File

@ -96,7 +96,7 @@ found:
popts->cpo_sample = 0x70;
}
int initdram(void)
int fsl_initdram(void)
{
phys_size_t dram_size;

View File

@ -158,7 +158,8 @@ int fsl_ddr_get_dimm_params(dimm_params_t *pdimm,
return 0;
}
#endif
int initdram(void)
int fsl_initdram(void)
{
puts("Initializing DDR....");

View File

@ -155,7 +155,7 @@ found:
}
}
int initdram(void)
int fsl_initdram(void)
{
#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
gd->ram_size = fsl_ddr_sdram_size();

View File

@ -158,7 +158,7 @@ found:
}
}
int initdram(void)
int fsl_initdram(void)
{
#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
gd->ram_size = fsl_ddr_sdram_size();

View File

@ -477,4 +477,12 @@ typedef struct fixed_ddr_parm{
int max_freq;
fsl_ddr_cfg_regs_t *ddr_settings;
} fixed_ddr_parm_t;
/**
* fsl_initdram() - Set up the SDRAM
*
* @return 0 if OK, -ve on error
*/
int fsl_initdram(void);
#endif