From: Simon Horman Date: Sun, 26 May 2013 11:17:57 +0000 (+0900) Subject: Merge branches 'heads/soc-emev2', 'heads/soc-r8a73a4', 'heads/soc-r8a7779', 'heads... X-Git-Tag: next-20130527~8^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=32681e6091458d231c6c741cf339f34f27fab0bb;p=karo-tx-linux.git Merge branches 'heads/soc-emev2', 'heads/soc-r8a73a4', 'heads/soc-r8a7779', 'heads/soc-sh7372', 'heads/soc-sh73a0', 'heads/soc-sh73a0-fixes', 'heads/defconfig-armadillo800eva', 'heads/defconfig-bockw', 'heads/defconfig-kzm9g', 'heads/boards-kzm9d', 'heads/boards-kzm9g', 'heads/boards-marzen-fixes', 'heads/boards-ape6evm', 'heads/boards-bockw', 'heads/boards-lager', 'heads/boards-marzen', 'heads/boards-armadillo800eva', 'heads/intc-external-irq' and 'heads/gpio-rcar' into next --- 32681e6091458d231c6c741cf339f34f27fab0bb diff --cc include/linux/platform_data/gpio-rcar.h index b253f77a7ddf,b253f77a7ddf,b253f77a7ddf,b253f77a7ddf,b253f77a7ddf,b253f77a7ddf,b253f77a7ddf,b253f77a7ddf,b253f77a7ddf,b253f77a7ddf,b253f77a7ddf,b253f77a7ddf,cc472f6d8591,cc472f6d8591,cc472f6d8591,cc472f6d8591,cc472f6d8591,b253f77a7ddf,6c0027a3c370..2d8d69432813 --- a/include/linux/platform_data/gpio-rcar.h +++ b/include/linux/platform_data/gpio-rcar.h @@@@@@@@@@@@@@@@@@@@ -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,6 -21,8 -21,8 -21,8 -21,8 -21,8 -21,6 -21,7 +21,9 @@@@@@@@@@@@@@@@@@@@ struct gpio_rcar_config 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__ */