summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-11 00:32:20 -0700
committerOlof Johansson <olof@lixom.net>2013-06-11 00:32:20 -0700
commit9ee73aec3570733dc3b9a6b4782db6b323abfa5e (patch)
tree82626b8205e1f495878428e7bb5b49acf3d651ab /include
parentb52e79152f35379a6bb5b800dcf796209fdebd02 (diff)
parent5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb (diff)
Merge branch 'renesas/pinmux-gpio' into next/boards
Diffstat (limited to 'include')
-rw-r--r--include/linux/platform_data/gpio-rcar.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/platform_data/gpio-rcar.h b/include/linux/platform_data/gpio-rcar.h
index b253f77a7ddf..2d8d69432813 100644
--- a/include/linux/platform_data/gpio-rcar.h
+++ b/include/linux/platform_data/gpio-rcar.h
@@ -17,10 +17,13 @@
#define __GPIO_RCAR_H__
struct gpio_rcar_config {
- unsigned int gpio_base;
+ int gpio_base;
unsigned int irq_base;
unsigned int number_of_pins;
const char *pctl_name;
+ unsigned has_both_edge_trigger:1;
};
+#define RCAR_GP_PIN(bank, pin) (((bank) * 32) + (pin))
+
#endif /* __GPIO_RCAR_H__ */