From 14f0ab34ac63163c175eebb89a201fb61f3ae387 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Wed, 7 Jan 2009 11:30:49 +0800 Subject: [PATCH] --- yaml --- r: 137191 b: refs/heads/master c: 3b8e285c21d12082a85a142ef73a1648d41cae46 h: refs/heads/master i: 137189: 8d072900c94a035b2444b6638bcb75f1c4cb4a8a 137187: 53c196b5ba74178cf36353cc77b142977865d318 137183: 9f98e495420f8249fd0c8036bfb011a9fa3f18b5 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/generic.h | 1 - trunk/arch/arm/mach-pxa/gpio.c | 4 ++-- trunk/arch/arm/mach-pxa/include/mach/gpio.h | 5 ++++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7549d05e7a8f..929594ef00ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da065a0b3611751feefeb0f0e277cd5830056dad +refs/heads/master: 3b8e285c21d12082a85a142ef73a1648d41cae46 diff --git a/trunk/arch/arm/mach-pxa/generic.h b/trunk/arch/arm/mach-pxa/generic.h index bc12c9421cef..3465268ca716 100644 --- a/trunk/arch/arm/mach-pxa/generic.h +++ b/trunk/arch/arm/mach-pxa/generic.h @@ -20,7 +20,6 @@ extern void __init pxa3xx_init_irq(void); extern void __init pxa_map_io(void); extern unsigned int get_clk_frequency_khz(int info); -extern int pxa_last_gpio; #define SET_BANK(__nr,__start,__size) \ mi->bank[__nr].start = (__start), \ diff --git a/trunk/arch/arm/mach-pxa/gpio.c b/trunk/arch/arm/mach-pxa/gpio.c index 9a33eb07fe0a..41935590e990 100644 --- a/trunk/arch/arm/mach-pxa/gpio.c +++ b/trunk/arch/arm/mach-pxa/gpio.c @@ -20,6 +20,8 @@ #include +int pxa_last_gpio; + #define GPIO0_BASE (GPIO_REGS_VIRT + 0x0000) #define GPIO1_BASE (GPIO_REGS_VIRT + 0x0004) #define GPIO2_BASE (GPIO_REGS_VIRT + 0x0008) @@ -38,8 +40,6 @@ struct pxa_gpio_chip { void __iomem *regbase; }; -int pxa_last_gpio; - static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { unsigned long flags; diff --git a/trunk/arch/arm/mach-pxa/include/mach/gpio.h b/trunk/arch/arm/mach-pxa/include/mach/gpio.h index be4900ea32da..4049b234eda3 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/gpio.h +++ b/trunk/arch/arm/mach-pxa/include/mach/gpio.h @@ -100,8 +100,11 @@ /* NOTE: some PXAs have fewer on-chip GPIOs (like PXA255, with 85). - * Those cases currently cause holes in the GPIO number space. + * Those cases currently cause holes in the GPIO number space, the + * actual number of the last GPIO is recorded by 'pxa_last_gpio'. */ +extern int pxa_last_gpio; + #define NR_BUILTIN_GPIO 128 static inline int gpio_get_value(unsigned gpio)