diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-14 19:48:42 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-14 19:48:42 -0400 |
| commit | c094474d0b619374e4002ef0684eb0fab9e673c6 (patch) | |
| tree | 7df069e8d198e7cb6bb041ff1fae178a2d423f8c /arch/alpha/kernel/sys_mikasa.c | |
| parent | 3d9f0bd3f70bf9151f1ecc707ced8e1000299302 (diff) | |
| parent | 080e0435e54298992dfc03dc04ca53cfe3de36ba (diff) | |
Merge tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/boards
From Linus Walleij, a set of core patches for ux500. Most of them are
actually board changes, so I sort them into here.
Ux500 core changes:
- Fixes for size and location of PRCMU TCDM
- SD/MMC/SDIO caps updates to boardfiles
- Misc fixes
* tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: avoid warning in ux500_read_asicid
ARM: ux500: regulators: Remove misleading comment
ARM: ux500: Enable support for UHS-I SD-cards
ARM: ux500: Set eMMC and WLAN card slot as non-removable
ARM: ux500: Enable support for discard for MMC/SD
ARM: ux500: Enable support for RPMB and Reliable Write for eMMC
ARM: ux500: Don't set plf ocr mask for SD/MMC device
ARM: ux500: Enable 100MHz for SD/SDIO/MMC devices
ARM: ux500: Remove incorrect DB9540 PRCMU TCDM base location
ARM: ux500: Increase the size of the PRCMU's TCPM size
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/alpha/kernel/sys_mikasa.c')
0 files changed, 0 insertions, 0 deletions