Merge tag 'gpio-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

Pull GPIO updates from Linus Walleij:
 "This is the bulk of GPIO changes for the v4.19 kernel cycle.

  I don't know if anything in particular stands out. Maybe the Aspeed
  coprocessor thing from Benji: Aspeed is doing baseboard management
  chips (BMC's) for servers etc.

  These Aspeed's are ARM processors that exist inside (I guess) Intel
  servers, and they are moving forward to using mainline Linux in those.
  This is one of the pieces of the puzzle to achive that. They are doing
  OpenBMC, it's pretty cool: https://lwn.net/Articles/683320/

  Summary:

  Core changes:

   - Add a new API for explicitly naming GPIO consumers, when needed.

   - Don't let userspace set values on input lines. While we do not
     think anyone would do this crazy thing we better plug the hole
     before someone uses it and think it's a nifty feature.

   - Avoid calling chip->request() for unused GPIOs.

  New drivers/subdrivers:

   - The Mediatek MT7621 is supported which is a big win for OpenWRT and
     similar router distributions using this chip, as it seems every
     major router manufacturer on the planet has made products using
     this chip: https://wikidevi.com/wiki/MediaTek_MT7621

   - The Tegra 194 is now supported.

   - The IT87 driver now supports IT8786E and IT8718F super-IO chips.

   - Add support for Rockchip RK3328 in the syscon GPIO driver.

  Driver changes:

   - Handle the get/set_multiple() properly on MMIO chips with inverted
     direction registers. We didn't have this problem until a new chip
     appear that has get/set registers AND inverted direction bits, OK
     now we handle it.

   - A patch series making more error codes percolate upward properly
     for different errors on gpiochip_lock_as_irq().

   - Get/set multiple for the OMAP driver, accelerating these multiple
     line operations if possible.

   - A coprocessor interface for the Aspeed driver. Sometimes a few GPIO
     lines need to be grabbed by a co-processor for doing automated
     tasks, sometimes they are available as GPIO lines. By adding an
     explicit API in this driver we make it possible for the two line
     consumers to coexist. (This work was made available on the
     ib-aspeed branch, which may be appearing in other pull requests.)

   - Implemented .get_direction() and open drain in the SCH311x driver.

   - Continuing cleanup of included headers in GPIO drivers"

* tag 'gpio-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (80 commits)
  gpio: it87: Add support for IT8613
  gpio: it87: add support for IT8718F Super I/O.
  gpiolib: Avoid calling chip->request() for unused gpios
  gpio: tegra: Include the right header
  gpio: mmio: Fix up inverted direction registers
  gpio: xilinx: Use the right include
  gpio: timberdale: Include the right header
  gpio: tb10x: Use the right include
  gpiolib: Fix of_node inconsistency
  gpio: vr41xx: Bail out on gpiochip_lock_as_irq() error
  gpio: uniphier: Bail out on gpiochip_lock_as_irq() error
  gpio: xgene-sb: Don't shadow error code of gpiochip_lock_as_irq()
  gpio: em: Don't shadow error code of gpiochip_lock_as_irq()
  gpio: dwapb: Don't shadow error code of gpiochip_lock_as_irq()
  gpio: bcm-kona: Don't shadow error code of gpiochip_lock_as_irq()
  gpiolib: Don't shadow error code of gpiochip_lock_as_irq()
  gpio: syscon: rockchip: add GRF GPIO support for rk3328
  gpio: omap: Add get/set_multiple() callbacks
  gpio: pxa: remove set but not used variable 'gpio_offset'
  gpio-it87: add support for IT8786E Super I/O
  ...

1 files changed, 30 insertions, 12 deletions

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 1e66f808051c..c18712dabf93 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -241,6 +241,17 @@ int pxa_irq_to_gpio(int irq)
         return irq_gpio0;
 }
 
+static bool pxa_gpio_has_pinctrl(void)
+{
+        switch (gpio_type) {
+        case PXA3XX_GPIO:
+                return false;
+
+        default:
+                return true;
+        }
+}
+
 static int pxa_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
 {
         struct pxa_gpio_chip *pchip = chip_to_pxachip(chip);
@@ -255,9 +266,11 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
         unsigned long flags;
         int ret;
 
-        ret = pinctrl_gpio_direction_input(chip->base + offset);
-        if (!ret)
-                return 0;
+        if (pxa_gpio_has_pinctrl()) {
+                ret = pinctrl_gpio_direction_input(chip->base + offset);
+                if (!ret)
+                        return 0;
+        }
 
         spin_lock_irqsave(&gpio_lock, flags);
 
@@ -282,9 +295,11 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,
 
         writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));
 
-        ret = pinctrl_gpio_direction_output(chip->base + offset);
-        if (ret)
-                return ret;
+        if (pxa_gpio_has_pinctrl()) {
+                ret = pinctrl_gpio_direction_output(chip->base + offset);
+                if (ret)
+                        return ret;
+        }
 
         spin_lock_irqsave(&gpio_lock, flags);
 
@@ -348,8 +363,12 @@ static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio,
         pchip->chip.set = pxa_gpio_set;
         pchip->chip.to_irq = pxa_gpio_to_irq;
         pchip->chip.ngpio = ngpio;
-        pchip->chip.request = gpiochip_generic_request;
-        pchip->chip.free = gpiochip_generic_free;
+
+        if (pxa_gpio_has_pinctrl()) {
+                pchip->chip.request = gpiochip_generic_request;
+                pchip->chip.free = gpiochip_generic_free;
+        }
+
 #ifdef CONFIG_OF_GPIO
         pchip->chip.of_node = np;
         pchip->chip.of_xlate = pxa_gpio_of_xlate;
@@ -607,7 +626,7 @@ static int pxa_gpio_probe(struct platform_device *pdev)
         struct pxa_gpio_platform_data *info;
         void __iomem *gpio_reg_base;
         int gpio, ret;
-        int irq0 = 0, irq1 = 0, irq_mux, gpio_offset = 0;
+        int irq0 = 0, irq1 = 0, irq_mux;
 
         pchip = devm_kzalloc(&pdev->dev, sizeof(*pchip), GFP_KERNEL);
         if (!pchip)
@@ -646,14 +665,13 @@ static int pxa_gpio_probe(struct platform_device *pdev)
         pchip->irq0 = irq0;
         pchip->irq1 = irq1;
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -EINVAL;
         gpio_reg_base = devm_ioremap(&pdev->dev, res->start,
                                      resource_size(res));
         if (!gpio_reg_base)
                 return -EINVAL;
 
-        if (irq0 > 0)
-                gpio_offset = 2;
-
         clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(clk)) {
                 dev_err(&pdev->dev, "Error %ld to get gpio clock\n",