3 files changed, 37 insertions, 4 deletions

diff --git a/drivers/sh/intc/chip.c b/drivers/sh/intc/chip.c
index 33b2ed451e09..7b246efa94ea 100644
--- a/drivers/sh/intc/chip.c
+++ b/drivers/sh/intc/chip.c
@@ -186,7 +186,7 @@ static unsigned char intc_irq_sense_table[IRQ_TYPE_SENSE_MASK + 1] = {
     !defined(CONFIG_CPU_SUBTYPE_SH7709)
         [IRQ_TYPE_LEVEL_HIGH] = VALID(3),
 #endif
-#if defined(CONFIG_ARCH_SH7372)
+#if defined(CONFIG_ARM) /* all recent SH-Mobile / R-Mobile ARM support this */
         [IRQ_TYPE_EDGE_BOTH] = VALID(4),
 #endif
 };
@@ -202,11 +202,16 @@ static int intc_set_type(struct irq_data *data, unsigned int type)
         if (!value)
                 return -EINVAL;
 
+        value &= ~SENSE_VALID_FLAG;
+
         ihp = intc_find_irq(d->sense, d->nr_sense, irq);
         if (ihp) {
+                /* PINT has 2-bit sense registers, should fail on EDGE_BOTH */
+                if (value >= (1 << _INTC_WIDTH(ihp->handle)))
+                        return -EINVAL;
+
                 addr = INTC_REG(d, _INTC_ADDR_E(ihp->handle), 0);
-                intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle,
-                                                    value & ~SENSE_VALID_FLAG);
+                intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle, value);
         }
 
         return 0;
diff --git a/drivers/sh/intc/userimask.c b/drivers/sh/intc/userimask.c
index e32304b66cf1..56bf9336b92b 100644
--- a/drivers/sh/intc/userimask.c
+++ b/drivers/sh/intc/userimask.c
@@ -13,6 +13,7 @@
 #include <linux/sysdev.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/stat.h>
 #include <asm/sizes.h>
 #include "internals.h"
 
diff --git a/drivers/sh/pfc.c b/drivers/sh/pfc.c
index 75934e3ea34e..e67fe170d8d5 100644
--- a/drivers/sh/pfc.c
+++ b/drivers/sh/pfc.c
@@ -217,7 +217,7 @@ static int get_config_reg(struct pinmux_info *gpioc, pinmux_enum_t enum_id,
 
                 if (!r_width)
                         break;
-                for (n = 0; n < (r_width / f_width) * 1 << f_width; n++) {
+                for (n = 0; n < (r_width / f_width) * (1 << f_width); n++) {
                         if (config_reg->enum_ids[n] == enum_id) {
                                 *crp = config_reg;
                                 *indexp = n;
@@ -577,6 +577,32 @@ static void sh_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
         sh_gpio_set_value(chip_to_pinmux(chip), offset, value);
 }
 
+static int sh_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+        struct pinmux_info *gpioc = chip_to_pinmux(chip);
+        pinmux_enum_t enum_id;
+        pinmux_enum_t *enum_ids;
+        int i, k, pos;
+
+        pos = 0;
+        enum_id = 0;
+        while (1) {
+                pos = get_gpio_enum_id(gpioc, offset, pos, &enum_id);
+                if (pos <= 0 || !enum_id)
+                        break;
+
+                for (i = 0; i < gpioc->gpio_irq_size; i++) {
+                        enum_ids = gpioc->gpio_irq[i].enum_ids;
+                        for (k = 0; enum_ids[k]; k++) {
+                                if (enum_ids[k] == enum_id)
+                                        return gpioc->gpio_irq[i].irq;
+                        }
+                }
+        }
+
+        return -ENOSYS;
+}
+
 int register_pinmux(struct pinmux_info *pip)
 {
         struct gpio_chip *chip = &pip->chip;
@@ -592,6 +618,7 @@ int register_pinmux(struct pinmux_info *pip)
         chip->get = sh_gpio_get;
         chip->direction_output = sh_gpio_direction_output;
         chip->set = sh_gpio_set;
+        chip->to_irq = sh_gpio_to_irq;
 
         WARN_ON(pip->first_gpio != 0); /* needs testing */