diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-04-10 14:22:23 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-04-10 14:22:23 +0200 |
| commit | b491d9757d14415edcb1468ed896a704d0f0cfe7 (patch) | |
| tree | 477707170048989accc9ea69cd6ac5edae7b1aec /arch/arm/mach-at91/mpddrc.c | |
| parent | 79d75d752717fb4106ec49abaddbd7744c775a35 (diff) | |
| parent | 385a08a60f042061b004642d6b9bb6cfb794ad5a (diff) | |
Merge branch 'u-boot/master'
Diffstat (limited to 'arch/arm/mach-at91/mpddrc.c')
| -rw-r--r-- | arch/arm/mach-at91/mpddrc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/mpddrc.c b/arch/arm/mach-at91/mpddrc.c index beec13db8c..e2b6a49eb9 100644 --- a/arch/arm/mach-at91/mpddrc.c +++ b/arch/arm/mach-at91/mpddrc.c @@ -19,7 +19,8 @@ static inline void atmel_mpddr_op(int mode, u32 ram_address) static int ddr2_decodtype_is_seq(u32 cr) { -#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SAMA5D4) +#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SAMA5D4) || \ + defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9N12) if (cr & ATMEL_MPDDRC_CR_DECOD_INTERLEAVED) return 0; #endif |