lkml.org 
[lkml]   [2007]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/12] Blackfin arch: Finalize the generic gpio support - add gpio_to_irq and irq_to_gpio
    Date
    From: Michael Hennerich <michael.hennerich@analog.com>

    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <bryan.wu@analog.com>
    ---
    include/asm-blackfin/gpio.h | 13 +++++++++++++
    include/asm-blackfin/mach-bf533/irq.h | 2 ++
    include/asm-blackfin/mach-bf537/irq.h | 2 ++
    include/asm-blackfin/mach-bf548/irq.h | 2 ++
    include/asm-blackfin/mach-bf561/irq.h | 2 ++
    5 files changed, 21 insertions(+), 0 deletions(-)

    diff --git a/include/asm-blackfin/gpio.h b/include/asm-blackfin/gpio.h
    index 7480cfa..e714363 100644
    --- a/include/asm-blackfin/gpio.h
    +++ b/include/asm-blackfin/gpio.h
    @@ -421,6 +421,19 @@ unsigned short gpio_get_value(unsigned short gpio);
    void gpio_direction_input(unsigned short gpio);
    void gpio_direction_output(unsigned short gpio);

    +#include <asm-generic/gpio.h> /* cansleep wrappers */
    +#include <asm/irq.h>
    +
    +static inline int gpio_to_irq(unsigned gpio)
    +{
    + return (gpio + GPIO_IRQ_BASE);
    +}
    +
    +static inline int irq_to_gpio(unsigned irq)
    +{
    + return (irq - GPIO_IRQ_BASE);
    +}
    +
    #endif /* __ASSEMBLY__ */

    #endif /* __ARCH_BLACKFIN_GPIO_H__ */
    diff --git a/include/asm-blackfin/mach-bf533/irq.h b/include/asm-blackfin/mach-bf533/irq.h
    index 9879e68..452fb82 100644
    --- a/include/asm-blackfin/mach-bf533/irq.h
    +++ b/include/asm-blackfin/mach-bf533/irq.h
    @@ -128,6 +128,8 @@ Core Emulation **
    #define IRQ_PF14 47
    #define IRQ_PF15 48

    +#define GPIO_IRQ_BASE IRQ_PF0
    +
    #ifdef CONFIG_IRQCHIP_DEMUX_GPIO
    #define NR_IRQS (IRQ_PF15+1)
    #else
    diff --git a/include/asm-blackfin/mach-bf537/irq.h b/include/asm-blackfin/mach-bf537/irq.h
    index 8af2a83..36c44bc 100644
    --- a/include/asm-blackfin/mach-bf537/irq.h
    +++ b/include/asm-blackfin/mach-bf537/irq.h
    @@ -160,6 +160,8 @@ Core Emulation **
    #define IRQ_PH14 96
    #define IRQ_PH15 97

    +#define GPIO_IRQ_BASE IRQ_PF0
    +
    #ifdef CONFIG_IRQCHIP_DEMUX_GPIO
    #define NR_IRQS (IRQ_PH15+1)
    #else
    diff --git a/include/asm-blackfin/mach-bf548/irq.h b/include/asm-blackfin/mach-bf548/irq.h
    index e548d3c..21f06f7 100644
    --- a/include/asm-blackfin/mach-bf548/irq.h
    +++ b/include/asm-blackfin/mach-bf548/irq.h
    @@ -337,6 +337,8 @@ Events (highest priority) EMU 0
    #define IRQ_PJ14 BFIN_PJ_IRQ(14) /* N/A */
    #define IRQ_PJ15 BFIN_PJ_IRQ(15) /* N/A */

    +#define GPIO_IRQ_BASE IRQ_PA0
    +
    #ifdef CONFIG_IRQCHIP_DEMUX_GPIO
    #define NR_IRQS (IRQ_PJ15+1)
    #else
    diff --git a/include/asm-blackfin/mach-bf561/irq.h b/include/asm-blackfin/mach-bf561/irq.h
    index a753ce7..1278992 100644
    --- a/include/asm-blackfin/mach-bf561/irq.h
    +++ b/include/asm-blackfin/mach-bf561/irq.h
    @@ -289,6 +289,8 @@
    #define IRQ_PF46 119
    #define IRQ_PF47 120

    +#define GPIO_IRQ_BASE IRQ_PF0
    +
    #ifdef CONFIG_IRQCHIP_DEMUX_GPIO
    #define NR_IRQS (IRQ_PF47 + 1)
    #else
    --
    1.5.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-08-08 05:45    [W:0.024 / U:0.200 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site