diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-12 15:29:56 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-12 15:29:56 +0100 |
| commit | 37d122d7d892b5c3eff594d3a9db039cabf24291 (patch) | |
| tree | a693866a93a92e0eb4db5fee20232e7255c8a51f /include | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
| parent | 2141102e045e622cac176891cb66c5bf08e439f5 (diff) | |
| download | linux-stable-37d122d7d892b5c3eff594d3a9db039cabf24291.tar.gz linux-stable-37d122d7d892b5c3eff594d3a9db039cabf24291.tar.bz2 linux-stable-37d122d7d892b5c3eff594d3a9db039cabf24291.zip | |
Merge tag 'at91-fixes' into at91-4.1-cleanup
First fixes batch for AT91 on 4.0:
- PM slowclock fixes for DDR and timeouts
- fix some DT entries
- little defconfig updates
- the removal of a harmful watchdog option + its detailed documentation
Diffstat (limited to 'include')
| -rw-r--r-- | include/soc/at91/at91sam9_ddrsdr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/soc/at91/at91sam9_ddrsdr.h b/include/soc/at91/at91sam9_ddrsdr.h index 0210797abf2e..dc10c52e0e91 100644 --- a/include/soc/at91/at91sam9_ddrsdr.h +++ b/include/soc/at91/at91sam9_ddrsdr.h @@ -92,7 +92,7 @@ #define AT91_DDRSDRC_UPD_MR (3 << 20) /* Update load mode register and extended mode register */ #define AT91_DDRSDRC_MDR 0x20 /* Memory Device Register */ -#define AT91_DDRSDRC_MD (3 << 0) /* Memory Device Type */ +#define AT91_DDRSDRC_MD (7 << 0) /* Memory Device Type */ #define AT91_DDRSDRC_MD_SDR 0 #define AT91_DDRSDRC_MD_LOW_POWER_SDR 1 #define AT91_DDRSDRC_MD_LOW_POWER_DDR 3 |