diff options
| author |   Olof Johansson <olof@lixom.net> | 2013-06-11 00:32:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-11 00:32:20 -0700 |
| commit | 9ee73aec3570733dc3b9a6b4782db6b323abfa5e (patch) | |
| tree | 82626b8205e1f495878428e7bb5b49acf3d651ab /include/linux | |
| parent | Merge tag 'renesas-defconfig-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards (diff) | |
| parent | ARM: shmobile: marzen: Use RCAR_GP_PIN macro (diff) | |
Merge branch 'renesas/pinmux-gpio' into next/boards
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/gpio-rcar.h | 5 |
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__ */ |