Merge tag 'gpio-v4.14-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 the GPIO changes for the v4.14 cycle.

  Not so much changes this time, phew. David Daney and Bartosz
  Golaszewski did all the really interesting work in infrastructure
  improvement across GPIO and IRQ core, hats off for them and to tglx
  and Marc Z for general help with these patch sets.

  Core changes:

   - Allow the GPIO irqchip to allocate IRQs dynamically. This is an
     important change on systems where only a restricted number of IRQs,
     lesser than the number of GPIO lines, can be utilized. Now we can
     allocate these on a first-come-first-served basis instead of
     hogging up valuable IRQ lines.

   - Serious fix-up of the kerneldoc documentation and inclusion into
     the kerneldoc builds.

   - Pulled in the IRQ simulator from the IRQ core tree and use this in
     the GPIO mockup driver for exhaustive testing of interrupt
     abilities.

  New drivers:

   - New driver for ThunderX and OCTEON-TX. This is especially
     interesting as it picks up improvements from the IRQ core that
     allow us to handle fasteoi ACKs upwards in a hierarchy when there
     are IRQ flag latches on several levels in a hierarchy. Very
     interesting work here.

   - New subdriver for Renesas R-Car r8a7745 (RZ/G1E).

  Misc:

   - Several fixes and improvements for Xilinx Zynq GPIO.

   - Support an enablement GPIO for the 74x164 GPIO.

   - Switch a bunch of chips to use devres to allocate irq descriptors.

   - A bunch of constification fixes"

* tag 'gpio-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (63 commits)
  gpio: mockup: remove unused variable gc
  gpio: pl061: constify amba_id
  Revert "gpiolib: request the gpio before querying its direction"
  gpio: twl6040: remove unneeded forward declaration
  gpio: zevio: make gpio_chip const
  gpio: add gpio_add_lookup_tables() to add several tables at once
  gpio: rcar: Add r8a7745 (RZ/G1E) support
  gpio: brcmstb: check return value of gpiochip_irqchip_add()
  MAINTAINERS: Add entry for THUNDERX GPIO Driver.
  gpio: Add gpio driver support for ThunderX and OCTEON-TX
  gpio: mockup: use irq_sim
  gpio: mxs: use devres for irq generic chip
  gpio: mxc: use devres for irq generic chip
  gpio: pch: use devres for irq generic chip
  gpio: ml-ioh: use devres for irq generic chip
  gpio: sta2x11: use devres for irq generic chip
  gpio: sta2x11: disallow unbinding the driver
  gpio: mxs: disallow unbinding the driver
  gpio: mxc: disallow unbinding the driver
  gpio: aspeed: Remove reference to clock name in debounce warning message
  ...

7 files changed, 154 insertions, 8 deletions

diff --git a/Documentation/devicetree/bindings/gpio/gpio-74x164.txt b/Documentation/devicetree/bindings/gpio/gpio-74x164.txt
index ce1b2231bf5d..2a97553d8d76 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-74x164.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-74x164.txt
@@ -12,6 +12,9 @@ Required properties:
       1 = active low
 - registers-number: Number of daisy-chained shift registers
 
