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/cjb/mmc
[pandora-kernel.git]
/
arch
/
arm
/
mach-footbridge
/
netwinder-hw.c
diff --git
a/arch/arm/mach-footbridge/netwinder-hw.c
b/arch/arm/mach-footbridge/netwinder-hw.c
index
06e514f
..
0d3846f
100644
(file)
--- a/
arch/arm/mach-footbridge/netwinder-hw.c
+++ b/
arch/arm/mach-footbridge/netwinder-hw.c
@@
-68,7
+68,7
@@
static inline void wb977_ww(int reg, int val)
/*
* This is a lock for accessing ports GP1_IO_BASE and GP2_IO_BASE
*/
/*
* This is a lock for accessing ports GP1_IO_BASE and GP2_IO_BASE
*/
-DEFINE_SPINLOCK(nw_gpio_lock);
+DEFINE_
RAW_
SPINLOCK(nw_gpio_lock);
EXPORT_SYMBOL(nw_gpio_lock);
static unsigned int current_gpio_op;
EXPORT_SYMBOL(nw_gpio_lock);
static unsigned int current_gpio_op;
@@
-327,9
+327,9
@@
static inline void wb977_init_gpio(void)
/*
* Set Group1/Group2 outputs
*/
/*
* Set Group1/Group2 outputs
*/
- spin_lock_irqsave(&nw_gpio_lock, flags);
+
raw_
spin_lock_irqsave(&nw_gpio_lock, flags);
nw_gpio_modify_op(-1, GPIO_RED_LED | GPIO_FAN);
nw_gpio_modify_op(-1, GPIO_RED_LED | GPIO_FAN);
- spin_unlock_irqrestore(&nw_gpio_lock, flags);
+
raw_
spin_unlock_irqrestore(&nw_gpio_lock, flags);
}
/*
}
/*
@@
-390,9
+390,9
@@
static void __init cpld_init(void)
{
unsigned long flags;
{
unsigned long flags;
- spin_lock_irqsave(&nw_gpio_lock, flags);
+
raw_
spin_lock_irqsave(&nw_gpio_lock, flags);
nw_cpld_modify(-1, CPLD_UNMUTE | CPLD_7111_DISABLE);
nw_cpld_modify(-1, CPLD_UNMUTE | CPLD_7111_DISABLE);
- spin_unlock_irqrestore(&nw_gpio_lock, flags);
+
raw_
spin_unlock_irqrestore(&nw_gpio_lock, flags);
}
static unsigned char rwa_unlock[] __initdata =
}
static unsigned char rwa_unlock[] __initdata =
@@
-616,9
+616,9
@@
static int __init nw_hw_init(void)
cpld_init();
rwa010_init();
cpld_init();
rwa010_init();
- spin_lock_irqsave(&nw_gpio_lock, flags);
+
raw_
spin_lock_irqsave(&nw_gpio_lock, flags);
nw_gpio_modify_op(GPIO_RED_LED|GPIO_GREEN_LED, DEFAULT_LEDS);
nw_gpio_modify_op(GPIO_RED_LED|GPIO_GREEN_LED, DEFAULT_LEDS);
- spin_unlock_irqrestore(&nw_gpio_lock, flags);
+
raw_
spin_unlock_irqrestore(&nw_gpio_lock, flags);
}
return 0;
}
}
return 0;
}
@@
-631,8
+631,7
@@
__initcall(nw_hw_init);
* the parameter page.
*/
static void __init
* the parameter page.
*/
static void __init
-fixup_netwinder(struct machine_desc *desc, struct tag *tags,
- char **cmdline, struct meminfo *mi)
+fixup_netwinder(struct tag *tags, char **cmdline, struct meminfo *mi)
{
#ifdef CONFIG_ISAPNP
extern int isapnp_disable;
{
#ifdef CONFIG_ISAPNP
extern int isapnp_disable;
@@
-648,7
+647,7
@@
fixup_netwinder(struct machine_desc *desc, struct tag *tags,
MACHINE_START(NETWINDER, "Rebel-NetWinder")
/* Maintainer: Russell King/Rebel.com */
MACHINE_START(NETWINDER, "Rebel-NetWinder")
/* Maintainer: Russell King/Rebel.com */
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.video_start = 0x000a0000,
.video_end = 0x000bffff,
.reserve_lp0 = 1,
.video_start = 0x000a0000,
.video_end = 0x000bffff,
.reserve_lp0 = 1,