summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-15 00:45:39 (GMT)
committerOlof Johansson <olof@lixom.net>2013-06-15 00:45:39 (GMT)
commit38d77ff90a47d198d2fd3ebd766ee84eaa71a0d2 (patch)
tree7adc209e84f7c45fba521d3430350d8a70ac4a75 /include
parent2c3165ebb641e0ff3faf1c87ed1c8fbd85871da0 (diff)
parent159f8a0209aff155af7f6fcdedd4a4484dd19c23 (diff)
downloadlinux-fsl-qoriq-38d77ff90a47d198d2fd3ebd766ee84eaa71a0d2.tar.xz
Merge tag 'renesas-gpio-rcar-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
From Simon Horman: Renesas ARM based SoC GPIO R-Car updates for v3.11 DT support to GPIO R-Car driver by Laurent Pinchart. * tag 'renesas-gpio-rcar-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (131 commits) gpio-rcar: Add DT support
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 b253f77..2d8d694 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__ */