+Optional properties:
+- enable-gpios: GPIO connected to the OE (Output Enable) pin.
+
 Example:
 
 gpio5: gpio5@0 {
diff --git a/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt b/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt
index c756afa88cc6..fc6378c778c5 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt
@@ -18,7 +18,7 @@ Required properties:
 Optional properties:
 
 - interrupt-parent      : The parent interrupt controller, optional if inherited
-- clocks                : A phandle to the HPLL clock node for debounce timings
+- clocks                : A phandle to the clock to use for debounce timings
 
 The gpio and interrupt properties are further described in their respective
 bindings documentation:
diff --git a/Documentation/devicetree/bindings/gpio/gpio-davinci.txt b/Documentation/devicetree/bindings/gpio/gpio-davinci.txt
index 5079ba7d6568..8beb0539b6d8 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-davinci.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-davinci.txt
@@ -1,7 +1,10 @@
 Davinci/Keystone GPIO controller bindings
 
 Required Properties:
-- compatible: should be "ti,dm6441-gpio", "ti,keystone-gpio"
+- compatible: should be "ti,dm6441-gpio": for Davinci da850 SoCs
+                        "ti,keystone-gpio": for Keystone 2 66AK2H/K, 66AK2L,
+                                                66AK2E SoCs
+                        "ti,k2g-gpio", "ti,keystone-gpio": for 66AK2G
 
 - reg: Physical base address of the controller and the size of memory mapped
        registers.
@@ -20,7 +23,21 @@ Required Properties:
 - ti,ngpio: The number of GPIO pins supported.
 
 - ti,davinci-gpio-unbanked: The number of GPIOs that have an individual interrupt
-                             line to processor.
+                            line to processor.
+
+- clocks: Should contain the device's input clock, and should be defined as per
+          the appropriate clock bindings consumer usage in,
+
+          Documentation/devicetree/bindings/clock/keystone-gate.txt
+                            for 66AK2HK/66AK2L/66AK2E SoCs or,
+
+          Documentation/devicetree/bindings/clock/ti,sci-clk.txt
+                            for 66AK2G SoCs
+
+- clock-names: Name should be "gpio";
+
+Currently clock-names and clocks are needed for all keystone 2 platforms
+Davinci platforms do not have DT clocks as of now.
 
 The GPIO controller also acts as an interrupt controller. It uses the default
 two cells specifier as described in Documentation/devicetree/bindings/
@@ -60,3 +77,73 @@ leds {
                 ...
         };
 };
+
+Example for 66AK2G:
+
+gpio0: gpio@2603000 {
+        compatible = "ti,k2g-gpio", "ti,keystone-gpio";
+        reg = <0x02603000 0x100>;
+        gpio-controller;
+        #gpio-cells = <2>;
+        interrupts = <GIC_SPI 432 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 433 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 434 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 435 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 436 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 437 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 438 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 439 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 440 IRQ_TYPE_EDGE_RISING>;
+        interrupt-controller;
+        #interrupt-cells = <2>;
+        ti,ngpio = <144>;
+        ti,davinci-gpio-unbanked = <0>;
+        clocks = <&k2g_clks 0x001b 0x0>;
+        clock-names = "gpio";
+};
+
+Example for 66AK2HK/66AK2L/66AK2E:
+
+gpio0: gpio@260bf00 {
+        compatible = "ti,keystone-gpio";
+        reg = <0x0260bf00 0x100>;
+        gpio-controller;
+        #gpio-cells = <2>;
+        /* HW Interrupts mapped to GPIO pins */
+        interrupts = <GIC_SPI 120 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 121 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 122 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 123 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 124 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 125 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 126 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 127 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 128 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 129 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 130 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 131 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 132 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 133 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 134 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 135 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 136 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 137 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 138 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 139 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 140 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 141 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 142 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 143 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 144 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 145 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 146 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 147 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 148 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 149 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>,
+                        <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
+                        clocks = <&clkgpio>;
+        clock-names = "gpio";
+        ti,ngpio = <32>;
+        ti,davinci-gpio-unbanked = <32>;
+};
diff --git a/Documentation/devicetree/bindings/gpio/gpio-vf610.txt b/Documentation/devicetree/bindings/gpio/gpio-vf610.txt
index 436cc99c6598..0ccbae44019c 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-vf610.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-vf610.txt
@@ -5,7 +5,9 @@ functionality. Each pair serves 32 GPIOs. The VF610 has 5 instances of
 each, and each PORT module has its own interrupt.
 
 Required properties for GPIO node:
-- compatible : Should be "fsl,<soc>-gpio", currently "fsl,vf610-gpio"
+- compatible : Should be "fsl,<soc>-gpio", below is supported list:
+               "fsl,vf610-gpio"
+               "fsl,imx7ulp-gpio"
 - reg : The first reg tuple represents the PORT module, the second tuple
   the GPIO module.
 - interrupts : Should be the port interrupt shared by all 32 pins.
diff --git a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
index 6826a371fb69..51c86f69995e 100644
--- a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
+++ b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
@@ -2,8 +2,9 @@
 
 Required Properties:
 
