GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 11:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: at91/spl: mpddrc: use IP version to check configuration

Browse source 
To remove the unnecessary #ifdef-endif, use the mpddrc IP version
to check whether or not the interleaved decoding type is supported.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
This commit is contained in:
Wenyou Yang 2016-02-01 18:12:17 +08:00 • committed by Andreas Bießmann
parent c2ad76c4bd
commit 4245701ef5
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/arm/mach-at91/mpddrc.c
View file

@ -12,6 +12,8 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/atmel_mpddrc.h> #include <asm/arch/atmel_mpddrc.h>
#define SAMA5D3_MPDDRC_VERSION 0x140
static inline void atmel_mpddr_op(const struct atmel_mpddr *mpddr, static inline void atmel_mpddr_op(const struct atmel_mpddr *mpddr,
int mode, int mode,
u32 ram_address) u32 ram_address)
@ -20,13 +22,15 @@ static inline void atmel_mpddr_op(const struct atmel_mpddr *mpddr,
writel(0, ram_address); writel(0, ram_address);
} }
static int ddr2_decodtype_is_seq(u32 cr) static int ddr2_decodtype_is_seq(const unsigned int base, u32 cr)
{ {
#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SAMA5D4) || \ struct atmel_mpddr *mpddr = (struct atmel_mpddr *)base;
defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9N12) u16 version = readl(&mpddr->version) & 0xffff;
if (cr & ATMEL_MPDDRC_CR_DECOD_INTERLEAVED)
if ((version >= SAMA5D3_MPDDRC_VERSION) &&
(cr & ATMEL_MPDDRC_CR_DECOD_INTERLEAVED))
return 0; return 0;
#endif
return 1; return 1;
} }
@ -41,7 +45,7 @@ int ddr2_init(const unsigned int base,
/* Compute bank offset according to NC in configuration register */ /* Compute bank offset according to NC in configuration register */
ba_off = (mpddr_value->cr & ATMEL_MPDDRC_CR_NC_MASK) + 9; ba_off = (mpddr_value->cr & ATMEL_MPDDRC_CR_NC_MASK) + 9;
if (ddr2_decodtype_is_seq(mpddr_value->cr)) if (ddr2_decodtype_is_seq(base, mpddr_value->cr))
ba_off += ((mpddr_value->cr & ATMEL_MPDDRC_CR_NR_MASK) >> 2) + 11; ba_off += ((mpddr_value->cr & ATMEL_MPDDRC_CR_NR_MASK) >> 2) + 11;
ba_off += (mpddr_value->md & ATMEL_MPDDRC_MD_DBW_MASK) ? 1 : 2; ba_off += (mpddr_value->md & ATMEL_MPDDRC_MD_DBW_MASK) ? 1 : 2;
@ -148,7 +152,7 @@ int ddr3_init(const unsigned int base,
/* Compute bank offset according to NC in configuration register */ /* Compute bank offset according to NC in configuration register */
ba_off = (mpddr_value->cr & ATMEL_MPDDRC_CR_NC_MASK) + 9; ba_off = (mpddr_value->cr & ATMEL_MPDDRC_CR_NC_MASK) + 9;
if (ddr2_decodtype_is_seq(mpddr_value->cr)) if (ddr2_decodtype_is_seq(base, mpddr_value->cr))
ba_off += ((mpddr_value->cr & ba_off += ((mpddr_value->cr &
ATMEL_MPDDRC_CR_NR_MASK) >> 2) + 11; ATMEL_MPDDRC_CR_NR_MASK) >> 2) + 11;