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

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
index d1a769f,807b0e8..da4415d
--- 1/drivers/net/ethernet/ti/cpsw.c
--- 2/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@@ -1977,10 -1980,11 +1981,13 @@@ static int cpsw_suspend(struct device *
  
        if (netif_running(ndev))
                cpsw_ndo_stop(ndev);
 +      soft_reset("sliver 0", &priv->slaves[0].sliver->soft_reset);
 +      soft_reset("sliver 1", &priv->slaves[1].sliver->soft_reset);
        pm_runtime_put_sync(&pdev->dev);
  
+       /* Select sleep pin state */
+       pinctrl_pm_select_sleep_state(&pdev->dev);
+ 
        return 0;
  }
  

diff --cc drivers/net/ethernet/ti/davinci_mdio.c
index c47f0db,5e361f4..ce7c499
--- 1/drivers/net/ethernet/ti/davinci_mdio.c
--- 2/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@@ -449,22 -453,32 +453,28 @@@ static int davinci_mdio_suspend(struct 
        __raw_writel(ctrl, &data->regs->control);
        wait_for_idle(data);
  
 -      pm_runtime_put_sync(data->dev);
 -
        data->suspended = true;
        spin_unlock(&data->lock);
 +      pm_runtime_put_sync(data->dev);
  
+       /* Select sleep pin state */
+       pinctrl_pm_select_sleep_state(dev);
+ 
        return 0;
  }
  
  static int davinci_mdio_resume(struct device *dev)
  {
        struct davinci_mdio_data *data = dev_get_drvdata(dev);
 -      u32 ctrl;
  
 -      spin_lock(&data->lock);
+       /* Select default pin state */
+       pinctrl_pm_select_default_state(dev);
+ 
        pm_runtime_get_sync(data->dev);
  
 +      spin_lock(&data->lock);
        /* restart the scan state machine */
 -      ctrl = __raw_readl(&data->regs->control);
 -      ctrl |= CONTROL_ENABLE;
 -      __raw_writel(ctrl, &data->regs->control);
 +      __davinci_mdio_reset(data);
  
        data->suspended = false;
        spin_unlock(&data->lock);

diff --cc drivers/pinctrl/Kconfig
Simple merge

diff --cc drivers/pinctrl/Makefile
index 76c937c,cf699a5..d64563b
--- 1/drivers/pinctrl/Makefile
--- 2/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -46,7 -50,7 +51,8 @@@ obj-$(CONFIG_PINCTRL_S3C24XX) += pinctr
  obj-$(CONFIG_PINCTRL_S3C64XX) += pinctrl-s3c64xx.o
  obj-$(CONFIG_PINCTRL_XWAY)    += pinctrl-xway.o
  obj-$(CONFIG_PINCTRL_LANTIQ)  += pinctrl-lantiq.o
 +obj-$(CONFIG_PINCTRL_ST)      += pinctrl-st.o
+ obj-$(CONFIG_PINCTRL_VF610)   += pinctrl-vf610.o
  
  obj-$(CONFIG_PLAT_ORION)        += mvebu/
  obj-$(CONFIG_ARCH_SHMOBILE)   += sh-pfc/

diff --cc drivers/pinctrl/pinctrl-coh901.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-exynos.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-nomadik.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-samsung.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-u300.c
Simple merge

diff --cc drivers/pinctrl/sh-pfc/core.c
Simple merge

diff --cc drivers/spi/spi-pl022.c
Simple merge

diff --cc drivers/tty/serial/amba-pl011.c
Simple merge