Merge tag 'pinctrl-for-v3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull pin control changes from Linus Walleij:

 - A large slew of improvements of the Genric pin configuration support,
   and deployment in four different platforms: Rockchip, Super-H PFC,
   ABx500 and TZ1090.  Support BIAS_BUS_HOLD, get device tree parsing
   and debugfs support into shape.

 - We also have device tree support with generic naming conventions for
   the generic pin configuration.

 - Delete the unused and confusing direct pinconf API.  Now state
   transitions is *the* way to control pins and multiplexing.

 - New drivers for Rockchip, TZ1090, and TZ1090 PDC.

 - Two pin control states related to power management are now handled in
   the device core: "sleep" and "idle", removing a lot of boilerplate
   code in drivers.  We do not yet know if this is the final word for
   pin PM, but it already make things a lot easier to handle.

 - Handle sparse GPIO ranges passing a list of disparate pins, and
   utilize these in the new BayTrail (x86 Atom SoC) driver.

 - Make the sunxi (AllWinner) driver handle external interrupts.

 - Make it possible for pinctrl-single to handle the case where several
   pins are managed by a single register, and augment it to handle sleep
   modes.

 - Cleanups and improvements for the abx500 drivers.

 - Move Sirf pin control drivers to their own directory, support
   save/restore of context and add support for the SiRFatlas6 SoC.

 - PMU muxing for the Dove pinctrl driver.

 - Finalization and support for VF610 in the i.MX6 pinctrl driver.

 - Smoothen out various Exynos rough edges.

 - Generic cleanups of various kinds.

* tag 'pinctrl-for-v3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (82 commits)
  pinctrl: vt8500: wmt: remove redundant dev_err call in wmt_pinctrl_probe()
  pinctrl: remove bindings for pinconf options needing more thought
  pinctrl: remove slew-rate parameter from tz1090
  pinctrl: set unit for debounce time pinconfig to usec
  pinctrl: more clarifications for generic pull configs
  pinctrl: rip out the direct pinconf API
  pinctrl-tz1090-pdc: add TZ1090 PDC pinctrl driver
  pinctrl-tz1090: add TZ1090 pinctrl driver
  pinctrl: samsung: Staticize drvdata_list
  pinctrl: rockchip: Add missing irq_gc_unlock() call before return error
  pinctrl: abx500: rework error path
  pinctrl: abx500: suppress hardcoded value
  pinctrl: abx500: factorize code
  pinctrl: abx500: fix abx500_gpio_get()
  pinctrl: abx500: fix abx500_pin_config_set()
  pinctrl: abx500: Add device tree support
  sh-pfc: Guard DT parsing with #ifdef CONFIG_OF
  pinctrl: add Intel BayTrail GPIO/pinctrl support
  pinctrl: fix pinconf_ops::pin_config_dbg_parse_modify kerneldoc
  pinctrl: Staticize local symbols
  ...

Conflicts:
	drivers/net/ethernet/ti/davinci_mdio.c
	drivers/pinctrl/Makefile

1 files changed, 64 insertions, 22 deletions

diff --git a/drivers/pinctrl/pinctrl-exynos.c b/drivers/pinctrl/pinctrl-exynos.c
index 5f58cf0e96e2..a74b3cbd7451 100644
--- a/drivers/pinctrl/pinctrl-exynos.c
+++ b/drivers/pinctrl/pinctrl-exynos.c
@@ -50,37 +50,58 @@ static const struct of_device_id exynos_wkup_irq_ids[] = {
         { }
 };
 
-static void exynos_gpio_irq_unmask(struct irq_data *irqd)
+static void exynos_gpio_irq_mask(struct irq_data *irqd)
 {
         struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);
         struct samsung_pinctrl_drv_data *d = bank->drvdata;
         unsigned long reg_mask = d->ctrl->geint_mask + bank->eint_offset;
         unsigned long mask;
+        unsigned long flags;
+
+        spin_lock_irqsave(&bank->slock, flags);
 
         mask = readl(d->virt_base + reg_mask);
-        mask &= ~(1 << irqd->hwirq);
+        mask |= 1 << irqd->hwirq;
         writel(mask, d->virt_base + reg_mask);
+
+        spin_unlock_irqrestore(&bank->slock, flags);
 }
 
-static void exynos_gpio_irq_mask(struct irq_data *irqd)
+static void exynos_gpio_irq_ack(struct irq_data *irqd)
 {
         struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);
         struct samsung_pinctrl_drv_data *d = bank->drvdata;
