Merge remote-tracking branch 'gpio/for-next'

[karo-tx-linux.git] / include / linux / gpio.h

diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index b8d0e53a802f0eacadcd44f4f3fba8ec1163eda5..7b92e0a235b427bc2ad13ec293a5b04afa1969ad 100644 (file)
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -16,14 +16,17 @@
 #define GPIOF_OUT_INIT_LOW     (GPIOF_DIR_OUT | GPIOF_INIT_LOW)
 #define GPIOF_OUT_INIT_HIGH    (GPIOF_DIR_OUT | GPIOF_INIT_HIGH)
 
+/* Gpio pin is active-low */
+#define GPIOF_ACTIVE_LOW        (1 << 2)
+
 /* Gpio pin is open drain */
-#define GPIOF_OPEN_DRAIN       (1 << 2)
+#define GPIOF_OPEN_DRAIN       (1 << 3)
 
 /* Gpio pin is open source */
-#define GPIOF_OPEN_SOURCE      (1 << 3)
+#define GPIOF_OPEN_SOURCE      (1 << 4)
 
-#define GPIOF_EXPORT           (1 << 4)
-#define GPIOF_EXPORT_CHANGEABLE        (1 << 5)
+#define GPIOF_EXPORT           (1 << 5)
+#define GPIOF_EXPORT_CHANGEABLE        (1 << 6)
 #define GPIOF_EXPORT_DIR_FIXED (GPIOF_EXPORT)
 #define GPIOF_EXPORT_DIR_CHANGEABLE (GPIOF_EXPORT | GPIOF_EXPORT_CHANGEABLE)
 
@@ -205,6 +208,18 @@ static inline int gpio_to_irq(unsigned gpio)
        return -EINVAL;
 }
 
+static inline int gpio_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
+{
+       WARN_ON(1);
+       return -EINVAL;
+}
+
+static inline void gpio_unlock_as_irq(struct gpio_chip *chip,
+                                     unsigned int offset)
+{
+       WARN_ON(1);
+}
+
 static inline int irq_to_gpio(unsigned irq)
 {
        /* irq can never have been returned from gpio_to_irq() */