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, 3 insertions, 39 deletions

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index ad41319d1d9b..28b35ad9c6cd 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -150,10 +150,6 @@ struct pl011_dmatx_data {
 struct uart_amba_port {
         struct uart_port        port;
         struct clk              *clk;
-        /* Two optional pin states - default & sleep */
-        struct pinctrl          *pinctrl;
-        struct pinctrl_state    *pins_default;
-        struct pinctrl_state    *pins_sleep;
         const struct vendor_data *vendor;
         unsigned int            dmacr;          /* dma control reg */
         unsigned int            im;             /* interrupt mask */
@@ -1479,12 +1475,7 @@ static int pl011_hwinit(struct uart_port *port)
         int retval;
 
         /* Optionaly enable pins to be muxed in and configured */
-        if (!IS_ERR(uap->pins_default)) {
-                retval = pinctrl_select_state(uap->pinctrl, uap->pins_default);
-                if (retval)
-                        dev_err(port->dev,
-                                "could not set default pins\n");
-        }
+        pinctrl_pm_select_default_state(port->dev);
 
         /*
          * Try to enable the clock producer.
@@ -1610,7 +1601,6 @@ static void pl011_shutdown(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int cr;
-        int retval;
 
         /*
          * disable all interrupts
@@ -1653,13 +1643,7 @@ static void pl011_shutdown(struct uart_port *port)
          */
         clk_disable_unprepare(uap->clk);
         /* Optionally let pins go into sleep states */
-        if (!IS_ERR(uap->pins_sleep)) {
-                retval = pinctrl_select_state(uap->pinctrl, uap->pins_sleep);
-                if (retval)
-                        dev_err(port->dev,
-                                "could not set pins to sleep state\n");
-        }
-
+        pinctrl_pm_select_sleep_state(port->dev);
 
         if (uap->port.dev->platform_data) {
                 struct amba_pl011_data *plat;
@@ -2012,12 +1996,7 @@ static int __init pl011_console_setup(struct console *co, char *options)
                 return -ENODEV;
 
         /* Allow pins to be muxed in and configured */
-        if (!IS_ERR(uap->pins_default)) {
-                ret = pinctrl_select_state(uap->pinctrl, uap->pins_default);
-                if (ret)
-                        dev_err(uap->port.dev,
-                                "could not set default pins\n");
-        }
+        pinctrl_pm_select_default_state(uap->port.dev);
 
         ret = clk_prepare(uap->clk);
         if (ret)
@@ -2131,21 +2110,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
                 goto out;
         }
 
-        uap->pinctrl = devm_pinctrl_get(&dev->dev);
-        if (IS_ERR(uap->pinctrl)) {
-                ret = PTR_ERR(uap->pinctrl);
-                goto out;
-        }
-        uap->pins_default = pinctrl_lookup_state(uap->pinctrl,
-                                                 PINCTRL_STATE_DEFAULT);
-        if (IS_ERR(uap->pins_default))
-                dev_err(&dev->dev, "could not get default pinstate\n");
-
-        uap->pins_sleep = pinctrl_lookup_state(uap->pinctrl,
-                                               PINCTRL_STATE_SLEEP);
-        if (IS_ERR(uap->pins_sleep))
-                dev_dbg(&dev->dev, "could not get sleep pinstate\n");
-
         uap->clk = devm_clk_get(&dev->dev, NULL);
         if (IS_ERR(uap->clk)) {
                 ret = PTR_ERR(uap->clk);