Merge tag 'pinctrl-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull pin control fixes from Linus Walleij:
 "Here are three pin control fixes for v4.7.  Not much, and just driver
  fixes:

   - add device tree matches to MAINTAINERS

   - inversion bug in the Nomadik driver

   - dual edge handling bug in the mediatek driver"

* tag 'pinctrl-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: mediatek: fix dual-edge code defect
  MAINTAINERS: Add file patterns for pinctrl device tree bindings
  pinctrl: nomadik: fix inversion of gpio direction

2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 207b13b618cf..a607655d7830 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -1256,9 +1256,10 @@ static void mtk_eint_irq_handler(struct irq_desc *desc)
         const struct mtk_desc_pin *pin;
 
         chained_irq_enter(chip, desc);
-        for (eint_num = 0; eint_num < pctl->devdata->ap_num; eint_num += 32) {
+        for (eint_num = 0;
+             eint_num < pctl->devdata->ap_num;
+             eint_num += 32, reg += 4) {
                 status = readl(reg);
-                reg += 4;
                 while (status) {
                         offset = __ffs(status);
                         index = eint_num + offset;
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index ccbfc325c778..38faceff2f08 100644
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -854,7 +854,7 @@ static int nmk_gpio_get_dir(struct gpio_chip *chip, unsigned offset)
 
         clk_enable(nmk_chip->clk);
 
-        dir = !!(readl(nmk_chip->addr + NMK_GPIO_DIR) & BIT(offset));
+        dir = !(readl(nmk_chip->addr + NMK_GPIO_DIR) & BIT(offset));
 
         clk_disable(nmk_chip->clk);