-        unsigned long reg_mask = d->ctrl->geint_mask + bank->eint_offset;
-        unsigned long mask;
+        unsigned long reg_pend = d->ctrl->geint_pend + bank->eint_offset;
 
-        mask = readl(d->virt_base + reg_mask);
-        mask |= 1 << irqd->hwirq;
-        writel(mask, d->virt_base + reg_mask);
+        writel(1 << irqd->hwirq, d->virt_base + reg_pend);
 }
 
-static void exynos_gpio_irq_ack(struct irq_data *irqd)
+static void exynos_gpio_irq_unmask(struct irq_data *irqd)
 {
         struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);
         struct samsung_pinctrl_drv_data *d = bank->drvdata;
-        unsigned long reg_pend = d->ctrl->geint_pend + bank->eint_offset;
+        unsigned long reg_mask = d->ctrl->geint_mask + bank->eint_offset;
+        unsigned long mask;
+        unsigned long flags;
 
-        writel(1 << irqd->hwirq, d->virt_base + reg_pend);
+        /*
+         * Ack level interrupts right before unmask
+         *
+         * If we don't do this we'll get a double-interrupt.  Level triggered
+         * interrupts must not fire an interrupt if the level is not
+         * _currently_ active, even if it was active while the interrupt was
+         * masked.
+         */
+        if (irqd_get_trigger_type(irqd) & IRQ_TYPE_LEVEL_MASK)
+                exynos_gpio_irq_ack(irqd);
+
+        spin_lock_irqsave(&bank->slock, flags);
+
+        mask = readl(d->virt_base + reg_mask);
+        mask &= ~(1 << irqd->hwirq);
+        writel(mask, d->virt_base + reg_mask);
+
+        spin_unlock_irqrestore(&bank->slock, flags);
 }
 
 static int exynos_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)
@@ -258,37 +279,58 @@ err_domains:
         return ret;
 }
 
-static void exynos_wkup_irq_unmask(struct irq_data *irqd)
+static void exynos_wkup_irq_mask(struct irq_data *irqd)
 {
         struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
         struct samsung_pinctrl_drv_data *d = b->drvdata;
         unsigned long reg_mask = d->ctrl->weint_mask + b->eint_offset;
         unsigned long mask;
+        unsigned long flags;
+
+        spin_lock_irqsave(&b->slock, flags);
 
         mask = readl(d->virt_base + reg_mask);
-        mask &= ~(1 << irqd->hwirq);
+        mask |= 1 << irqd->hwirq;
         writel(mask, d->virt_base + reg_mask);
+
+        spin_unlock_irqrestore(&b->slock, flags);
 }
 
-static void exynos_wkup_irq_mask(struct irq_data *irqd)
+static void exynos_wkup_irq_ack(struct irq_data *irqd)
 {
         struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
         struct samsung_pinctrl_drv_data *d = b->drvdata;
-        unsigned long reg_mask = d->ctrl->weint_mask + b->eint_offset;
-        unsigned long mask;
+        unsigned long pend = d->ctrl->weint_pend + b->eint_offset;
 
-        mask = readl(d->virt_base + reg_mask);
-        mask |= 1 << irqd->hwirq;
-        writel(mask, d->virt_base + reg_mask);
+        writel(1 << irqd->hwirq, d->virt_base + pend);
 }
 
-static void exynos_wkup_irq_ack(struct irq_data *irqd)
+static void exynos_wkup_irq_unmask(struct irq_data *irqd)
 {
         struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
         struct samsung_pinctrl_drv_data *d = b->drvdata;
-        unsigned long pend = d->ctrl->weint_pend + b->eint_offset;
+        unsigned long reg_mask = d->ctrl->weint_mask + b->eint_offset;
+        unsigned long mask;
+        unsigned long flags;
 
-        writel(1 << irqd->hwirq, d->virt_base + pend);
+        /*
+         * Ack level interrupts right before unmask
+         *
+         * If we don't do this we'll get a double-interrupt.  Level triggered
+         * interrupts must not fire an interrupt if the level is not
+         * _currently_ active, even if it was active while the interrupt was
+         * masked.
+         */
+        if (irqd_get_trigger_type(irqd) & IRQ_TYPE_LEVEL_MASK)
+                exynos_wkup_irq_ack(irqd);
+
+        spin_lock_irqsave(&b->slock, flags);
+
+        mask = readl(d->virt_base + reg_mask);
+        mask &= ~(1 << irqd->hwirq);
+        writel(mask, d->virt_base + reg_mask);
+
+        spin_unlock_irqrestore(&b->slock, flags);
 }
 
 static int exynos_wkup_irq_set_type(struct irq_data *irqd, unsigned int type)