[PATCH 3.2 014/185] ARM: sa11x0/assabet: ensure CS2 is configured appropriately

2013-12-28 Thread Ben Hutchings
3.2.54-rc1 review patch.  If anyone has any objections, please let me know.

--

From: Russell King 

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 
Signed-off-by: Ben Hutchings 
---
 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 & ~0x) |
+   MSC_NonBrst | MSC_32BitStMem |
+   MSC_RdAcc(2) | MSC_WrAcc(2) | MSC_Rec(0);
 
if (machine_has_neponset()) {
 #ifdef CONFIG_ASSABET_NEPONSET

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 3.2 014/185] ARM: sa11x0/assabet: ensure CS2 is configured appropriately

2013-12-28 Thread Ben Hutchings
3.2.54-rc1 review patch.  If anyone has any objections, please let me know.

--

From: Russell King rmk+ker...@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+ker...@arm.linux.org.uk
Signed-off-by: Ben Hutchings b...@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  ~0x) |
+   MSC_NonBrst | MSC_32BitStMem |
+   MSC_RdAcc(2) | MSC_WrAcc(2) | MSC_Rec(0);
 
if (machine_has_neponset()) {
 #ifdef CONFIG_ASSABET_NEPONSET

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/