diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 22:48:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 22:48:55 +0100 |
| commit | e3d00145e3c9e9d39219e183a47aa196a93447ef (patch) | |
| tree | 667f40d95a329574cc7c294356228cf0be7b0b19 /include | |
| parent | devicetree: Add TI-NSPIRE USB OTG support to device tree (diff) | |
| parent | ARM: at91/dt: sama5d4: add ISI dt support (diff) | |
| download | linux-e3d00145e3c9e9d39219e183a47aa196a93447ef.tar.xz linux-e3d00145e3c9e9d39219e183a47aa196a93447ef.zip | |
Merge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt
Pull "First batch of DT changes for 4.1" into next/dt:
- at91sam9x5 & EK board: ISI and camera sensors
- at91sam9n12 & EK board: USB gadget nodes
- sama5d3: typos, gpio-keys on Xplained board
- sama5d4: i2c, leds, audio, ISI, crypto, pwm missing nodes
- new sama5d4 xplained board
* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: (31 commits)
ARM: at91/dt: sama5d4: add ISI dt support
ARM: at91/dt: sama5d4: add pwm0 device node
ARM: at91/dt: sama5d4: add aes, sha and tdes nodes
ARM: at91: dt: sama5d4ek: enable audio
ARM: at91: dt: sama5d4ek: add and enable wm8904
ARM: at91: dt: sama5d4ek: enable ssc0
ARM: at91: dt: sama5d4: add ssc nodes
ARM: at91/dt: sama5d4 xplained: add i2c0
ARM: at91/dt: sama5d4: add dts for sama5d4 xplained board
ARM: at91/dt: sama5d4: add #{address, size}_cells properties for macb0
ARM: at91/dt: sama5d4ek: add leds in DT node
ARM: at91/dt: add i2c1 declaration to sama5d4
ARM: at91/dt: gpio-keys: address-cells and size-cells properties are not needed
ARM: at91/dt: at91-sama5d3_xplained: add gpio-key pinctrl property
ARM: at91/dt/trivial: correct file headers for SAMA5D3 SoC peripherals
ARM: at91/dt: at91sam9n12ek: enable udp
ARM: at91/dt: at91sam9n12: add udp device node
ARM: at91: at91sam9g25ek/dts: enable ISI and ov2640
ARM: at91: at91sam9x5ek/dts: add ov2640 support
ARM: at91: at91sam9x5/dts: add ISI dt support, include isi node, pinctrls
...
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 |