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

Pull GPIO fixes from Linus Walleij:
 "Minor stuff except the IDA leak which was kind of important to fix.
  Also new maintainers, yay.

   - Do not lose an IDA on the gpiochip register errorpath.

   - Fix the PXA non-pincontrol GPIO-using platforms.

   - Fix the direction on the mockup GPIO driver.

   - Add some MAINTAINERS stuff: Bartosz stepped up as GPIO
     co-maintainer, and Andy established an Intel git tree"

* tag 'gpio-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  MAINTAINERS: Do maintain Intel GPIO drivers via separate tree
  gpio: mockup: fix indicated direction
  gpio: pxa: fix legacy non pinctrl aware builds again
  gpio: don't free unallocated ida on gpiochip_add_data_with_key() error path
  MAINTAINERS: add myself as co-maintainer of gpiolib

diff --combined MAINTAINERS
index 053bb175ad9d4b4d0fd5f20753348103f7d53a05,1602421a5fd6f77ad8c8871a856e24e1797ebe13..eac2bf1abec91225ff6d979f9d33bb4f5cea147d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -717,7 -717,7 +717,7 @@@ F: include/linux/mfd/altera-a10sr.
  F:    include/dt-bindings/reset/altr,rst-mgr-a10sr.h
  
  ALTERA TRIPLE SPEED ETHERNET DRIVER
 -M:    Vince Bridgers <[email protected].com>
 +M:    Thor Thayer <[email protected].com>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -3276,12 -3276,6 +3276,12 @@@ F:    include/uapi/linux/caif
  F:    include/net/caif/
  F:    net/caif/
  
 +CAKE QDISC
 +M:    Toke Høiland-Jørgensen <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    net/sched/sch_cake.c
 +
  CALGARY x86-64 IOMMU
  M:    Muli Ben-Yehuda <[email protected]>
  M:    Jon Mason <[email protected]>
@@@ -6305,6 -6299,7 +6305,7 @@@ F:      tools/testing/selftests/gpio
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
+ M:    Bartosz Golaszewski <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
@@@ -6613,9 -6608,9 +6614,9 @@@ F:      arch/*/include/asm/suspend*.
  
  HID CORE LAYER
  M:    Jiri Kosina <[email protected]>
 -R:    Benjamin Tissoires <[email protected]>
 +M:    Benjamin Tissoires <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  S:    Maintained
  F:    drivers/hid/
  F:    include/linux/hid*
@@@ -6867,13 -6862,6 +6868,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/i2c-core-acpi.c
  
 +I2C CONTROLLER DRIVER FOR NVIDIA GPU
 +M:    Ajay Gupta <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/i2c/busses/i2c-nvidia-gpu
 +F:    drivers/i2c/busses/i2c-nvidia-gpu.c
 +
  I2C MUXES
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
@@@ -7442,6 -7430,20 +7443,20 @@@ S:    Maintaine
  F:    Documentation/fb/intelfb.txt
  F:    drivers/video/fbdev/intelfb/
  
+ INTEL GPIO DRIVERS
+ M:    Andy Shevchenko <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
+ F:    drivers/gpio/gpio-ich.c
+ F:    drivers/gpio/gpio-intel-mid.c
+ F:    drivers/gpio/gpio-lynxpoint.c
+ F:    drivers/gpio/gpio-merrifield.c
+ F:    drivers/gpio/gpio-ml-ioh.c
+ F:    drivers/gpio/gpio-pch.c
+ F:    drivers/gpio/gpio-sch.c
+ F:    drivers/gpio/gpio-sodaville.c
+ 
  INTEL GVT-g DRIVERS (Intel GPU Virtualization)
  M:    Zhenyu Wang <[email protected]>
  M:    Zhi Wang <[email protected]>
@@@ -7452,12 -7454,6 +7467,6 @@@ T:     git https://github.com/intel/gvt-lin
  S:    Supported
  F:    drivers/gpu/drm/i915/gvt/
  
- INTEL PMIC GPIO DRIVER
- R:    Andy Shevchenko <[email protected]>
- S:    Maintained
- F:    drivers/gpio/gpio-*cove.c
- F:    drivers/gpio/gpio-msic.c
- 
  INTEL HID EVENT DRIVER
  M:    Alex Hung <[email protected]>
  L:    [email protected]
@@@ -7545,12 -7541,6 +7554,6 @@@ W:     https://01.org/linux-acp
  S:    Supported
  F:    drivers/platform/x86/intel_menlow.c
  
- INTEL MERRIFIELD GPIO DRIVER
- M:    Andy Shevchenko <[email protected]>
- L:    [email protected]
- S:    Maintained
- F:    drivers/gpio/gpio-merrifield.c
- 
  INTEL MIC DRIVERS (mic)
  M:    Sudeep Dutt <[email protected]>
  M:    Ashutosh Dixit <[email protected]>
@@@ -7583,6 -7573,13 +7586,13 @@@ F:    drivers/platform/x86/intel_punit_ipc
  F:    arch/x86/include/asm/intel_pmc_ipc.h
  F:    arch/x86/include/asm/intel_punit_ipc.h
  
+ INTEL PMIC GPIO DRIVERS
+ M:    Andy Shevchenko <[email protected]>
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
+ F:    drivers/gpio/gpio-*cove.c
+ F:    drivers/gpio/gpio-msic.c
+ 
  INTEL MULTIFUNCTION PMIC DEVICE DRIVERS
  R:    Andy Shevchenko <[email protected]>
  S:    Maintained
@@@ -8380,7 -8377,7 +8390,7 @@@ F:      drivers/media/dvb-frontends/lgdt3305
  LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    include/linux/pata_arasan_cf_data.h
  F:    drivers/ata/pata_arasan_cf.c
@@@ -8397,7 -8394,7 +8407,7 @@@ F:      drivers/ata/ata_generic.
  LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    drivers/ata/pata_ftide010.c
  F:    drivers/ata/sata_gemini.c
@@@ -8416,7 -8413,7 +8426,7 @@@ F:      include/linux/ahci_platform.
  LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
  M:    Mikael Pettersson <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    drivers/ata/sata_promise.*
  
@@@ -10797,14 -10794,6 +10807,14 @@@ L: [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod.*
  
 +OMAP I2C DRIVER
 +M:    Vignesh R <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-omap.txt
 +F:    drivers/i2c/busses/i2c-omap.c
 +
  OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -10814,9 -10803,9 +10824,9 @@@ F:   drivers/media/platform/omap3isp
  F:    drivers/staging/media/omap4iss/
  
  OMAP MMC SUPPORT
 -M:    Jarkko Lavinen <[email protected]>
 +M:    Aaro Koskinen <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/mmc/host/omap.c
  
  OMAP POWER MANAGEMENT SUPPORT
@@@ -11751,7 -11740,6 +11761,7 @@@ F:   Documentation/devicetree/bindings/pi
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <[email protected]>
  M:    Andy Shevchenko <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  S:    Maintained
  F:    drivers/pinctrl/intel/
  
@@@ -14085,7 -14073,6 +14095,7 @@@ F:   Documentation/devicetree/bindings/ii
  
  STABLE BRANCH
  M:    Greg Kroah-Hartman <[email protected]>
 +M:    Sasha Levin <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/process/stable-kernel-rules.rst
@@@ -15459,9 -15446,9 +15469,9 @@@ F:   include/linux/usb/gadget
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
  M:    Jiri Kosina <[email protected]>
 -R:    Benjamin Tissoires <[email protected]>
 +M:    Benjamin Tissoires <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  S:    Maintained
  F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/