-  - compatible: should contain one of the following.
+  - compatible: should contain one or more of the following:
     - "renesas,gpio-r8a7743": for R8A7743 (RZ/G1M) compatible GPIO controller.
+    - "renesas,gpio-r8a7745": for R8A7745 (RZ/G1E) compatible GPIO controller.
     - "renesas,gpio-r8a7778": for R8A7778 (R-Mobile M1) compatible GPIO controller.
     - "renesas,gpio-r8a7779": for R8A7779 (R-Car H1) compatible GPIO controller.
     - "renesas,gpio-r8a7790": for R8A7790 (R-Car H2) compatible GPIO controller.
@@ -13,7 +14,14 @@ Required Properties:
     - "renesas,gpio-r8a7794": for R8A7794 (R-Car E2) compatible GPIO controller.
     - "renesas,gpio-r8a7795": for R8A7795 (R-Car H3) compatible GPIO controller.
     - "renesas,gpio-r8a7796": for R8A7796 (R-Car M3-W) compatible GPIO controller.
-    - "renesas,gpio-rcar": for generic R-Car GPIO controller.
+    - "renesas,rcar-gen1-gpio": for a generic R-Car Gen1 GPIO controller.
+    - "renesas,rcar-gen2-gpio": for a generic R-Car Gen2 or RZ/G1 GPIO controller.
+    - "renesas,rcar-gen3-gpio": for a generic R-Car Gen3 GPIO controller.
+    - "renesas,gpio-rcar": deprecated.
+
+    When compatible with the generic version nodes must list the
+    SoC-specific version corresponding to the platform first followed by
+    the generic version.
 
   - reg: Base address and length of each memory resource used by the GPIO
     controller hardware module.
@@ -43,7 +51,7 @@ interrupt-controller/interrupts.txt.
 Example: R8A7779 (R-Car H1) GPIO controller nodes
 
         gpio0: gpio@ffc40000 {
-                compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
+                compatible = "renesas,gpio-r8a7779", "renesas,rcar-gen1-gpio";
                 reg = <0xffc40000 0x2c>;
                 interrupt-parent = <&gic>;
                 interrupts = <0 141 0x4>;
@@ -55,7 +63,7 @@ Example: R8A7779 (R-Car H1) GPIO controller nodes
         };
         ...
         gpio6: gpio@ffc46000 {
-                compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
+                compatible = "renesas,gpio-r8a7779", "renesas,rcar-gen1-gpio";
                 reg = <0xffc46000 0x2c>;
                 interrupt-parent = <&gic>;
                 interrupts = <0 147 0x4>;
diff --git a/Documentation/driver-api/gpio.rst b/Documentation/driver-api/gpio.rst
new file mode 100644
index 000000000000..6dd4aa647f27
--- /dev/null
+++ b/Documentation/driver-api/gpio.rst
@@ -0,0 +1,45 @@
+===================================
+General Purpose Input/Output (GPIO)
+===================================
+
+Core
+====
+
+.. kernel-doc:: include/linux/gpio/driver.h
+   :internal:
+
+.. kernel-doc:: drivers/gpio/gpiolib.c
+   :export:
+
+Legacy API
+==========
+
+The functions listed in this section are deprecated. The GPIO descriptor based
+API described above should be used in new code.
+
+.. kernel-doc:: drivers/gpio/gpiolib-legacy.c
+   :export:
+
+ACPI support
+============
+
+.. kernel-doc:: drivers/gpio/gpiolib-acpi.c
+   :export:
+
+Device tree support
+===================
+
+.. kernel-doc:: drivers/gpio/gpiolib-of.c
+   :export:
+
+Device-managed API
+==================
+
+.. kernel-doc:: drivers/gpio/devres.c
+   :export:
+
+sysfs helpers
+=============
+
+.. kernel-doc:: drivers/gpio/gpiolib-sysfs.c
+   :export:
diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst
index 7c94ab50afed..9c20624842b7 100644
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@ -44,6 +44,7 @@ available subsections can be seen below.
    uio-howto
    firmware/index
    pinctl
+   gpio
    misc_devices
 
 .. only::  subproject and html