git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
xcep.c
diff --git
a/arch/arm/mach-pxa/xcep.c
b/arch/arm/mach-pxa/xcep.c
index
3260ce7
..
51c0281
100644
(file)
--- a/
arch/arm/mach-pxa/xcep.c
+++ b/
arch/arm/mach-pxa/xcep.c
@@
-31,6
+31,7
@@
#include <mach/hardware.h>
#include <mach/pxa2xx-regs.h>
#include <mach/mfp-pxa25x.h>
#include <mach/hardware.h>
#include <mach/pxa2xx-regs.h>
#include <mach/mfp-pxa25x.h>
+#include <mach/smemc.h>
#include "generic.h"
#include "generic.h"
@@
-172,9
+173,9
@@
static void __init xcep_init(void)
/* See Intel XScale Developer's Guide for details */
/* Set RDF and RDN to appropriate values (chip select 3 (smc91x)) */
/* See Intel XScale Developer's Guide for details */
/* Set RDF and RDN to appropriate values (chip select 3 (smc91x)) */
-
MSC1 = (MSC1 & 0xffff) | 0xD5540000
;
+
__raw_writel((__raw_readl(MSC1) & 0xffff) | 0xD5540000, MSC1)
;
/* Set RDF and RDN to appropriate values (chip select 5 (fpga)) */
/* Set RDF and RDN to appropriate values (chip select 5 (fpga)) */
-
MSC2 = (MSC2 & 0xffff) | 0x72A00000
;
+
__raw_writel((__raw_readl(MSC2) & 0xffff) | 0x72A00000, MSC2)
;
platform_add_devices(ARRAY_AND_SIZE(devices));
pxa_set_i2c_info(&xcep_i2c_platform_data);
platform_add_devices(ARRAY_AND_SIZE(devices));
pxa_set_i2c_info(&xcep_i2c_platform_data);
@@
-183,7
+184,7
@@
static void __init xcep_init(void)
MACHINE_START(XCEP, "Iskratel XCEP")
.boot_params = 0xa0000100,
.init_machine = xcep_init,
MACHINE_START(XCEP, "Iskratel XCEP")
.boot_params = 0xa0000100,
.init_machine = xcep_init,
- .map_io = pxa_map_io,
+ .map_io = pxa
25x
_map_io,
.init_irq = pxa25x_init_irq,
.timer = &pxa_timer,
MACHINE_END
.init_irq = pxa25x_init_irq,
.timer = &pxa_timer,
MACHINE_END