leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: tegra: fix variable naming in query_sdram_size()

Browse Source 
size_mb is used to hold a value that's sometimes KB, sometimes MB,
and sometimes bytes. Use separate correctly named variables to avoid
confusion here. Also fix indentation of a conditional statement.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Stephen Warren
2014-12-23 10:34:50 -07:00
committed by Tom Warren
parent 1e4d11a58c
commit 3a2cab512c
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/mach-tegra/board.c
View File

@@ -32,23 +32,24 @@ enum {
unsigned int query_sdram_size(void) unsigned int query_sdram_size(void)
{ {
struct mc_ctlr *const mc = (struct mc_ctlr *)NV_PA_MC_BASE; struct mc_ctlr *const mc = (struct mc_ctlr *)NV_PA_MC_BASE;
u32 size_mb; u32 emem_cfg, size_bytes;
size_mb = readl(&mc->mc_emem_cfg); emem_cfg = readl(&mc->mc_emem_cfg);
#if defined(CONFIG_TEGRA20) #if defined(CONFIG_TEGRA20)
debug("mc->mc_emem_cfg (MEM_SIZE_KB) = 0x%08x\n", size_mb); debug("mc->mc_emem_cfg (MEM_SIZE_KB) = 0x%08x\n", emem_cfg);
size_mb = get_ram_size((void *)PHYS_SDRAM_1, size_mb * 1024); size_bytes = get_ram_size((void *)PHYS_SDRAM_1, emem_cfg * 1024);
#else #else
debug("mc->mc_emem_cfg (MEM_SIZE_MB) = 0x%08x\n", size_mb); debug("mc->mc_emem_cfg (MEM_SIZE_MB) = 0x%08x\n", emem_cfg);
size_mb = get_ram_size((void *)PHYS_SDRAM_1, size_mb * 1024 * 1024); size_bytes = get_ram_size((void *)PHYS_SDRAM_1, emem_cfg * 1024 * 1024);
#endif #endif
#if defined(CONFIG_TEGRA30) || defined(CONFIG_TEGRA114) #if defined(CONFIG_TEGRA30) || defined(CONFIG_TEGRA114)
/* External memory limited to 2047 MB due to IROM/HI-VEC */ /* External memory limited to 2047 MB due to IROM/HI-VEC */
if (size_mb == SZ_2G) size_mb -= SZ_1M; if (size_bytes == SZ_2G)
size_bytes -= SZ_1M;
#endif #endif
return size_mb; return size_bytes;
} }
int dram_init(void) int dram_init(void)