| author | Arnd Bergmann <arnd@arndb.de> | |
| Fri, 10 Aug 2012 10:34:18 +0000 (12:34 +0200) | ||
| committer | Arnd Bergmann <arnd@arndb.de> | |
| Mon, 13 Aug 2012 15:09:38 +0000 (17:09 +0200) | ||
| commit | e05dd97c5c345bd1f6ce9f6fc242326a64191239 | |
| tree | a3d700746bc2b5f809876bd7aa8c7c0ac93166ac | tree | snapshot (tar.xz tar.gz zip) |
| parent | 19e4ab54e7f5fe46a3c931afa7e786f11d57b558 | commit | diff |
| parent | 4cf3326ab5f34a333a46c59d0d3783db9cef13bf | commit | diff |
Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci
AT91 SoC related code modifications: a cleanup in defconfigs and
a one liner in a board file.
The most important is the move to atmel-mci driver in AT91 SoC & boards.
The old at91_mci (marked as deprecated) will be removed in 3.7. So all
platform data for this old driver are erased and replace by information
needed by atmel-mci driver.
* tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91:
ARM: at91: add atmel-mci support for chips and boards which can use it
ARM: at91/defconfig: change the MCI driver to use in defconfigs
ARM: at91: set i2c_board_info.type to "ds1339" directly
ARM: at91/defconfig: Remove unaffected config option
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
AT91 SoC related code modifications: a cleanup in defconfigs and
a one liner in a board file.
The most important is the move to atmel-mci driver in AT91 SoC & boards.
The old at91_mci (marked as deprecated) will be removed in 3.7. So all
platform data for this old driver are erased and replace by information
needed by atmel-mci driver.
* tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91:
ARM: at91: add atmel-mci support for chips and boards which can use it
ARM: at91/defconfig: change the MCI driver to use in defconfigs
ARM: at91: set i2c_board_info.type to "ds1339" directly
ARM: at91/defconfig: Remove unaffected config option
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
32 files changed: