| From | Ben Hutchings <> | Date | Sun, 29 Dec 2013 03:08:43 +0100 | Subject | [PATCH 3.2 014/185] ARM: sa11x0/assabet: ensure CS2 is configured appropriately |
| |
3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Russell King <rmk+kernel@arm.linux.org.uk>
commit f3964fe1c9d9a887d65faf594669852e4dec46e0 upstream.
The CS2 region contains the Assabet board configuration and status registers, which are 32-bit. Unfortunately, some boot loaders do not configure this region correctly, leaving it setup as a 16-bit region. Fix this.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- arch/arm/mach-sa1100/assabet.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c @@ -411,6 +411,9 @@ static void __init assabet_map_io(void) * Its called GPCLKR0 in my SA1110 manual. */ Ser1SDCR0 |= SDCR0_SUS; + MSC1 = (MSC1 & ~0xffff) | + MSC_NonBrst | MSC_32BitStMem | + MSC_RdAcc(2) | MSC_WrAcc(2) | MSC_Rec(0); if (machine_has_neponset()) { #ifdef CONFIG_ASSABET_NEPONSET
|