[ARM] Orion: provide GPIO method for enabling hardware assisted blinking

This is a pre-requisite for implementing proper hardware accelerated
GPIO LED flashing, and since we want proper locking, it's sensible to provide
the orion specific orion_gpio_set_blink() implementation within
mach-orion/gpio.c. The functions orion_gpio_set_blink() and gpio_set_value()
implicitly turn off each others state.

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Acked-by: Tzachi Perelstein <tzachi@marvell.com>
Acked-by: Nicolas Pitre <nico@marvell.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-orion/gpio.c b/arch/arm/mach-orion/gpio.c
index af8553ccd230b9d8652839246cfb20a4f0aaa907..0418f5b1ebe77612507992b725e6522f6eec2d32 100644 (file)
--- a/arch/arm/mach-orion/gpio.c
+++ b/arch/arm/mach-orion/gpio.c
@@ -76,6 +76,7 @@ int gpio_direction_output(unsigned pin, int value)
                gpio_label[pin] = "?";
 
        mask = 1 << pin;
+       orion_clrbits(GPIO_BLINK_EN, mask);
        if (value)
                orion_setbits(GPIO_OUT, mask);
        else
@@ -107,6 +108,7 @@ void gpio_set_value(unsigned pin, int value)
 
        spin_lock_irqsave(&gpio_lock, flags);
 
+       orion_clrbits(GPIO_BLINK_EN, mask);
        if (value)
                orion_setbits(GPIO_OUT, mask);
        else
@@ -116,6 +118,23 @@ void gpio_set_value(unsigned pin, int value)
 }
 EXPORT_SYMBOL(gpio_set_value);
 
+void orion_gpio_set_blink(unsigned pin, int blink)
+{
+       unsigned long flags;
+       int mask = 1 << pin;
+
+       spin_lock_irqsave(&gpio_lock, flags);
+
+       orion_clrbits(GPIO_OUT, mask);
+       if (blink)
+               orion_setbits(GPIO_BLINK_EN, mask);
+       else
+               orion_clrbits(GPIO_BLINK_EN, mask);
+
+       spin_unlock_irqrestore(&gpio_lock, flags);
+}
+EXPORT_SYMBOL(orion_gpio_set_blink);
+
 int gpio_request(unsigned pin, const char *label)
 {
        int ret = 0;

diff --git a/include/asm-arm/arch-orion/gpio.h b/include/asm-arm/arch-orion/gpio.h
index 6d5848ed9a3921a9eb0f982c94084a8e29598881..d66284f9a14c10a90c1e89856b19b1057795c82c 100644 (file)
--- a/include/asm-arm/arch-orion/gpio.h
+++ b/include/asm-arm/arch-orion/gpio.h
@@ -12,6 +12,7 @@ extern int gpio_direction_input(unsigned pin);
 extern int gpio_direction_output(unsigned pin, int value);
 extern int gpio_get_value(unsigned pin);
 extern void gpio_set_value(unsigned pin, int value);
+extern void orion_gpio_set_blink(unsigned pin, int blink);
 extern void gpio_display(void);                /* debug */
 
 static inline int gpio_to_irq(int pin)