aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-06 03:25:16 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-13 04:12:07 -0500
commit70d13e083c8589dd3edc2313777655da39cb3568 (patch)
tree41478a4699b3cbc8c5598ccc1863ea058948741e /arch/arm
parent7ec80ddf0455ff3854a5ca524952d91b5eb676b2 (diff)
[ARM] netwinder: clean up GPIO naming
Netwinder was using gpio_xxx names which could clash with the GPIO layer. Add a 'nw_' prefix to ensure that these remain separate. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-footbridge/cats-hw.c1
-rw-r--r--arch/arm/mach-footbridge/common.c1
-rw-r--r--arch/arm/mach-footbridge/dc21285-timer.c1
-rw-r--r--arch/arm/mach-footbridge/dc21285.c1
-rw-r--r--arch/arm/mach-footbridge/dma.c1
-rw-r--r--arch/arm/mach-footbridge/ebsa285.c1
-rw-r--r--arch/arm/mach-footbridge/include/mach/hardware.h9
-rw-r--r--arch/arm/mach-footbridge/isa-irq.c1
-rw-r--r--arch/arm/mach-footbridge/netwinder-hw.c54
-rw-r--r--arch/arm/mach-footbridge/netwinder-leds.c7
-rw-r--r--arch/arm/mach-footbridge/personal.c1
11 files changed, 43 insertions, 35 deletions
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index 6a5b437ab86f..1b996b26d2e0 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -10,6 +10,7 @@
10#include <linux/init.h> 10#include <linux/init.h>
11#include <linux/screen_info.h> 11#include <linux/screen_info.h>
12#include <linux/io.h> 12#include <linux/io.h>
13#include <linux/spinlock.h>
13 14
14#include <asm/hardware/dec21285.h> 15#include <asm/hardware/dec21285.h>
15#include <asm/mach-types.h> 16#include <asm/mach-types.h>
diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c
index 818014e09f4a..36ff06d4df15 100644
--- a/arch/arm/mach-footbridge/common.c
+++ b/arch/arm/mach-footbridge/common.c
@@ -14,6 +14,7 @@
14#include <linux/list.h> 14#include <linux/list.h>
15#include <linux/init.h> 15#include <linux/init.h>
16#include <linux/io.h> 16#include <linux/io.h>
17#include <linux/spinlock.h>
17 18
18#include <asm/pgtable.h> 19#include <asm/pgtable.h>
19#include <asm/page.h> 20#include <asm/page.h>
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c
index b2a21189dd81..da35bc5c5ccc 100644
--- a/arch/arm/mach-footbridge/dc21285-timer.c
+++ b/arch/arm/mach-footbridge/dc21285-timer.c
@@ -7,6 +7,7 @@
7#include <linux/init.h> 7#include <linux/init.h>
8#include <linux/interrupt.h> 8#include <linux/interrupt.h>
9#include <linux/irq.h> 9#include <linux/irq.h>
10#include <linux/spinlock.h>
10 11
11#include <asm/irq.h> 12#include <asm/irq.h>
12 13
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c
index d4c1e526f59c..133086019e3e 100644
--- a/arch/arm/mach-footbridge/dc21285.c
+++ b/arch/arm/mach-footbridge/dc21285.c
@@ -17,6 +17,7 @@
17#include <linux/ioport.h> 17#include <linux/ioport.h>
18#include <linux/irq.h> 18#include <linux/irq.h>
19#include <linux/io.h> 19#include <linux/io.h>
20#include <linux/spinlock.h>
20 21
21#include <asm/irq.h> 22#include <asm/irq.h>
22#include <asm/system.h> 23#include <asm/system.h>
diff --git a/arch/arm/mach-footbridge/dma.c b/arch/arm/mach-footbridge/dma.c
index b653e9cfa3f7..4f3506346969 100644
--- a/arch/arm/mach-footbridge/dma.c
+++ b/arch/arm/mach-footbridge/dma.c
@@ -12,6 +12,7 @@
12 */ 12 */
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/io.h> 14#include <linux/io.h>
15#include <linux/spinlock.h>
15 16
16#include <asm/dma.h> 17#include <asm/dma.h>
17#include <asm/scatterlist.h> 18#include <asm/scatterlist.h>
diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c
index b1d3bf20a41e..30040fd588cc 100644
--- a/arch/arm/mach-footbridge/ebsa285.c
+++ b/arch/arm/mach-footbridge/ebsa285.c
@@ -4,6 +4,7 @@
4 * EBSA285 machine fixup 4 * EBSA285 machine fixup
5 */ 5 */
6#include <linux/init.h> 6#include <linux/init.h>
7#include <linux/spinlock.h>
7 8
8#include <asm/hardware/dec21285.h> 9#include <asm/hardware/dec21285.h>
9#include <asm/mach-types.h> 10#include <asm/mach-types.h>
diff --git a/arch/arm/mach-footbridge/include/mach/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h
index ff44e0ce2e14..51dd902043ad 100644
--- a/arch/arm/mach-footbridge/include/mach/hardware.h
+++ b/arch/arm/mach-footbridge/include/mach/hardware.h
@@ -86,10 +86,11 @@
86#define CPLD_FLASH_WR_ENABLE 1 86#define CPLD_FLASH_WR_ENABLE 1
87 87
88#ifndef __ASSEMBLY__ 88#ifndef __ASSEMBLY__
89extern void gpio_modify_op(int mask, int set); 89extern spinlock_t nw_gpio_lock;
90extern void gpio_modify_io(int mask, int in); 90extern void nw_gpio_modify_op(unsigned int mask, unsigned int set);
91extern int gpio_read(void); 91extern void nw_gpio_modify_io(unsigned int mask, unsigned int in);
92extern void cpld_modify(int mask, int set); 92extern unsigned int nw_gpio_read(void);
93extern void nw_cpld_modify(unsigned int mask, unsigned int set);
93#endif 94#endif
94 95
95#define pcibios_assign_all_busses() 1 96#define pcibios_assign_all_busses() 1
diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c
index 54fec9ae28b9..9ee80a211d3c 100644
--- a/arch/arm/mach-footbridge/isa-irq.c
+++ b/arch/arm/mach-footbridge/isa-irq.c
@@ -19,6 +19,7 @@
19#include <linux/list.h> 19#include <linux/list.h>
20#include <linux/init.h> 20#include <linux/init.h>
21#include <linux/io.h> 21#include <linux/io.h>
22#include <linux/spinlock.h>
22 23
23#include <asm/mach/irq.h> 24#include <asm/mach/irq.h>
24 25
diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c
index 00b0ddcac283..ac7ffa6fc413 100644
--- a/arch/arm/mach-footbridge/netwinder-hw.c
+++ b/arch/arm/mach-footbridge/netwinder-hw.c
@@ -11,6 +11,7 @@
11#include <linux/delay.h> 11#include <linux/delay.h>
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/io.h> 13#include <linux/io.h>
14#include <linux/spinlock.h>
14 15
15#include <asm/hardware/dec21285.h> 16#include <asm/hardware/dec21285.h>
16#include <asm/leds.h> 17#include <asm/leds.h>
@@ -67,13 +68,14 @@ static inline void wb977_ww(int reg, int val)
67/* 68/*
68 * This is a lock for accessing ports GP1_IO_BASE and GP2_IO_BASE 69 * This is a lock for accessing ports GP1_IO_BASE and GP2_IO_BASE
69 */ 70 */
70DEFINE_SPINLOCK(gpio_lock); 71DEFINE_SPINLOCK(nw_gpio_lock);
72EXPORT_SYMBOL(nw_gpio_lock);
71 73
72static unsigned int current_gpio_op; 74static unsigned int current_gpio_op;
73static unsigned int current_gpio_io; 75static unsigned int current_gpio_io;
74static unsigned int current_cpld; 76static unsigned int current_cpld;
75 77
76void gpio_modify_op(int mask, int set) 78void nw_gpio_modify_op(unsigned int mask, unsigned int set)
77{ 79{
78 unsigned int new_gpio, changed; 80 unsigned int new_gpio, changed;
79 81
@@ -86,6 +88,7 @@ void gpio_modify_op(int mask, int set)
86 if (changed & 0xff00) 88 if (changed & 0xff00)
87 outb(new_gpio >> 8, GP2_IO_BASE); 89 outb(new_gpio >> 8, GP2_IO_BASE);
88} 90}
91EXPORT_SYMBOL(nw_gpio_modify_op);
89 92
90static inline void __gpio_modify_io(int mask, int in) 93static inline void __gpio_modify_io(int mask, int in)
91{ 94{
@@ -118,7 +121,7 @@ static inline void __gpio_modify_io(int mask, int in)
118 } 121 }
119} 122}
120 123
121void gpio_modify_io(int mask, int in) 124void nw_gpio_modify_io(unsigned int mask, unsigned int in)
122{ 125{
123 /* Open up the SuperIO chip */ 126 /* Open up the SuperIO chip */
124 wb977_open(); 127 wb977_open();
@@ -128,11 +131,13 @@ void gpio_modify_io(int mask, int in)
128 /* Close up the EFER gate */ 131 /* Close up the EFER gate */
129 wb977_close(); 132 wb977_close();
130} 133}
134EXPORT_SYMBOL(nw_gpio_modify_io);
131 135
132int gpio_read(void) 136unsigned int nw_gpio_read(void)
133{ 137{
134 return inb(GP1_IO_BASE) | inb(GP2_IO_BASE) << 8; 138 return inb(GP1_IO_BASE) | inb(GP2_IO_BASE) << 8;
135} 139}
140EXPORT_SYMBOL(nw_gpio_read);
136 141
137/* 142/*
138 * Initialise the Winbond W83977F global registers 143 * Initialise the Winbond W83977F global registers
@@ -322,9 +327,9 @@ static inline void wb977_init_gpio(void)
322 /* 327 /*
323 * Set Group1/Group2 outputs 328 * Set Group1/Group2 outputs
324 */ 329 */
325 spin_lock_irqsave(&gpio_lock, flags); 330 spin_lock_irqsave(&nw_gpio_lock, flags);
326 gpio_modify_op(-1, GPIO_RED_LED | GPIO_FAN); 331 nw_gpio_modify_op(-1, GPIO_RED_LED | GPIO_FAN);
327 spin_unlock_irqrestore(&gpio_lock, flags); 332 spin_unlock_irqrestore(&nw_gpio_lock, flags);
328} 333}
329 334
330/* 335/*
@@ -359,34 +364,35 @@ static void __init wb977_init(void)
359 wb977_close(); 364 wb977_close();
360} 365}
361 366
362void cpld_modify(int mask, int set) 367void nw_cpld_modify(unsigned int mask, unsigned int set)
363{ 368{
364 int msk; 369 int msk;
365 370
366 current_cpld = (current_cpld & ~mask) | set; 371 current_cpld = (current_cpld & ~mask) | set;
367 372
368 gpio_modify_io(GPIO_DATA | GPIO_IOCLK | GPIO_IOLOAD, 0); 373 nw_gpio_modify_io(GPIO_DATA | GPIO_IOCLK | GPIO_IOLOAD, 0);
369 gpio_modify_op(GPIO_IOLOAD, 0); 374 nw_gpio_modify_op(GPIO_IOLOAD, 0);
370 375
371 for (msk = 8; msk; msk >>= 1) { 376 for (msk = 8; msk; msk >>= 1) {
372 int bit = current_cpld & msk; 377 int bit = current_cpld & msk;
373 378
374 gpio_modify_op(GPIO_DATA | GPIO_IOCLK, bit ? GPIO_DATA : 0); 379 nw_gpio_modify_op(GPIO_DATA | GPIO_IOCLK, bit ? GPIO_DATA : 0);
375 gpio_modify_op(GPIO_IOCLK, GPIO_IOCLK); 380 nw_gpio_modify_op(GPIO_IOCLK, GPIO_IOCLK);
376 } 381 }
377 382
378 gpio_modify_op(GPIO_IOCLK|GPIO_DATA, 0); 383 nw_gpio_modify_op(GPIO_IOCLK|GPIO_DATA, 0);
379 gpio_modify_op(GPIO_IOLOAD|GPIO_DSCLK, GPIO_IOLOAD|GPIO_DSCLK); 384 nw_gpio_modify_op(GPIO_IOLOAD|GPIO_DSCLK, GPIO_IOLOAD|GPIO_DSCLK);
380 gpio_modify_op(GPIO_IOLOAD, 0); 385 nw_gpio_modify_op(GPIO_IOLOAD, 0);
381} 386}
387EXPORT_SYMBOL(nw_cpld_modify);
382 388
383static void __init cpld_init(void) 389static void __init cpld_init(void)
384{ 390{
385 unsigned long flags; 391 unsigned long flags;
386 392
387 spin_lock_irqsave(&gpio_lock, flags); 393 spin_lock_irqsave(&nw_gpio_lock, flags);
388 cpld_modify(-1, CPLD_UNMUTE | CPLD_7111_DISABLE); 394 nw_cpld_modify(-1, CPLD_UNMUTE | CPLD_7111_DISABLE);
389 spin_unlock_irqrestore(&gpio_lock, flags); 395 spin_unlock_irqrestore(&nw_gpio_lock, flags);
390} 396}
391 397
392static unsigned char rwa_unlock[] __initdata = 398static unsigned char rwa_unlock[] __initdata =
@@ -596,12 +602,6 @@ static void __init rwa010_init(void)
596 rwa010_soundblaster_reset(); 602 rwa010_soundblaster_reset();
597} 603}
598 604
599EXPORT_SYMBOL(gpio_lock);
600EXPORT_SYMBOL(gpio_modify_op);
601EXPORT_SYMBOL(gpio_modify_io);
602EXPORT_SYMBOL(cpld_modify);
603EXPORT_SYMBOL(gpio_read);
604
605/* 605/*
606 * Initialise any other hardware after we've got the PCI bus 606 * Initialise any other hardware after we've got the PCI bus
607 * initialised. We may need the PCI bus to talk to this other 607 * initialised. We may need the PCI bus to talk to this other
@@ -616,9 +616,9 @@ static int __init nw_hw_init(void)
616 cpld_init(); 616 cpld_init();
617 rwa010_init(); 617 rwa010_init();
618 618
619 spin_lock_irqsave(&gpio_lock, flags); 619 spin_lock_irqsave(&nw_gpio_lock, flags);
620 gpio_modify_op(GPIO_RED_LED|GPIO_GREEN_LED, DEFAULT_LEDS); 620 nw_gpio_modify_op(GPIO_RED_LED|GPIO_GREEN_LED, DEFAULT_LEDS);
621 spin_unlock_irqrestore(&gpio_lock, flags); 621 spin_unlock_irqrestore(&nw_gpio_lock, flags);
622 } 622 }
623 return 0; 623 return 0;
624} 624}
diff --git a/arch/arm/mach-footbridge/netwinder-leds.c b/arch/arm/mach-footbridge/netwinder-leds.c
index d91a4f4a32dc..00269fe0be8a 100644
--- a/arch/arm/mach-footbridge/netwinder-leds.c
+++ b/arch/arm/mach-footbridge/netwinder-leds.c
@@ -32,7 +32,6 @@ static char led_state;
32static char hw_led_state; 32static char hw_led_state;
33 33
34static DEFINE_SPINLOCK(leds_lock); 34static DEFINE_SPINLOCK(leds_lock);
35extern spinlock_t gpio_lock;
36 35
37static void netwinder_leds_event(led_event_t evt) 36static void netwinder_leds_event(led_event_t evt)
38{ 37{
@@ -121,9 +120,9 @@ static void netwinder_leds_event(led_event_t evt)
121 spin_unlock_irqrestore(&leds_lock, flags); 120 spin_unlock_irqrestore(&leds_lock, flags);
122 121
123 if (led_state & LED_STATE_ENABLED) { 122 if (led_state & LED_STATE_ENABLED) {
124 spin_lock_irqsave(&gpio_lock, flags); 123 spin_lock_irqsave(&nw_gpio_lock, flags);
125 gpio_modify_op(GPIO_RED_LED | GPIO_GREEN_LED, hw_led_state); 124 nw_gpio_modify_op(GPIO_RED_LED | GPIO_GREEN_LED, hw_led_state);
126 spin_unlock_irqrestore(&gpio_lock, flags); 125 spin_unlock_irqrestore(&nw_gpio_lock, flags);
127 } 126 }
128} 127}
129 128
diff --git a/arch/arm/mach-footbridge/personal.c b/arch/arm/mach-footbridge/personal.c
index c4f843fc099d..e2c9f0690b16 100644
--- a/arch/arm/mach-footbridge/personal.c
+++ b/arch/arm/mach-footbridge/personal.c
@@ -4,6 +4,7 @@
4 * Personal server (Skiff) machine fixup 4 * Personal server (Skiff) machine fixup
5 */ 5 */
6#include <linux/init.h> 6#include <linux/init.h>
7#include <linux/spinlock.h>
7 8
8#include <asm/hardware/dec21285.h> 9#include <asm/hardware/dec21285.h>
9#include <asm/mach-types.h> 10#include <asm/mach-types.h>