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

Pull GPIO updates from Linus Walleij:
 "This is the bulk of changes in the GPIO subsystem for the v5.4 kernel
  cycle.

  Core changes:

   - Support hierarchical GPIO irqchips.

     We now have three consumers that can use this: Intel IXP4xx,
     ThunderX and Qualcomm SPMI GPIO (in the pinctrl subsystem).

     The support code has been long in the making and hashed out so it
     should be easily adaptable for all hierarchical irqchip parents.
     The code only gets compiled in if hierarchical irqchip is used at
     the topmost irq controller at least, as the hierarchical irqchip
     requires strict hierarchy all the way up in the system.

   - Determine the need for a "valid_mask" for GPIO lines on the
     gpio_chip and conversely for the "valid_mask" for the GPIO
     interrupt chip interrupt lines by looking for a .init_valid_mask()
     callback in the main chip or GPIO interrupt chip respectively.
     Allocate it with bitmap_alloc().

   - Isolate the device tree/open firmware GPIO description code out in
     its own file properly.

   - Isolate the ACPI GPIO description code out in its own file
     properly.

   - Drop a whole lot of #ifdef:s in the main includes: it does not hurt
     to keep the include items around, and we get quicker and clearer
     compile failures if the appropriate kernel symbols are not selected
     for drivers.

  New/deleted drivers:

   - New driver for Aspeed SGPIO.

   - The KS8695 driver is deleted as the platform gets deleted from
     arch/arm in this kernel cycle.

   - The Cirrus Logic Madera driver now supports CS47L92 and CS47L15.

   - The Freescale MPC8xxx now supports LS1028A and LS1088A.

  Driver improvements:

   - We pass the GPIO irqchip intialization by directly filling in the
     struct instead of using set-up functions (the new way) for Intel
     MID, Lynxpoint, Merrifield, XLP, HLWD, Aspeed, ZX, VF610, TQMX86,
     MT7621, Zynq and EP93xx.

  Out-of-band changes:

   - Fix a GPIO header inclusion in Unicore - no response from
     maintainer.

   - Drop FMC subsystem from MAINTAINERS - was deleted in the GPIO tree
     last cycle so let's mop up the shards"

* tag 'gpio-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (82 commits)
  gpiolib: of: add a fallback for wlf,reset GPIO name
  gpio: htc-egpio: Remove unused exported htc_egpio_get_wakeup_irq()
  gpio: remove explicit comparison with 0
  gpio: creg-snps: use devm_platform_ioremap_resource() to simplify code
  gpio: devres: Switch to EXPORT_SYMBOL_GPL()
  gpio: of: Switch to EXPORT_SYMBOL_GPL()
  gpio: of: Make of_gpio_simple_xlate() private
  gpio: of: Make of_get_named_gpiod_flags() private
  gpio: aspeed: Add in ast2600 details to Aspeed driver
  gpio: aspeed: Use ngpio property from device tree if available
  gpio: aspeed: Setup irqchip dynamically
  gpio/aspeed: Fix incorrect number of banks
  gpio: aspeed: Update documentation with ast2600 controllers
  gpio: Initialize the irqchip valid_mask with a callback
  gpiolib: acpi: make acpi_can_fallback_to_crs() static
  gpio: Fix further merge errors
  gpio: Fix up merge collision in include file
  gpio: of: Normalize return code variable name
  gpio: gpiolib: Normalize return code variable name
  gpio: ep93xx: Pass irqchip when adding gpiochip
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpio/gpio-pca953x.c
Simple merge

diff --cc drivers/gpio/gpiolib-acpi.c
index bda28eb82c3fadc70feed81beff1c540fe93d322,2b6fdc9947f7de9083303092f8b0e4b15b488da5..609ed16ae9333bd25f154e3f4f399d6cfeda5234
--- 1/drivers/gpio/gpiolib-acpi.c
--- 2/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@@ -19,12 -18,8 +19,13 @@@
  #include <linux/pinctrl/pinctrl.h>
  
  #include "gpiolib.h"
+ #include "gpiolib-acpi.h"
  
 +static int run_edge_events_on_boot = -1;
 +module_param(run_edge_events_on_boot, int, 0444);
 +MODULE_PARM_DESC(run_edge_events_on_boot,
 +               "Run edge _AEI event-handlers at boot: 0=no, 1=yes, -1=auto");
 +
  /**
   * struct acpi_gpio_event - ACPI GPIO event handler data
   *

diff --cc drivers/gpio/gpiolib-of.c
index 9b44c49a922783d4f06e09248d8211ff50c61c48,3b18240acb0a70b417dbc5460753c5cd678b64c8..1eea2c6c2e1d827453dd16dc4c7831f5bd7d600c
--- 1/drivers/gpio/gpiolib-of.c
--- 2/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@@ -360,11 -497,13 +487,14 @@@ struct gpio_desc *of_find_gpio(struct d
                        return desc;
        }
  
 -      /* Special handling for regulator GPIOs if used */
 -      if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER)
 +      if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) {
 +              /* Special handling for regulator GPIOs if used */
                desc = of_find_regulator_gpio(dev, con_id, &of_flags);
 +      }
  
+       if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT)
+               desc = of_find_arizona_gpio(dev, con_id, &of_flags);
+ 
        if (IS_ERR(desc))
                return desc;
  

diff --cc drivers/gpio/gpiolib.c
Simple merge