Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-pxa / csb726.c

diff --git a/arch/arm/mach-pxa/csb726.c b/arch/arm/mach-pxa/csb726.c
index 57cacaff194db96ea3f83590517e9339efd6002e..a305424a967ddb5c67f4debd20d425d458661029 100644 (file)
--- a/arch/arm/mach-pxa/csb726.c
+++ b/arch/arm/mach-pxa/csb726.c
@@ -27,6 +27,7 @@
 #include <mach/ohci.h>
 #include <mach/pxa2xx-regs.h>
 #include <mach/audio.h>
+#include <mach/smemc.h>
 
 #include "generic.h"
 #include "devices.h"
@@ -255,9 +256,9 @@ static struct platform_device *devices[] __initdata = {
 static void __init csb726_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(csb726_pin_config));
-/*     MSC1 = 0x7ffc3ffc; *//* LAN9215/EXP_CS */
-/*     MSC2 = 0x06697ff4; *//* none/SM501 */
-       MSC2 = (MSC2 & ~0xffff) | 0x7ff4; /* SM501 */
+/*     __raw_writel(0x7ffc3ffc, MSC1); *//* LAN9215/EXP_CS */
+/*     __raw_writel(0x06697ff4, MSC2); *//* none/SM501 */
+       __raw_writel((__raw_readl(MSC2) & ~0xffff) | 0x7ff4, MSC2); /* SM501 */
 
        pxa_set_ffuart_info(NULL);
        pxa_set_btuart_info(NULL);
@@ -273,7 +274,7 @@ static void __init csb726_init(void)
 
 MACHINE_START(CSB726, "Cogent CSB726")
        .boot_params    = 0xa0000100,
-       .map_io         = pxa_map_io,
+       .map_io         = pxa27x_map_io,
        .init_irq       = pxa27x_init_irq,
        .init_machine   = csb726_init,
        .timer          = &pxa_timer,