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
omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
stargate2.c
diff --git
a/arch/arm/mach-pxa/stargate2.c
b/arch/arm/mach-pxa/stargate2.c
index
738adc1
..
3498a14
100644
(file)
--- a/
arch/arm/mach-pxa/stargate2.c
+++ b/
arch/arm/mach-pxa/stargate2.c
@@
-48,6
+48,7
@@
#include <mach/udc.h>
#include <mach/pxa2xx_spi.h>
#include <mach/pxa27x-udc.h>
#include <mach/udc.h>
#include <mach/pxa2xx_spi.h>
#include <mach/pxa27x-udc.h>
+#include <mach/smemc.h>
#include <linux/spi/spi.h>
#include <linux/mfd/da903x.h>
#include <linux/spi/spi.h>
#include <linux/mfd/da903x.h>
@@
-976,7
+977,7
@@
static void __init stargate2_init(void)
{
/* This is probably a board specific hack as this must be set
prior to connecting the MFP stuff up. */
{
/* This is probably a board specific hack as this must be set
prior to connecting the MFP stuff up. */
-
MECR &= ~MECR_NOS
;
+
__raw_writel(__raw_readl(MECR) & ~MECR_NOS, MECR)
;
pxa2xx_mfp_config(ARRAY_AND_SIZE(stargate2_pin_config));
pxa2xx_mfp_config(ARRAY_AND_SIZE(stargate2_pin_config));
@@
-998,7
+999,7
@@
static void __init stargate2_init(void)
#ifdef CONFIG_MACH_INTELMOTE2
MACHINE_START(INTELMOTE2, "IMOTE 2")
#ifdef CONFIG_MACH_INTELMOTE2
MACHINE_START(INTELMOTE2, "IMOTE 2")
- .map_io = pxa_map_io,
+ .map_io = pxa
27x
_map_io,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.init_machine = imote2_init,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.init_machine = imote2_init,
@@
-1008,7
+1009,7
@@
MACHINE_END
#ifdef CONFIG_MACH_STARGATE2
MACHINE_START(STARGATE2, "Stargate 2")
#ifdef CONFIG_MACH_STARGATE2
MACHINE_START(STARGATE2, "Stargate 2")
- .map_io = pxa_map_io,
+ .map_io = pxa
27x
_map_io,
.nr_irqs = STARGATE_NR_IRQS,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.nr_irqs = STARGATE_NR_IRQS,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,