Merge remote-tracking branch 'regmap/topic/flat' into regmap-next

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

diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 2b84fc32fae2bf9f861104ebd8d8c0adc4d9006a..20ca7663975f04244a794f2a43655adbdd262699 100644 (file)
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -57,6 +57,8 @@ struct device_node;
  *     enabling module power and clock; may sleep
  * @free: optional hook for chip-specific deactivation, such as
  *     disabling module power and clock; may sleep
+ * @get_direction: returns direction for signal "offset", 0=out, 1=in,
+ *     (same as GPIOF_DIR_XXX), or negative error
  * @direction_input: configures signal "offset" as input, or returns error
  * @get: returns value for signal "offset"; for output signals this
  *     returns either the value actually sensed, or zero
@@ -101,7 +103,8 @@ struct gpio_chip {
                                                unsigned offset);
        void                    (*free)(struct gpio_chip *chip,
                                                unsigned offset);
-
+       int                     (*get_direction)(struct gpio_chip *chip,
+                                               unsigned offset);
        int                     (*direction_input)(struct gpio_chip *chip,
                                                unsigned offset);
        int                     (*get)(struct gpio_chip *chip,
@@ -283,14 +286,16 @@ struct gpio_pin_range {
 };
 
 int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
-                          unsigned int pin_base, unsigned int npins);
+                          unsigned int gpio_offset, unsigned int pin_offset,
+                          unsigned int npins);
 void gpiochip_remove_pin_ranges(struct gpio_chip *chip);
 
 #else
 
 static inline int
 gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
-                      unsigned int pin_base, unsigned int npins)
+                      unsigned int gpio_offset, unsigned int pin_offset,
+                      unsigned int npins)
 {
        return 0;
 }