Merge branch 'sh-latest' of git://github.com/pmundt/linux-sh

* 'sh-latest' of git://github.com/pmundt/linux-sh:
  sh: Add default uImage rule for sh7757lcr
  sh: modify the asm/sh_eth.h to linux/sh_eth.h in sh7757lcr
  sh: userimask.c needs linux/stat.h
  sh: pfc: Add GPIO IRQ support
  sh: modify the asm/sh_eth.h to linux/sh_eth.h in some boards
  sh: pfc: Remove unused gpio_in_use member
  sh: add parameters for EHCI and RIIC in clock-sh7757.c
  sh: kexec: Add PHYSICAL_START
  SH: irq: Remove IRQF_DISABLED
  sh: pfc: get_config_reg() shift clean up
  sh: intc: Add IRQ trigger bit field check
  sh: drop unused Kconfig symbol
  sh: Fix implicit declaration of function numa_node_id
  sh: kexec: Register crashk_res
  sh: ecovec: add renesas_usbhs DMAEngine support

1 files changed, 11 insertions, 1 deletions

diff --git a/include/linux/sh_pfc.h b/include/linux/sh_pfc.h
index 30cae70874f..bc8c9208f7e 100644
--- a/include/linux/sh_pfc.h
+++ b/include/linux/sh_pfc.h
@@ -61,6 +61,14 @@ struct pinmux_data_reg {
         .reg = r, .reg_width = r_width, \
         .enum_ids = (pinmux_enum_t [r_width]) \
 
+struct pinmux_irq {
+        int irq;
+        pinmux_enum_t *enum_ids;
+};
+
+#define PINMUX_IRQ(irq_nr, ids...)                         \
+        { .irq = irq_nr, .enum_ids = (pinmux_enum_t []) { ids, 0 } }    \
+
 struct pinmux_range {
         pinmux_enum_t begin;
         pinmux_enum_t end;
@@ -87,7 +95,9 @@ struct pinmux_info {
         pinmux_enum_t *gpio_data;
         unsigned int gpio_data_size;
 
-        unsigned long *gpio_in_use;
+        struct pinmux_irq *gpio_irq;
+        unsigned int gpio_irq_size;
+
         struct gpio_chip chip;
 };