Merge tag 'gpio-v4.6-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 kernel v4.6.  There is quite a
  lot of interesting stuff going on.

  The patches to other subsystems and arch-wide are ACKed as far as
  possible, though I consider things like per-arch <asm/gpio.h> as
  essentially a part of the GPIO subsystem so it should not be needed.

  Core changes:

   - The gpio_chip is now a *real device*.  Until now the gpio chips
     were just piggybacking the parent device or (gasp) floating in
     space outside of the device model.

     We now finally make GPIO chips devices.  The gpio_chip will create
     a gpio_device which contains a struct device, and this gpio_device
     struct is kept private.  Anything that needs to be kept private
     from the rest of the kernel will gradually be moved over to the
     gpio_device.

   - As a result of making the gpio_device a real device, we have added
     resource management, so devm_gpiochip_add_data() will cut down on
     overhead and reduce code lines.  A huge slew of patches convert
     almost all drivers in the subsystem to use this.

   - Building on making the GPIO a real device, we add the first step of
     a new userspace ABI: the GPIO character device.  We take small
     steps here, so we first add a pure *information* ABI and the tool
     "lsgpio" that will list all GPIO devices on the system and all
     lines on these devices.

     We can now discover GPIOs properly from userspace.  We still have
     not come up with a way to actually *use* GPIOs from userspace.

   - To encourage people to use the character device for the future, we
     have it always-enabled when using GPIO.  The old sysfs ABI is still
     opt-in (and can be used in parallel), but is marked as deprecated.

     We will keep it around for the foreseeable future, but it will not
     be extended to cover ever more use cases.

  Cleanup:

   - Bjorn Helgaas removed a whole slew of per-architecture <asm/gpio.h>
     includes.

     This dates back to when GPIO was an opt-in feature and no shared
     library even existed: just a header file with proper prototypes was
     provided and all semantics were up to the arch to implement.  These
     patches make the GPIO chip even more a proper device and cleans out
     leftovers of the old in-kernel API here and there.

     Still some cruft is left but it's very little now.

   - There is still some clamping of return values for .get() going on,
     but we now return sane values in the vast majority of drivers and
     the errorpath is sanitized.  Some patches for powerpc, blackfin and
     unicore still drop in.

   - We continue to switch the ARM, MIPS, blackfin, m68k local GPIO
     implementations to use gpiochip_add_data() and cut down on code
     lines.

   - MPC8xxx is converted to use the generic GPIO helpers.

   - ATH79 is converted to use the generic GPIO helpers.

  New drivers:

   - WinSystems WS16C48

   - Acces 104-DIO-48E

   - F81866 (a F7188x variant)

   - Qoric (a MPC8xxx variant)

   - TS-4800

   - SPI serializers (pisosr): simple 74xx shift registers connected to
     SPI to obtain a dirt-cheap output-only GPIO expander.

   - Texas Instruments TPIC2810

   - Texas Instruments TPS65218

   - Texas Instruments TPS65912

   - X-Gene (ARM64) standby GPIO controller"

* tag 'gpio-v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (194 commits)
  Revert "Share upstreaming patches"
  gpio: mcp23s08: Fix clearing of interrupt.
  gpiolib: Fix comment referring to gpio_*() in gpiod_*()
  gpio: pca953x: Fix pca953x_gpio_set_multiple() on 64-bit
  gpio: xgene: Fix kconfig for standby GIPO contoller
  gpio: Add generic serializer DT binding
  gpio: uapi: use 0xB4 as ioctl() major
  gpio: tps65912: fix bad merge
  Revert "gpio: lp3943: Drop pin_used and lp3943_gpio_request/lp3943_gpio_free"
  gpio: omap: drop dev field from gpio_bank structure
  gpio: mpc8xxx: Slightly update the code for better readability
  gpio: mpc8xxx: Remove *read_reg and *write_reg from struct mpc8xxx_gpio_chip
  gpio: mpc8xxx: Fixup setting gpio direction output
  gpio: mcp23s08: Add support for mcp23s18
  dt-bindings: gpio: altera: Fix altr,interrupt-type property
  gpio: add driver for MEN 16Z127 GPIO controller
  gpio: lp3943: Drop pin_used and lp3943_gpio_request/lp3943_gpio_free
  gpio: timberdale: Switch to devm_ioremap_resource()
  gpio: ts4800: Add IMX51 dependency
  gpiolib: rewrite gpiodev_add_to_list
  ...

169 files changed, 4405 insertions, 2663 deletions

diff --git a/Documentation/ABI/testing/sysfs-gpio b/Documentation/ABI/obsolete/sysfs-gpio
index 55ffa2df1c10..867c1fab20e2 100644
--- a/Documentation/ABI/testing/sysfs-gpio
+++ b/Documentation/ABI/obsolete/sysfs-gpio
@@ -1,7 +1,7 @@
 What:           /sys/class/gpio/
 Date:           July 2008
 KernelVersion:  2.6.27
-Contact:        David Brownell <dbrownell@users.sourceforge.net>
+Contact:        Linus Walleij <linusw@kernel.org>
 Description:
 
   As a Kconfig option, individual GPIO signals may be accessed from
@@ -26,3 +26,5 @@ Description:
             /label ... (r/o) descriptive, not necessarily unique
             /ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)
 
+  This ABI is deprecated and will be removed after 2020. It is
+  replaced with the GPIO character device.
diff --git a/Documentation/ABI/testing/gpio-cdev b/Documentation/ABI/testing/gpio-cdev
new file mode 100644
index 000000000000..7b265fbb47e3
--- /dev/null
+++ b/Documentation/ABI/testing/gpio-cdev
@@ -0,0 +1,26 @@
+What:           /dev/gpiochip[0-9]+
+Date:           November 2015
+KernelVersion:  4.4
+Contact:        linux-gpio@vger.kernel.org
+Description:
+                The character device files /dev/gpiochip* are the interface
+                between GPIO chips and userspace.
+
+                The ioctl(2)-based ABI is defined and documented in
+                [include/uapi]<linux/gpio.h>.
+
+                The following file operations are supported:
+
+                open(2)
+                Currently the only useful flags are O_RDWR.
+
+                ioctl(2)
+                Initiate various actions.
+                See the inline documentation in [include/uapi]<linux/gpio.h>
+                for descriptions of all ioctls.
+
+                close(2)
+                Stops and free up the I/O contexts that was associated
+                with the file descriptor.
+
+Users:          TBD
diff --git a/Documentation/devicetree/bindings/gpio/gpio-altera.txt b/Documentation/devicetree/bindings/gpio/gpio-altera.txt
index 12f50149e1ed..826a7208ca93 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-altera.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-altera.txt
@@ -12,7 +12,7 @@ Required properties:
 - #interrupt-cells : Should be 1. The interrupt type is fixed in the hardware.
   - The first cell is the GPIO offset number within the GPIO controller.
 - interrupts: Specify the interrupt.
-- altr,interrupt-trigger: Specifies the interrupt trigger type the GPIO
+- altr,interrupt-type: Specifies the interrupt trigger type the GPIO
   hardware is synthesized. This field is required if the Altera GPIO controller
   used has IRQ enabled as the interrupt type is not software controlled,
   but hardware synthesized. Required if GPIO is used as an interrupt
@@ -35,7 +35,7 @@ gpio_altr: gpio@0xff200000 {
         reg = <0xff200000 0x10>;
         interrupts = <0 45 4>;
         altr,ngpio = <32>;
-        altr,interrupt-trigger = <IRQ_TYPE_EDGE_RISING>;
+        altr,interrupt-type = <IRQ_TYPE_EDGE_RISING>;
         #gpio-cells = <2>;
         gpio-controller;
         #interrupt-cells = <1>;
diff --git a/Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt b/Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt
index f3332b9a8ed4..c934106b10aa 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt
@@ -10,6 +10,7 @@ Required properties:
 
     - "microchip,mcp23s08" for  8 GPIO SPI version
     - "microchip,mcp23s17" for 16 GPIO SPI version
+    - "microchip,mcp23s18" for 16 GPIO SPI version
     - "microchip,mcp23008" for  8 GPIO I2C version or
     - "microchip,mcp23017" for 16 GPIO I2C version of the chip
     NOTE: Do not use the old mcp prefix any more. It is deprecated and will be
@@ -43,9 +44,6 @@ Optional properties:
   - first cell is the pin number
   - second cell is used to specify flags.
 - interrupt-controller: Marks the device node as a interrupt controller.
-NOTE: The interrupt functionality is only supported for i2c versions of the
-chips. The spi chips can also do the interrupts, but this is not supported by
-the linux driver yet.
 
 Optional device specific properties:
 - microchip,irq-mirror: Sets the mirror flag in the IOCON register. Devices
diff --git a/Documentation/devicetree/bindings/gpio/gpio-pisosr.txt b/Documentation/devicetree/bindings/gpio/gpio-pisosr.txt
new file mode 100644
index 000000000000..414a01cdf715
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-pisosr.txt
@@ -0,0 +1,34 @@
+Generic Parallel-in/Serial-out Shift Register GPIO Driver
+
+This binding describes generic parallel-in/serial-out shift register
+devices that can be used for GPI (General Purpose Input). This includes
+SN74165 serial-out shift registers and the SN65HVS88x series of
+industrial serializers.
+
+Required properties:
+ - compatible           : Should be "pisosr-gpio".
+ - gpio-controller      : Marks the device node as a GPIO controller.
+ - #gpio-cells          : Should be two. For consumer use see gpio.txt.
+
+Optional properties:
+ - ngpios               : Number of used GPIO lines (0..n-1), default is 8.
+ - load-gpios           : GPIO pin specifier attached to load enable, this
+                          pin is pulsed before reading from the device to
+                          load input pin values into the the device.
+
+For other required and optional properties of SPI slave
+nodes please refer to ../spi/spi-bus.txt.
+
+Example:
+
+        gpio@0 {
+                compatible = "ti,sn65hvs882", "pisosr-gpio";
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                load-gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
+
+                reg = <0>;
+                spi-max-frequency = <1000000>;
+                spi-cpol;
+        };
diff --git a/Documentation/devicetree/bindings/gpio/gpio-ts4800.txt b/Documentation/devicetree/bindings/gpio/gpio-ts4800.txt
new file mode 100644
index 000000000000..92ea9c8f6399
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-ts4800.txt
@@ -0,0 +1,20 @@
+* TS-4800 FPGA's GPIO controller bindings
+
+Required properties:
+- compatible: Must be "technologic,ts4800-gpio".
+- #gpio-cells: Should be two. The first cell is the pin number.
+- reg: Physical base address of the controller and length
+       of memory mapped region.
+
+Optional property:
+- ngpios: See "gpio.txt"
+
+Example:
+
+gpio1: gpio {
+        compatible = "technologic,ts4800-gpio";
+        reg = <0x10020 0x6>;
+        ngpios = <8>;
+        gpio-controller;
+        #gpio-cells = <2>;
+};
diff --git a/Documentation/devicetree/bindings/gpio/gpio-xgene-sb.txt b/Documentation/devicetree/bindings/gpio/gpio-xgene-sb.txt
index dae130060537..5490c1d68981 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-xgene-sb.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-xgene-sb.txt
@@ -1,10 +1,20 @@
 APM X-Gene Standby GPIO controller bindings
 
-This is a gpio controller in the standby domain.
-
-There are 20 GPIO pins from 0..21. There is no GPIO_DS14 or GPIO_DS15,
-only GPIO_DS8..GPIO_DS13 support interrupts. The IRQ mapping
-is currently 1-to-1 on interrupts 0x28 thru 0x2d.
+This is a gpio controller in the standby domain. It also supports interrupt in
+some particular pins which are sourced to its parent interrupt controller
+as diagram below:
+                            +-----------------+
+                            | X-Gene standby  |
+                            | GPIO controller +------ GPIO_0
++------------+              |                 | ...
+| Parent IRQ | EXT_INT_0    |                 +------ GPIO_8/EXT_INT_0
+| controller | (SPI40)      |                 | ...
+| (GICv2)    +--------------+                 +------ GPIO_[N+8]/EXT_INT_N
+|            |   ...        |                 |
+|            | EXT_INT_N    |                 +------ GPIO_[N+9]
+|            | (SPI[40 + N])|                 | ...
+|            +--------------+                 +------ GPIO_MAX
++------------+              +-----------------+
 
 Required properties:
 - compatible: "apm,xgene-gpio-sb" for the X-Gene Standby GPIO controller
@@ -15,10 +25,18 @@ Required properties:
                 0 = active high
                 1 = active low
 - gpio-controller: Marks the device node as a GPIO controller.
-- interrupts: Shall contain exactly 6 interrupts.
+- interrupts: The EXT_INT_0 parent interrupt resource must be listed first.
+- interrupt-parent: Phandle of the parent interrupt controller.
+- interrupt-cells: Should be two.
+       - first cell is 0-N coresponding for EXT_INT_0 to EXT_INT_N.
+       - second cell is used to specify flags.
+- interrupt-controller: Marks the device node as an interrupt controller.
+- apm,nr-gpios: Optional, specify number of gpios pin.
+- apm,nr-irqs: Optional, specify number of interrupt pins.
+- apm,irq-start: Optional, specify lowest gpio pin support interrupt.
 
 Example:
-        sbgpio: sbgpio@17001000 {
+        sbgpio: gpio@17001000{
                 compatible = "apm,xgene-gpio-sb";
                 reg = <0x0 0x17001000 0x0 0x400>;
                 #gpio-cells = <2>;
@@ -29,4 +47,19 @@ Example:
                                 <0x0 0x2b 0x1>,
                                 <0x0 0x2c 0x1>,
                                 <0x0 0x2d 0x1>;
+                interrupt-parent = <&gic>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+                apm,nr-gpios = <22>;
+                apm,nr-irqs = <6>;
+                apm,irq-start = <8>;
+        };
+
+        testuser {
+                compatible = "example,testuser";
+                /* Use the GPIO_13/EXT_INT_5 line as an active high triggered
+                 * level interrupt
+                 */
+                interrupts = <5 4>;
+                interrupt-parent = <&sbgpio>;
         };
diff --git a/Documentation/devicetree/bindings/mfd/tps65912.txt b/Documentation/devicetree/bindings/mfd/tps65912.txt
new file mode 100644
index 000000000000..717e66d23142
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/tps65912.txt
@@ -0,0 +1,50 @@
+* TPS65912 Power Management Integrated Circuit bindings
+
+Required properties:
+ - compatible           : Should be "ti,tps65912".
+ - reg                  : Slave address or chip select number (I2C / SPI).
+ - interrupt-parent     : The parent interrupt controller.
+ - interrupts           : The interrupt line the device is connected to.
+ - interrupt-controller : Marks the device node as an interrupt controller.
+ - #interrupt-cells     : The number of cells to describe an IRQ, should be 2.
+                            The first cell is the IRQ number.
+                            The second cell is the flags, encoded as trigger
+                            masks from ../interrupt-controller/interrupts.txt.
+ - gpio-controller      : Marks the device node as a GPIO Controller.
+ - #gpio-cells          : Should be two.  The first cell is the pin number and
+                            the second cell is used to specify flags.
+                            See ../gpio/gpio.txt for more information.
+ - regulators:          : List of child nodes that specify the regulator
+                            initialization data. Child nodes must be named
+                            after their hardware counterparts: dcdc[1-4] and
+                            ldo[1-10]. Each child nodes is defined using the
+                            standard binding for regulators.
+
+Example:
+
+        pmic: tps65912@2d {
+                compatible = "ti,tps65912";
+                reg = <0x2d>;
+                interrupt-parent = <&gpio1>;
+                interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                regulators {
+                        dcdc1 {
+                                regulator-name = "vdd_core";
+                                regulator-min-microvolt = <912000>;
+                                regulator-max-microvolt = <1144000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        ldo1 {
+                                regulator-name = "ldo1";
+                                regulator-min-microvolt = <1900000>;
+                                regulator-max-microvolt = <1900000>;
+                        };
+                };
+        };
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt
index 831a5363f6be..73b98dfbcea4 100644
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@ -252,6 +252,11 @@ GPIO
   devm_gpiod_get_index_optional()
   devm_gpiod_get_optional()
   devm_gpiod_put()
+  devm_gpiochip_add_data()
+  devm_gpiochip_remove()
+  devm_gpio_request()
+  devm_gpio_request_one()
+  devm_gpio_free()
 
 IIO
   devm_iio_device_alloc()
diff --git a/Documentation/gpio/board.txt b/Documentation/gpio/board.txt
index 3092178628c4..86d3fa95fd12 100644
--- a/Documentation/gpio/board.txt
+++ b/Documentation/gpio/board.txt
@@ -111,16 +111,13 @@ files that desire to do so need to include the following header:
 GPIOs are mapped by the means of tables of lookups, containing instances of the
 gpiod_lookup structure. Two macros are defined to help declaring such mappings:
 
-        GPIO_LOOKUP(chip_label, chip_hwnum, dev_id, con_id, flags)
-        GPIO_LOOKUP_IDX(chip_label, chip_hwnum, dev_id, con_id, idx, flags)
+        GPIO_LOOKUP(chip_label, chip_hwnum, con_id, flags)
+        GPIO_LOOKUP_IDX(chip_label, chip_hwnum, con_id, idx, flags)
 
 where
 
   - chip_label is the label of the gpiod_chip instance providing the GPIO
   - chip_hwnum is the hardware number of the GPIO within the chip
-  - dev_id is the identifier of the device that will make use of this GPIO. It
-        can be NULL, in which case it will be matched for calls to gpiod_get()
-        with a NULL device.
   - con_id is the name of the GPIO function from the device point of view. It
         can be NULL, in which case it will match any function.
   - idx is the index of the GPIO within the function.
@@ -134,7 +131,9 @@ In the future, these flags might be extended to support more properties.
 Note that GPIO_LOOKUP() is just a shortcut to GPIO_LOOKUP_IDX() where idx = 0.
 
 A lookup table can then be defined as follows, with an empty entry defining its
-end:
+end. The 'dev_id' field of the table is the identifier of the device that will
+make use of these GPIOs. It can be NULL, in which case it will be matched for
+calls to gpiod_get() with a NULL device.
 
 struct gpiod_lookup_table gpios_table = {
         .dev_id = "foo.0",
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 91261a32a573..9369d3b0f09a 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -319,6 +319,7 @@ Code  Seq#(hex)	Include File		Comments
                                         <mailto:vgo@ratio.de>
 0xB1    00-1F   PPPoX                   <mailto:mostrows@styx.uwaterloo.ca>
 0xB3    00      linux/mmc/ioctl.h
+0xB4    00-0F   linux/gpio.h            <mailto:linux-gpio@vger.kernel.org>
 0xC0    00-0F   linux/usb/iowarrior.h
 0xCA    00-0F   uapi/misc/cxl.h
 0xCA    80-8F   uapi/scsi/cxlflash_ioctl.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 89e999128129..e32f4847e251 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -238,6 +238,12 @@ L:	lm-sensors@lm-sensors.org
 S:      Maintained
 F:      drivers/hwmon/abituguru3.c
 
+ACCES 104-DIO-48E GPIO DRIVER
+M:      William Breathitt Gray <vilhelm.gray@gmail.com>
+L:      linux-gpio@vger.kernel.org
+S:      Maintained
+F:      drivers/gpio/gpio-104-dio-48e.c
+
 ACCES 104-IDI-48 GPIO DRIVER
 M:      "William Breathitt Gray" <vilhelm.gray@gmail.com>
 L:      linux-gpio@vger.kernel.org
@@ -4827,10 +4833,14 @@ L:	linux-gpio@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 S:      Maintained
 F:      Documentation/gpio/
+F:      Documentation/ABI/testing/gpio-cdev
+F:      Documentation/ABI/obsolete/sysfs-gpio
 F:      drivers/gpio/
 F:      include/linux/gpio/
 F:      include/linux/gpio.h
 F:      include/asm-generic/gpio.h
+F:      include/uapi/linux/gpio.h
+F:      tools/gpio/
 
 GRE DEMULTIPLEXER DRIVER
 M:      Dmitry Kozlov <xeb@mail.ru>
@@ -11931,6 +11941,12 @@ M:	David Härdeman <david@hardeman.nu>
 S:      Maintained
 F:      drivers/media/rc/winbond-cir.c
 
+WINSYSTEMS WS16C48 GPIO DRIVER
+M:      William Breathitt Gray <vilhelm.gray@gmail.com>
+L:      linux-gpio@vger.kernel.org
+S:      Maintained
+F:      drivers/gpio/gpio-ws16c48.c
+
 WIMAX STACK
 M:      Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:      linux-wimax@intel.com
diff --git a/arch/alpha/include/asm/gpio.h b/arch/alpha/include/asm/gpio.h
deleted file mode 100644
index b3799d88ffcf..000000000000
--- a/arch/alpha/include/asm/gpio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __LINUX_GPIO_H
-#warning Include linux/gpio.h instead of asm/gpio.h
-#include <linux/gpio.h>
-#endif
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index e0df333202b8..9ba45ade5f48 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -69,7 +69,7 @@ static void __scoop_gpio_set(struct scoop_dev *sdev,
 
 static void scoop_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
-        struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio);
+        struct scoop_dev *sdev = gpiochip_get_data(chip);
         unsigned long flags;
 
         spin_lock_irqsave(&sdev->scoop_lock, flags);
@@ -81,7 +81,7 @@ static void scoop_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 
 static int scoop_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
-        struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio);
+        struct scoop_dev *sdev = gpiochip_get_data(chip);
 
         /* XXX: I'm unsure, but it seems so */
         return !!(ioread16(sdev->base + SCOOP_GPRR) & (1 << (offset + 1)));
@@ -90,7 +90,7 @@ static int scoop_gpio_get(struct gpio_chip *chip, unsigned offset)
 static int scoop_gpio_direction_input(struct gpio_chip *chip,
                         unsigned offset)
 {
-        struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio);
+        struct scoop_dev *sdev = gpiochip_get_data(chip);
         unsigned long flags;
         unsigned short gpcr;
 
@@ -108,7 +108,7 @@ static int scoop_gpio_direction_input(struct gpio_chip *chip,
 static int scoop_gpio_direction_output(struct gpio_chip *chip,
                         unsigned offset, int value)
 {
-        struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio);
+        struct scoop_dev *sdev = gpiochip_get_data(chip);
         unsigned long flags;
         unsigned short gpcr;
 
@@ -224,7 +224,7 @@ static int scoop_probe(struct platform_device *pdev)
                 devptr->gpio.direction_input = scoop_gpio_direction_input;
                 devptr->gpio.direction_output = scoop_gpio_direction_output;
 
-                ret = gpiochip_add(&devptr->gpio);
+                ret = gpiochip_add_data(&devptr->gpio, devptr);
                 if (ret)
                         goto err_gpio;
         }
diff --git a/arch/arm/mach-gemini/gpio.c b/arch/arm/mach-gemini/gpio.c
index 2478d9f4d92d..469a76ea0459 100644
--- a/arch/arm/mach-gemini/gpio.c
+++ b/arch/arm/mach-gemini/gpio.c
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/irq.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>
@@ -227,5 +227,5 @@ void __init gemini_gpio_init(void)
                                                  (void *)i);
         }
 
-        BUG_ON(gpiochip_add(&gemini_gpio_chip));
+        BUG_ON(gpiochip_add_data(&gemini_gpio_chip, NULL));
 }
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c
index eb1c3477c48a..f510c43981d3 100644
--- a/arch/arm/mach-imx/mach-mx27ads.c
+++ b/arch/arm/mach-imx/mach-mx27ads.c
@@ -13,6 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+#include <linux/gpio/driver.h>
+/* Needed for gpio_to_irq() */
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
@@ -243,7 +245,7 @@ static void __init mx27ads_regulator_init(void)
         vchip->ngpio            = 1;
         vchip->direction_output = vgpio_dir_out;
         vchip->set              = vgpio_set;
-        gpiochip_add(vchip);
+        gpiochip_add_data(vchip, NULL);
 
         platform_device_register_data(NULL, "reg-fixed-voltage",
                                       PLATFORM_DEVID_AUTO,
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 1cb6f2f02880..26874f608ca9 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -27,7 +27,7 @@
 #include <linux/clockchips.h>
 #include <linux/io.h>
 #include <linux/export.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/cpu.h>
 #include <linux/pci.h>
 #include <linux/sched_clock.h>
@@ -461,7 +461,7 @@ void __init ixp4xx_sys_init(void)
 
         platform_add_devices(ixp4xx_devices, ARRAY_SIZE(ixp4xx_devices));
 
-        gpiochip_add(&ixp4xx_gpio_chip);
+        gpiochip_add_data(&ixp4xx_gpio_chip, NULL);
 
         if (cpu_is_ixp46x()) {
                 int region;
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
index 9f54300df4b3..7ed78619217c 100644
--- a/arch/arm/mach-s3c24xx/mach-h1940.c
+++ b/arch/arm/mach-s3c24xx/mach-h1940.c
@@ -664,7 +664,7 @@ static void __init h1940_map_io(void)
 
         /* Add latch gpio chip, set latch initial value */
         h1940_latch_control(0, 0);
-        WARN_ON(gpiochip_add(&h1940_latch_gpiochip));
+        WARN_ON(gpiochip_add_data(&h1940_latch_gpiochip, NULL));
 }
 
 static void __init h1940_init_time(void)
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index d8965c682d2f..bb3ca9c763de 100644
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -15,7 +15,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 
 #include <mach/hardware.h>
 #include <asm/setup.h>
@@ -369,7 +369,7 @@ static int __init simpad_init(void)
         cs3_gpio.get = cs3_gpio_get;
         cs3_gpio.direction_input = cs3_gpio_direction_input;
         cs3_gpio.direction_output = cs3_gpio_direction_output;
-        ret = gpiochip_add(&cs3_gpio);
+        ret = gpiochip_add_data(&cs3_gpio, NULL);
         if (ret)
                 printk(KERN_WARNING "simpad: Unable to register cs3 GPIO device");
 
diff --git a/arch/arm/mach-w90x900/gpio.c b/arch/arm/mach-w90x900/gpio.c
index ba05aec7ea4b..55d1a00dbd28 100644
--- a/arch/arm/mach-w90x900/gpio.c
+++ b/arch/arm/mach-w90x900/gpio.c
@@ -20,7 +20,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/io.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 
 #include <mach/hardware.h>
 
@@ -30,7 +30,6 @@
 #define GPIO_IN                 (0x0C)
 #define GROUPINERV              (0x10)
 #define GPIO_GPIO(Nb)           (0x00000001 << (Nb))
-#define to_nuc900_gpio_chip(c) container_of(c, struct nuc900_gpio_chip, chip)
 
 #define NUC900_GPIO_CHIP(name, base_gpio, nr_gpio)                      \
         {                                                               \
@@ -53,7 +52,7 @@ struct nuc900_gpio_chip {
 
 static int nuc900_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
-        struct nuc900_gpio_chip *nuc900_gpio = to_nuc900_gpio_chip(chip);
+        struct nuc900_gpio_chip *nuc900_gpio = gpiochip_get_data(chip);
         void __iomem *pio = nuc900_gpio->regbase + GPIO_IN;
         unsigned int regval;
 
@@ -65,7 +64,7 @@ static int nuc900_gpio_get(struct gpio_chip *chip, unsigned offset)
 
 static void nuc900_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
 {
-        struct nuc900_gpio_chip *nuc900_gpio = to_nuc900_gpio_chip(chip);
+        struct nuc900_gpio_chip *nuc900_gpio = gpiochip_get_data(chip);
         void __iomem *pio = nuc900_gpio->regbase + GPIO_OUT;
         unsigned int regval;
         unsigned long flags;
@@ -86,7 +85,7 @@ static void nuc900_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
 
 static int nuc900_dir_input(struct gpio_chip *chip, unsigned offset)
 {
-        struct nuc900_gpio_chip *nuc900_gpio = to_nuc900_gpio_chip(chip);
+        struct nuc900_gpio_chip *nuc900_gpio = gpiochip_get_data(chip);
         void __iomem *pio = nuc900_gpio->regbase + GPIO_DIR;
         unsigned int regval;
         unsigned long flags;
@@ -104,7 +103,7 @@ static int nuc900_dir_input(struct gpio_chip *chip, unsigned offset)
 
 static int nuc900_dir_output(struct gpio_chip *chip, unsigned offset, int val)
 {
-        struct nuc900_gpio_chip *nuc900_gpio = to_nuc900_gpio_chip(chip);
+        struct nuc900_gpio_chip *nuc900_gpio = gpiochip_get_data(chip);
         void __iomem *outreg = nuc900_gpio->regbase + GPIO_OUT;
         void __iomem *pio = nuc900_gpio->regbase + GPIO_DIR;
         unsigned int regval;
@@ -149,6 +148,6 @@ void __init nuc900_init_gpio(int nr_group)
                 gpio_chip = &nuc900_gpio[i];
                 spin_lock_init(&gpio_chip->gpio_lock);
                 gpio_chip->regbase = GPIO_BASE + i * GROUPINERV;
-                gpiochip_add(&gpio_chip->chip);
+                gpiochip_add_data(&gpio_chip->chip, gpio_chip);
         }
 }
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index 7bd22d8e5b11..f74069386c13 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -154,8 +154,7 @@ err_out:
  */
 static int orion_gpio_request(struct gpio_chip *chip, unsigned pin)
 {
-        struct orion_gpio_chip *ochip =
-                container_of(chip, struct orion_gpio_chip, chip);
+        struct orion_gpio_chip *ochip = gpiochip_get_data(chip);
 
         if (orion_gpio_is_valid(ochip, pin, GPIO_INPUT_OK) ||
             orion_gpio_is_valid(ochip, pin, GPIO_OUTPUT_OK))
@@ -166,8 +165,7 @@ static int orion_gpio_request(struct gpio_chip *chip, unsigned pin)
 
 static int orion_gpio_direction_input(struct gpio_chip *chip, unsigned pin)
 {
-        struct orion_gpio_chip *ochip =
-                container_of(chip, struct orion_gpio_chip, chip);
+        struct orion_gpio_chip *ochip = gpiochip_get_data(chip);
         unsigned long flags;
 
         if (!orion_gpio_is_valid(ochip, pin, GPIO_INPUT_OK))
@@ -182,8 +180,7 @@ static int orion_gpio_direction_input(struct gpio_chip *chip, unsigned pin)
 
 static int orion_gpio_get(struct gpio_chip *chip, unsigned pin)
 {
-        struct orion_gpio_chip *ochip =
-                container_of(chip, struct orion_gpio_chip, chip);
+        struct orion_gpio_chip *ochip = gpiochip_get_data(chip);
         int val;
 
         if (readl(GPIO_IO_CONF(ochip)) & (1 << pin)) {
@@ -198,8 +195,7 @@ static int orion_gpio_get(struct gpio_chip *chip, unsigned pin)
 static int
 orion_gpio_direction_output(struct gpio_chip *chip, unsigned pin, int value)
 {
-        struct orion_gpio_chip *ochip =
-                container_of(chip, struct orion_gpio_chip, chip);
+        struct orion_gpio_chip *ochip = gpiochip_get_data(chip);
         unsigned long flags;
 
         if (!orion_gpio_is_valid(ochip, pin, GPIO_OUTPUT_OK))
@@ -216,8 +212,7 @@ orion_gpio_direction_output(struct gpio_chip *chip, unsigned pin, int value)
 
 static void orion_gpio_set(struct gpio_chip *chip, unsigned pin, int value)
 {
-        struct orion_gpio_chip *ochip =
-                container_of(chip, struct orion_gpio_chip, chip);
+        struct orion_gpio_chip *ochip = gpiochip_get_data(chip);
         unsigned long flags;
 
         spin_lock_irqsave(&ochip->lock, flags);
@@ -227,8 +222,7 @@ static void orion_gpio_set(struct gpio_chip *chip, unsigned pin, int value)
 
 static int orion_gpio_to_irq(struct gpio_chip *chip, unsigned pin)
 {
-        struct orion_gpio_chip *ochip =
-                container_of(chip, struct orion_gpio_chip, chip);
+        struct orion_gpio_chip *ochip = gpiochip_get_data(chip);
 
         return irq_create_mapping(ochip->domain,
                                   ochip->secondary_irq_base + pin);
@@ -445,8 +439,8 @@ static void gpio_irq_handler(struct irq_desc *desc)
 
 static void orion_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
 {
-        struct orion_gpio_chip *ochip =
-                container_of(chip, struct orion_gpio_chip, chip);
+
+        struct orion_gpio_chip *ochip = gpiochip_get_data(chip);
         u32 out, io_conf, blink, in_pol, data_in, cause, edg_msk, lvl_msk;
         int i;
 
@@ -567,7 +561,7 @@ void __init orion_gpio_init(struct device_node *np,
         ochip->mask_offset = mask_offset;
         ochip->secondary_irq_base = secondary_irq_base;
 
-        gpiochip_add(&ochip->chip);
+        gpiochip_add_data(&ochip->chip, ochip);
 
         /*
          * Mask and clear GPIO interrupts.
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index 83d896cc2aed..718a6d7eb808 100644
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -27,7 +27,6 @@
 
 #include <asm/io.h>
 #include <asm/setup.h>
-#include <asm/gpio.h>
 
 #include <mach/at32ap700x.h>
 #include <mach/board.h>
diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index 5020057ac7a2..83c2a0021b56 100644
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -14,8 +14,8 @@
 #include <linux/fs.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
+#include <linux/gpio.h>
 
-#include <asm/gpio.h>
 #include <asm/io.h>
 
 #include <mach/portmux.h>
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index a017359c1826..c5d31287de01 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -11,6 +11,8 @@
 #include <linux/err.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/gpio/driver.h>
+/* FIXME: consumer API required for gpio_set_value() etc, get rid of this */
 #include <linux/gpio.h>
 #include <linux/irq.h>
 
@@ -1159,7 +1161,7 @@ static int bfin_gpiolib_direction_output(struct gpio_chip *chip, unsigned gpio,
 
 static int bfin_gpiolib_get_value(struct gpio_chip *chip, unsigned gpio)
 {
-        return bfin_gpio_get_value(gpio);
+        return !!bfin_gpio_get_value(gpio);
 }
 
 static void bfin_gpiolib_set_value(struct gpio_chip *chip, unsigned gpio, int value)
@@ -1197,7 +1199,7 @@ static struct gpio_chip bfin_chip = {
 
 static int __init bfin_gpiolib_setup(void)
 {
-        return gpiochip_add(&bfin_chip);
+        return gpiochip_add_data(&bfin_chip, NULL);
 }
 arch_initcall(bfin_gpiolib_setup);
 #endif
diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c
index 86b1cd3a0309..e272bca93c64 100644
--- a/arch/blackfin/kernel/debug-mmrs.c
+++ b/arch/blackfin/kernel/debug-mmrs.c
@@ -11,9 +11,9 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/i2c/bfin_twi.h>
+#include <linux/gpio.h>
 
 #include <asm/blackfin.h>
-#include <asm/gpio.h>
 #include <asm/gptimers.h>
 #include <asm/bfin_can.h>
 #include <asm/bfin_dma.h>
diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c b/arch/blackfin/mach-bf538/boards/ezkit.c
index ae2fcbb00119..c423af36fa91 100644
--- a/arch/blackfin/mach-bf538/boards/ezkit.c
+++ b/arch/blackfin/mach-bf538/boards/ezkit.c
@@ -15,9 +15,9 @@
 #include <linux/spi/flash.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/gpio.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/dma.h>
-#include <asm/gpio.h>
 #include <asm/nand.h>
 #include <asm/portmux.h>
 #include <asm/dpmc.h>
diff --git a/arch/blackfin/mach-bf538/ext-gpio.c b/arch/blackfin/mach-bf538/ext-gpio.c
index 471a9b184d5b..48c100228f2d 100644
--- a/arch/blackfin/mach-bf538/ext-gpio.c
+++ b/arch/blackfin/mach-bf538/ext-gpio.c
@@ -8,8 +8,8 @@
 
 #include <linux/module.h>
 #include <linux/err.h>
+#include <linux/gpio.h>
 #include <asm/blackfin.h>
-#include <asm/gpio.h>
 #include <asm/portmux.h>
 
 #define DEFINE_REG(reg, off) \
@@ -116,9 +116,9 @@ static struct gpio_chip bf538_porte_chip = {
 
 static int __init bf538_extgpio_setup(void)
 {
-        return gpiochip_add(&bf538_portc_chip) |
-                gpiochip_add(&bf538_portd_chip) |
-                gpiochip_add(&bf538_porte_chip);
+        return gpiochip_add_data(&bf538_portc_chip, NULL) |
+                gpiochip_add_data(&bf538_portd_chip, NULL) |
+                gpiochip_add_data(&bf538_porte_chip, NULL);
 }
 arch_initcall(bf538_extgpio_setup);
 
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c
index 6d5ffdead067..120c9941c242 100644
--- a/arch/blackfin/mach-bf548/boards/cm_bf548.c
+++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c
@@ -17,9 +17,9 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/usb/musb.h>
+#include <linux/gpio.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/dma.h>
-#include <asm/gpio.h>
 #include <asm/nand.h>
 #include <asm/portmux.h>
 #include <asm/bfin_sdh.h>
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 4204b9842532..3cdd4835a9f7 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -20,9 +20,9 @@
 #include <linux/pinctrl/machine.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/platform_data/pinctrl-adi2.h>
+#include <linux/gpio.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/dma.h>
-#include <asm/gpio.h>
 #include <asm/nand.h>
 #include <asm/dpmc.h>
 #include <asm/bfin_sport.h>
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index c7928d8ebb82..aad5d7416886 100644
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -21,8 +21,8 @@
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/platform_data/pinctrl-adi2.h>
 #include <linux/spi/adi_spi3.h>
+#include <linux/gpio.h>
 #include <asm/dma.h>
-#include <asm/gpio.h>
 #include <asm/nand.h>
 #include <asm/dpmc.h>
 #include <asm/portmux.h>
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index e8d4d748d0fd..4986b4fbcee9 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -17,13 +17,13 @@
 #include <linux/irq.h>
 #include <linux/sched.h>
 #include <linux/syscore_ops.h>
+#include <linux/gpio.h>
 #include <asm/delay.h>
 #ifdef CONFIG_IPIPE
 #include <linux/ipipe.h>
 #endif
 #include <asm/traps.h>
 #include <asm/blackfin.h>
-#include <asm/gpio.h>
 #include <asm/irq_handler.h>
 #include <asm/dpmc.h>
 #include <asm/traps.h>
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index a66d979ec651..5ece38a5b758 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -15,9 +15,9 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/delay.h>
+#include <linux/gpio.h>
 
 #include <asm/cplb.h>
-#include <asm/gpio.h>
 #include <asm/dma.h>
 #include <asm/dpmc.h>
 #include <asm/pm.h>
diff --git a/arch/ia64/include/asm/gpio.h b/arch/ia64/include/asm/gpio.h
deleted file mode 100644
index b3799d88ffcf..000000000000
--- a/arch/ia64/include/asm/gpio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __LINUX_GPIO_H
-#warning Include linux/gpio.h instead of asm/gpio.h
-#include <linux/gpio.h>
-#endif
diff --git a/arch/m68k/coldfire/gpio.c b/arch/m68k/coldfire/gpio.c
index 37a83e27c7a6..8832083e1cb8 100644
--- a/arch/m68k/coldfire/gpio.c
+++ b/arch/m68k/coldfire/gpio.c
@@ -178,7 +178,7 @@ static struct gpio_chip mcfgpio_chip = {
 
 static int __init mcfgpio_sysinit(void)
 {
-        gpiochip_add(&mcfgpio_chip);
+        gpiochip_add_data(&mcfgpio_chip, NULL);
         return subsys_system_register(&mcfgpio_subsys, NULL);
 }
 
diff --git a/arch/metag/include/asm/gpio.h b/arch/metag/include/asm/gpio.h
deleted file mode 100644
index b3799d88ffcf..000000000000
--- a/arch/metag/include/asm/gpio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __LINUX_GPIO_H
-#warning Include linux/gpio.h instead of asm/gpio.h
-#include <linux/gpio.h>
-#endif
diff --git a/arch/microblaze/include/asm/gpio.h b/arch/microblaze/include/asm/gpio.h
deleted file mode 100644
index b3799d88ffcf..000000000000
--- a/arch/microblaze/include/asm/gpio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __LINUX_GPIO_H
-#warning Include linux/gpio.h instead of asm/gpio.h
-#include <linux/gpio.h>
-#endif
diff --git a/arch/mips/alchemy/common/gpiolib.c b/arch/mips/alchemy/common/gpiolib.c
index 84548f704035..e6b90e72c23f 100644
--- a/arch/mips/alchemy/common/gpiolib.c
+++ b/arch/mips/alchemy/common/gpiolib.c
@@ -160,14 +160,14 @@ static int __init alchemy_gpiochip_init(void)
 
         switch (alchemy_get_cputype()) {
         case ALCHEMY_CPU_AU1000:
-                ret = gpiochip_add(&alchemy_gpio_chip[0]);
+                ret = gpiochip_add_data(&alchemy_gpio_chip[0], NULL);
                 break;
         case ALCHEMY_CPU_AU1500...ALCHEMY_CPU_AU1200:
-                ret = gpiochip_add(&alchemy_gpio_chip[0]);
-                ret |= gpiochip_add(&alchemy_gpio_chip[1]);
+                ret = gpiochip_add_data(&alchemy_gpio_chip[0], NULL);
+                ret |= gpiochip_add_data(&alchemy_gpio_chip[1], NULL);
                 break;
         case ALCHEMY_CPU_AU1300:
-                ret = gpiochip_add(&au1300_gpiochip);
+                ret = gpiochip_add_data(&au1300_gpiochip, NULL);
                 break;
         }
         return ret;
diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c
index f969f583c68c..ed5b3d297caf 100644
--- a/arch/mips/ar7/gpio.c
+++ b/arch/mips/ar7/gpio.c
@@ -33,8 +33,7 @@ struct ar7_gpio_chip {
 
 static int ar7_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
 {
-        struct ar7_gpio_chip *gpch =
-                                container_of(chip, struct ar7_gpio_chip, chip);
+        struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);
         void __iomem *gpio_in = gpch->regs + AR7_GPIO_INPUT;
 
         return !!(readl(gpio_in) & (1 << gpio));
@@ -42,8 +41,7 @@ static int ar7_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
 
 static int titan_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
 {
-        struct ar7_gpio_chip *gpch =
-                                container_of(chip, struct ar7_gpio_chip, chip);
+        struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);
         void __iomem *gpio_in0 = gpch->regs + TITAN_GPIO_INPUT_0;
         void __iomem *gpio_in1 = gpch->regs + TITAN_GPIO_INPUT_1;
 
@@ -53,8 +51,7 @@ static int titan_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
 static void ar7_gpio_set_value(struct gpio_chip *chip,
                                 unsigned gpio, int value)
 {
-        struct ar7_gpio_chip *gpch =
-                                container_of(chip, struct ar7_gpio_chip, chip);
+        struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);
         void __iomem *gpio_out = gpch->regs + AR7_GPIO_OUTPUT;
         unsigned tmp;
 
@@ -67,8 +64,7 @@ static void ar7_gpio_set_value(struct gpio_chip *chip,
 static void titan_gpio_set_value(struct gpio_chip *chip,
                                 unsigned gpio, int value)
 {
-        struct ar7_gpio_chip *gpch =
-                                container_of(chip, struct ar7_gpio_chip, chip);
+        struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);
         void __iomem *gpio_out0 = gpch->regs + TITAN_GPIO_OUTPUT_0;
         void __iomem *gpio_out1 = gpch->regs + TITAN_GPIO_OUTPUT_1;
         unsigned tmp;
@@ -81,8 +77,7 @@ static void titan_gpio_set_value(struct gpio_chip *chip,
 
 static int ar7_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 {
-        struct ar7_gpio_chip *gpch =
-                                container_of(chip, struct ar7_gpio_chip, chip);
+        struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);
         void __iomem *gpio_dir = gpch->regs + AR7_GPIO_DIR;
 
         writel(readl(gpio_dir) | (1 << gpio), gpio_dir);
@@ -92,8 +87,7 @@ static int ar7_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 
 static int titan_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 {
-        struct ar7_gpio_chip *gpch =
-                                container_of(chip, struct ar7_gpio_chip, chip);
+        struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);
         void __iomem *gpio_dir0 = gpch->regs + TITAN_GPIO_DIR_0;
         void __iomem *gpio_dir1 = gpch->regs + TITAN_GPIO_DIR_1;
 
@@ -108,8 +102,7 @@ static int titan_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 static int ar7_gpio_direction_output(struct gpio_chip *chip,
                                         unsigned gpio, int value)
 {
-        struct ar7_gpio_chip *gpch =
-                                container_of(chip, struct ar7_gpio_chip, chip);
+        struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);
         void __iomem *gpio_dir = gpch->regs + AR7_GPIO_DIR;
 
         ar7_gpio_set_value(chip, gpio, value);
@@ -121,8 +114,7 @@ static int ar7_gpio_direction_output(struct gpio_chip *chip,
 static int titan_gpio_direction_output(struct gpio_chip *chip,
                                         unsigned gpio, int value)
 {
-        struct ar7_gpio_chip *gpch =
-                                container_of(chip, struct ar7_gpio_chip, chip);
+        struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);
         void __iomem *gpio_dir0 = gpch->regs + TITAN_GPIO_DIR_0;
         void __iomem *gpio_dir1 = gpch->regs + TITAN_GPIO_DIR_1;
 
@@ -335,7 +327,7 @@ int __init ar7_gpio_init(void)
                 return -ENOMEM;
         }
 
-        ret = gpiochip_add(&gpch->chip);
+        ret = gpiochip_add_data(&gpch->chip, gpch);
         if (ret) {
                 printk(KERN_ERR "%s: failed to add gpiochip\n",
                                         gpch->chip.label);
diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
index 468bc7b99cd3..7c256dadb166 100644
--- a/arch/mips/bcm63xx/gpio.c
+++ b/arch/mips/bcm63xx/gpio.c
@@ -11,7 +11,7 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 
 #include <bcm63xx_cpu.h>
 #include <bcm63xx_gpio.h>
@@ -147,5 +147,5 @@ int __init bcm63xx_gpio_init(void)
         bcm63xx_gpio_chip.ngpio = bcm63xx_gpio_count();
         pr_info("registering %d GPIOs\n", bcm63xx_gpio_chip.ngpio);
 
-        return gpiochip_add(&bcm63xx_gpio_chip);
+        return gpiochip_add_data(&bcm63xx_gpio_chip, NULL);
 }
diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c
index d9907e57e9b9..b765773ab8aa 100644
--- a/arch/mips/jz4740/gpio.c
+++ b/arch/mips/jz4740/gpio.c
@@ -18,6 +18,8 @@
 #include <linux/init.h>
 
 #include <linux/io.h>
+#include <linux/gpio/driver.h>
+/* FIXME: needed for gpio_request(), try to remove consumer API from driver */
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -91,9 +93,9 @@ static inline struct jz_gpio_chip *gpio_to_jz_gpio_chip(unsigned int gpio)
         return &jz4740_gpio_chips[gpio >> 5];
 }
 
-static inline struct jz_gpio_chip *gpio_chip_to_jz_gpio_chip(struct gpio_chip *gpio_chip)
+static inline struct jz_gpio_chip *gpio_chip_to_jz_gpio_chip(struct gpio_chip *gc)
 {
-        return container_of(gpio_chip, struct jz_gpio_chip, gpio_chip);
+        return gpiochip_get_data(gc);
 }
 
 static inline struct jz_gpio_chip *irq_to_jz_gpio_chip(struct irq_data *data)
@@ -234,7 +236,7 @@ static int jz_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 
 static int jz_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
 {
-        struct jz_gpio_chip *jz_gpio = gpio_chip_to_jz_gpio_chip(chip);
+        struct jz_gpio_chip *jz_gpio = gpiochip_get_data(chip);
 
         return jz_gpio->irq_base + gpio;
 }
@@ -449,7 +451,7 @@ static void jz4740_gpio_chip_init(struct jz_gpio_chip *chip, unsigned int id)
         irq_setup_generic_chip(gc, IRQ_MSK(chip->gpio_chip.ngpio),
                 IRQ_GC_INIT_NESTED_LOCK, 0, IRQ_NOPROBE | IRQ_LEVEL);
 
-        gpiochip_add(&chip->gpio_chip);
+        gpiochip_add_data(&chip->gpio_chip, chip);
 }
 
 static int __init jz4740_gpio_init(void)
diff --git a/arch/mips/kernel/gpio_txx9.c b/arch/mips/kernel/gpio_txx9.c
index 705be43c3533..cbd47f38073b 100644
--- a/arch/mips/kernel/gpio_txx9.c
+++ b/arch/mips/kernel/gpio_txx9.c
@@ -10,7 +10,7 @@
 
 #include <linux/init.h>
 #include <linux/spinlock.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <asm/txx9pio.h>
@@ -85,5 +85,5 @@ int __init txx9_gpio_init(unsigned long baseaddr,
                 return -ENODEV;
         txx9_gpio_chip.base = base;
         txx9_gpio_chip.ngpio = num;
-        return gpiochip_add(&txx9_gpio_chip);
+        return gpiochip_add_data(&txx9_gpio_chip, NULL);
 }
diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c
index fd1108543a71..fdc704abc8d4 100644
--- a/arch/mips/rb532/gpio.c
+++ b/arch/mips/rb532/gpio.c
@@ -32,7 +32,7 @@
 #include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 
 #include <asm/mach-rc32434/rb.h>
 #include <asm/mach-rc32434/gpio.h>
@@ -88,7 +88,7 @@ static int rb532_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
         struct rb532_gpio_chip  *gpch;
 
-        gpch = container_of(chip, struct rb532_gpio_chip, chip);
+        gpch = gpiochip_get_data(chip);
         return !!rb532_get_bit(offset, gpch->regbase + GPIOD);
 }
 
@@ -100,7 +100,7 @@ static void rb532_gpio_set(struct gpio_chip *chip,
 {
         struct rb532_gpio_chip  *gpch;
 
-        gpch = container_of(chip, struct rb532_gpio_chip, chip);
+        gpch = gpiochip_get_data(chip);
         rb532_set_bit(value, offset, gpch->regbase + GPIOD);
 }
 
@@ -111,7 +111,7 @@ static int rb532_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
 {
         struct rb532_gpio_chip  *gpch;
 
-        gpch = container_of(chip, struct rb532_gpio_chip, chip);
+        gpch = gpiochip_get_data(chip);
 
         /* disable alternate function in case it's set */
         rb532_set_bit(0, offset, gpch->regbase + GPIOFUNC);
@@ -128,7 +128,7 @@ static int rb532_gpio_direction_output(struct gpio_chip *chip,
 {
         struct rb532_gpio_chip  *gpch;
 
-        gpch = container_of(chip, struct rb532_gpio_chip, chip);
+        gpch = gpiochip_get_data(chip);
 
         /* disable alternate function in case it's set */
         rb532_set_bit(0, offset, gpch->regbase + GPIOFUNC);
@@ -200,7 +200,7 @@ int __init rb532_gpio_init(void)
         }
 
         /* Register our GPIO chip */
-        gpiochip_add(&rb532_gpio_chip->chip);
+        gpiochip_add_data(&rb532_gpio_chip->chip, rb532_gpio_chip);
 
         return 0;
 }
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 2fd350f31f4b..108f8a8d1640 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/err.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
 #include <linux/mtd/physmap.h>
@@ -687,16 +687,14 @@ struct txx9_iocled_data {
 
 static int txx9_iocled_get(struct gpio_chip *chip, unsigned int offset)
 {
-        struct txx9_iocled_data *data =
-                container_of(chip, struct txx9_iocled_data, chip);
+        struct txx9_iocled_data *data = gpiochip_get_data(chip);
         return !!(data->cur_val & (1 << offset));
 }
 
 static void txx9_iocled_set(struct gpio_chip *chip, unsigned int offset,
                             int value)
 {
-        struct txx9_iocled_data *data =
-                container_of(chip, struct txx9_iocled_data, chip);
+        struct txx9_iocled_data *data = gpiochip_get_data(chip);
         unsigned long flags;
         spin_lock_irqsave(&txx9_iocled_lock, flags);
         if (value)
@@ -749,7 +747,7 @@ void __init txx9_iocled_init(unsigned long baseaddr,
         iocled->chip.label = "iocled";
         iocled->chip.base = basenum;
         iocled->chip.ngpio = num;
-        if (gpiochip_add(&iocled->chip))
+        if (gpiochip_add_data(&iocled->chip, iocled))
                 goto out_unmap;
         if (basenum < 0)
                 basenum = iocled->chip.base;
diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index c9afd05020e0..54de66837103 100644
--- a/arch/mips/txx9/rbtx4938/setup.c
+++ b/arch/mips/txx9/rbtx4938/setup.c
@@ -14,6 +14,7 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
+#include <linux/gpio/driver.h>
 #include <linux/gpio.h>
 #include <linux/mtd/physmap.h>
 
@@ -335,7 +336,7 @@ static void __init rbtx4938_mtd_init(void)
 
 static void __init rbtx4938_arch_init(void)
 {
-        gpiochip_add(&rbtx4938_spi_gpio_chip);
+        gpiochip_add_data(&rbtx4938_spi_gpio_chip, NULL);
         rbtx4938_pci_setup();
         rbtx4938_spi_init();
 }
diff --git a/arch/openrisc/include/asm/gpio.h b/arch/openrisc/include/asm/gpio.h
deleted file mode 100644
index b3799d88ffcf..000000000000
--- a/arch/openrisc/include/asm/gpio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __LINUX_GPIO_H
-#warning Include linux/gpio.h instead of asm/gpio.h
-#include <linux/gpio.h>
-#endif
diff --git a/arch/powerpc/include/asm/gpio.h b/arch/powerpc/include/asm/gpio.h
deleted file mode 100644
index b3799d88ffcf..000000000000
--- a/arch/powerpc/include/asm/gpio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __LINUX_GPIO_H
-#warning Include linux/gpio.h instead of asm/gpio.h
-#include <linux/gpio.h>
-#endif
diff --git a/arch/powerpc/sysdev/ppc4xx_gpio.c b/arch/powerpc/sysdev/ppc4xx_gpio.c
index fc65ad1b3293..d7a7ef135b9f 100644
--- a/arch/powerpc/sysdev/ppc4xx_gpio.c
+++ b/arch/powerpc/sysdev/ppc4xx_gpio.c
@@ -78,7 +78,7 @@ static int ppc4xx_gpio_get(struct gpio_chip *gc, unsigned int gpio)
         struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
         struct ppc4xx_gpio __iomem *regs = mm_gc->regs;
 
-        return in_be32(&regs->ir) & GPIO_MASK(gpio);
+        return !!(in_be32(&regs->ir) & GPIO_MASK(gpio));
 }
 
 static inline void
diff --git a/arch/powerpc/sysdev/simple_gpio.c b/arch/powerpc/sysdev/simple_gpio.c
index ff5e73230a36..56ce8ca3281b 100644
--- a/arch/powerpc/sysdev/simple_gpio.c
+++ b/arch/powerpc/sysdev/simple_gpio.c
@@ -46,7 +46,7 @@ static int u8_gpio_get(struct gpio_chip *gc, unsigned int gpio)
 {
         struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
 
-        return in_8(mm_gc->regs) & u8_pin2mask(gpio);
+        return !!(in_8(mm_gc->regs) & u8_pin2mask(gpio));
 }
 
 static void u8_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
diff --git a/arch/sh/include/mach-common/mach/magicpanelr2.h b/arch/sh/include/mach-common/mach/magicpanelr2.h
index 183a2f744251..eb0cf205176f 100644
--- a/arch/sh/include/mach-common/mach/magicpanelr2.h
+++ b/arch/sh/include/mach-common/mach/magicpanelr2.h
@@ -13,7 +13,7 @@
 #ifndef __ASM_SH_MAGICPANELR2_H
 #define __ASM_SH_MAGICPANELR2_H
 
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 #define __IO_PREFIX mpr2
 #include <asm/io_generic.h>
diff --git a/arch/sparc/include/asm/gpio.h b/arch/sparc/include/asm/gpio.h
deleted file mode 100644
index b3799d88ffcf..000000000000
--- a/arch/sparc/include/asm/gpio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __LINUX_GPIO_H
-#warning Include linux/gpio.h instead of asm/gpio.h
-#include <linux/gpio.h>
-#endif
diff --git a/arch/unicore32/kernel/gpio.c b/arch/unicore32/kernel/gpio.c
index cb12ec39552c..5ab23794ea17 100644
--- a/arch/unicore32/kernel/gpio.c
+++ b/arch/unicore32/kernel/gpio.c
@@ -52,7 +52,7 @@ device_initcall(puv3_gpio_leds_init);
 
 static int puv3_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
-        return readl(GPIO_GPLR) & GPIO_GPIO(offset);
+        return !!(readl(GPIO_GPLR) & GPIO_GPIO(offset));
 }
 
 static void puv3_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h
deleted file mode 100644
index b3799d88ffcf..000000000000
--- a/arch/x86/include/asm/gpio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __LINUX_GPIO_H
-#warning Include linux/gpio.h instead of asm/gpio.h
-#include <linux/gpio.h>
-#endif
diff --git a/arch/xtensa/include/asm/gpio.h b/arch/xtensa/include/asm/gpio.h
deleted file mode 100644
index b3799d88ffcf..000000000000
--- a/arch/xtensa/include/asm/gpio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __LINUX_GPIO_H
-#warning Include linux/gpio.h instead of asm/gpio.h
-#include <linux/gpio.h>
-#endif
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index ace0a4de3449..9f27b14009f9 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -30,8 +30,7 @@
 #include <linux/ata_platform.h>
 #include <linux/platform_data/atmel.h>
 #include <linux/regmap.h>
-
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 #define DRV_NAME                "pata_at91"
 #define DRV_VERSION             "0.3"
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index dd7410019d15..ec748d31928d 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -36,8 +36,8 @@
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 #include <asm/dma.h>
-#include <asm/gpio.h>
 #include <asm/portmux.h>
 
 #define DRV_NAME                "pata-bf54x"
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index c88dd24a4b1f..4808e4657de5 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -126,6 +126,16 @@ config GPIO_AMDPT
           driver for GPIO functionality on Promontory IOHub
           Require ACPI ASL code to enumerate as a platform device.
 
+config GPIO_ATH79
+        tristate "Atheros AR71XX/AR724X/AR913X GPIO support"
+        default y if ATH79
+        depends on ATH79 || COMPILE_TEST
+        select GPIO_GENERIC
+        select GPIOLIB_IRQCHIP
+        help
+          Select this option to enable GPIO driver for
+          Atheros AR71XX/AR724X/AR913X SoC devices.
+
 config GPIO_BCM_KONA
         bool "Broadcom Kona GPIO"
         depends on OF_GPIO && (ARCH_BCM_MOBILE || COMPILE_TEST)
@@ -256,10 +266,17 @@ config GPIO_LYNXPOINT
 
 config GPIO_MB86S7X
         bool "GPIO support for Fujitsu MB86S7x Platforms"
-        depends on ARCH_MB86S7X
+        depends on ARCH_MB86S7X || COMPILE_TEST
         help
           Say yes here to support the GPIO controller in Fujitsu MB86S70 SoCs.
 
+config GPIO_MENZ127
+        tristate "MEN 16Z127 GPIO support"
+        depends on MCB
+        select GPIO_GENERIC
+        help
+         Say yes here to support the MEN 16Z127 GPIO Controller
+
 config GPIO_MM_LANTIQ
         bool "Lantiq Memory mapped GPIOs"
         depends on LANTIQ && SOC_XWAY
@@ -270,7 +287,7 @@ config GPIO_MM_LANTIQ
 
 config GPIO_MOXART
         bool "MOXART GPIO support"
-        depends on ARCH_MOXART
+        depends on ARCH_MOXART || COMPILE_TEST
         select GPIO_GENERIC
         help
           Select this option to enable GPIO driver for
@@ -281,12 +298,14 @@ config GPIO_MPC5200
         depends on PPC_MPC52xx
 
 config GPIO_MPC8XXX
-        bool "MPC512x/MPC8xxx GPIO support"
+        bool "MPC512x/MPC8xxx/QorIQ GPIO support"
         depends on PPC_MPC512x || PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || \
-                   FSL_SOC_BOOKE || PPC_86xx
+                   FSL_SOC_BOOKE || PPC_86xx || ARCH_LAYERSCAPE || ARM || \
+                   COMPILE_TEST
+        select GPIO_GENERIC
         help
           Say Y here if you're going to use hardware that connects to the
-          MPC512x/831x/834x/837x/8572/8610 GPIOs.
+          MPC512x/831x/834x/837x/8572/8610/QorIQ GPIOs.
 
 config GPIO_MVEBU
         def_bool y
@@ -339,7 +358,7 @@ config GPIO_PXA
 
 config GPIO_RCAR
         tristate "Renesas R-Car GPIO"
-        depends on ARCH_SHMOBILE || COMPILE_TEST
+        depends on ARCH_RENESAS || COMPILE_TEST
         select GPIOLIB_IRQCHIP
         help
           Say yes here to support GPIO on Renesas R-Car SoCs.
@@ -380,6 +399,14 @@ config GPIO_TB10X
         select GENERIC_IRQ_CHIP
         select OF_GPIO
 
+config GPIO_TS4800
+        tristate "TS-4800 DIO blocks and compatibles"
+        depends on OF_GPIO
+        depends on SOC_IMX51 || COMPILE_TEST
+        select GPIO_GENERIC
+        help
+          This driver support TS-4800 FPGA GPIO controllers.
+
 config GPIO_TZ1090
         bool "Toumaz Xenif TZ1090 GPIO support"
         depends on SOC_TZ1090
@@ -433,6 +460,7 @@ config GPIO_XGENE_SB
         tristate "APM X-Gene GPIO standby controller support"
         depends on ARCH_XGENE && OF_GPIO
         select GPIO_GENERIC
+        select GPIOLIB_IRQCHIP
         help
           This driver supports the GPIO block within the APM X-Gene
           Standby Domain. Say yes here to enable the GPIO functionality.
@@ -487,6 +515,15 @@ endmenu
 menu "Port-mapped I/O GPIO drivers"
         depends on X86 # Unconditional I/O space access
 
+config GPIO_104_DIO_48E
+        tristate "ACCES 104-DIO-48E GPIO support"
+        select GPIOLIB_IRQCHIP
+        help
+          Enables GPIO support for the ACCES 104-DIO-48E family. The base port
+          address for the device may be configured via the dio_48e_base module
+          parameter. The interrupt line number for the device may be configured
+          via the dio_48e_irq module parameter.
+
 config GPIO_104_IDIO_16
         tristate "ACCES 104-IDIO-16 GPIO support"
         select GPIOLIB_IRQCHIP
@@ -506,10 +543,10 @@ config GPIO_104_IDI_48
           via the idi_48_irq module parameter.
 
 config GPIO_F7188X
-        tristate "F71869, F71869A, F71882FG and F71889F GPIO support"
+        tristate "F71869, F71869A, F71882FG, F71889F and F81866 GPIO support"
         help
           This option enables support for GPIOs found on Fintek Super-I/O
-          chips F71869, F71869A, F71882FG and F71889F.
+          chips F71869, F71869A, F71882FG, F71889F and F81866.
 
           To compile this driver as a module, choose M here: the module will
           be called f7188x-gpio.
@@ -570,6 +607,15 @@ config GPIO_TS5500
           blocks of the TS-5500: DIO1, DIO2 and the LCD port, and the TS-5600
           LCD port.
 
+config GPIO_WS16C48
+        tristate "WinSystems WS16C48 GPIO support"
+        select GPIOLIB_IRQCHIP
+        help
+          Enables GPIO support for the WinSystems WS16C48. The base port address
+          for the device may be configured via the ws16c48_base module
+          parameter. The interrupt line number for the device may be configured
+          via the ws16c48_irq module parameter.
+
 endmenu
 
 menu "I2C GPIO expanders"
@@ -702,6 +748,14 @@ config GPIO_SX150X
           8 bits:  sx1508q
           16 bits: sx1509q
 
+config GPIO_TPIC2810
+        tristate "TPIC2810 8-Bit I2C GPO expander"
+        help
+          Say yes here to enable the GPO driver for the TI TPIC2810 chip.
+
+          To compile this driver as a module, choose M here: the module will
+          be called gpio-tpic2810.
+
 endmenu
 
 menu "MFD GPIO expanders"
@@ -844,6 +898,13 @@ config GPIO_TIMBERDALE
         ---help---
         Add support for the GPIO IP in the timberdale FPGA.
 
+config GPIO_TPS65218
+        tristate "TPS65218 GPIO"
+        depends on MFD_TPS65218
+        help
+          Select this option to enable GPIO driver for the TPS65218
+          chip family.
+
 config GPIO_TPS6586X
         bool "TPS6586X GPIO"
         depends on MFD_TPS6586X
@@ -860,7 +921,7 @@ config GPIO_TPS65910
 
 config GPIO_TPS65912
         tristate "TI TPS65912 GPIO"
-        depends on (MFD_TPS65912_I2C || MFD_TPS65912_SPI)
+        depends on MFD_TPS65912
         help
           This driver supports TPS65912 gpio chip
 
@@ -1011,6 +1072,12 @@ config GPIO_MC33880
           SPI driver for Freescale MC33880 high-side/low-side switch.
           This provides GPIO interface supporting inputs and outputs.
 
+config GPIO_PISOSR
+        tristate "Generic parallel-in/serial-out shift register"
+        help
+          GPIO driver for SPI compatible parallel-in/serial-out shift
+          registers. These are input only devices.
+
 endmenu
 
 menu "SPI or I2C GPIO expanders"
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index ece7d7cbdc80..25decedba943 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_GPIO_ACPI)		+= gpiolib-acpi.o
 # Device drivers. Generally keep list sorted alphabetically
 obj-$(CONFIG_GPIO_GENERIC)      += gpio-generic.o
 
+obj-$(CONFIG_GPIO_104_DIO_48E)  += gpio-104-dio-48e.o
 obj-$(CONFIG_GPIO_104_IDIO_16)  += gpio-104-idio-16.o
 obj-$(CONFIG_GPIO_104_IDI_48)   += gpio-104-idi-48.o
 obj-$(CONFIG_GPIO_74X164)       += gpio-74x164.o
@@ -23,7 +24,7 @@ obj-$(CONFIG_GPIO_ALTERA)  	+= gpio-altera.o
 obj-$(CONFIG_GPIO_AMD8111)      += gpio-amd8111.o
 obj-$(CONFIG_GPIO_AMDPT)        += gpio-amdpt.o
 obj-$(CONFIG_GPIO_ARIZONA)      += gpio-arizona.o
-obj-$(CONFIG_ATH79)             += gpio-ath79.o
+obj-$(CONFIG_GPIO_ATH79)        += gpio-ath79.o
 obj-$(CONFIG_GPIO_BCM_KONA)     += gpio-bcm-kona.o
 obj-$(CONFIG_GPIO_BRCMSTB)      += gpio-brcmstb.o
 obj-$(CONFIG_GPIO_BT8XX)        += gpio-bt8xx.o
@@ -58,6 +59,7 @@ obj-$(CONFIG_GPIO_MAX7300)	+= gpio-max7300.o
 obj-$(CONFIG_GPIO_MAX7301)      += gpio-max7301.o
 obj-$(CONFIG_GPIO_MAX732X)      += gpio-max732x.o
 obj-$(CONFIG_GPIO_MB86S7X)      += gpio-mb86s7x.o
+obj-$(CONFIG_GPIO_MENZ127)      += gpio-menz127.o
 obj-$(CONFIG_GPIO_MC33880)      += gpio-mc33880.o
 obj-$(CONFIG_GPIO_MC9S08DZ60)   += gpio-mc9s08dz60.o
 obj-$(CONFIG_GPIO_MCP23S08)     += gpio-mcp23s08.o
@@ -75,6 +77,7 @@ obj-$(CONFIG_GPIO_OMAP)		+= gpio-omap.o
 obj-$(CONFIG_GPIO_PCA953X)      += gpio-pca953x.o
 obj-$(CONFIG_GPIO_PCF857X)      += gpio-pcf857x.o
 obj-$(CONFIG_GPIO_PCH)          += gpio-pch.o
+obj-$(CONFIG_GPIO_PISOSR)       += gpio-pisosr.o
 obj-$(CONFIG_GPIO_PL061)        += gpio-pl061.o
 obj-$(CONFIG_GPIO_PXA)          += gpio-pxa.o
 obj-$(CONFIG_GPIO_RC5T583)      += gpio-rc5t583.o
@@ -95,9 +98,12 @@ obj-$(CONFIG_GPIO_TC3589X)	+= gpio-tc3589x.o
 obj-$(CONFIG_ARCH_TEGRA)        += gpio-tegra.o
 obj-$(CONFIG_GPIO_TIMBERDALE)   += gpio-timberdale.o
 obj-$(CONFIG_GPIO_PALMAS)       += gpio-palmas.o
+obj-$(CONFIG_GPIO_TPIC2810)     += gpio-tpic2810.o
+obj-$(CONFIG_GPIO_TPS65218)     += gpio-tps65218.o
 obj-$(CONFIG_GPIO_TPS6586X)     += gpio-tps6586x.o
 obj-$(CONFIG_GPIO_TPS65910)     += gpio-tps65910.o
 obj-$(CONFIG_GPIO_TPS65912)     += gpio-tps65912.o
+obj-$(CONFIG_GPIO_TS4800)       += gpio-ts4800.o
 obj-$(CONFIG_GPIO_TS5500)       += gpio-ts5500.o
 obj-$(CONFIG_GPIO_TWL4030)      += gpio-twl4030.o
 obj-$(CONFIG_GPIO_TWL6040)      += gpio-twl6040.o
@@ -111,6 +117,7 @@ obj-$(CONFIG_GPIO_VX855)	+= gpio-vx855.o
 obj-$(CONFIG_GPIO_WM831X)       += gpio-wm831x.o
 obj-$(CONFIG_GPIO_WM8350)       += gpio-wm8350.o
 obj-$(CONFIG_GPIO_WM8994)       += gpio-wm8994.o
+obj-$(CONFIG_GPIO_WS16C48)      += gpio-ws16c48.o
 obj-$(CONFIG_GPIO_XGENE)        += gpio-xgene.o
 obj-$(CONFIG_GPIO_XGENE_SB)     += gpio-xgene-sb.o
 obj-$(CONFIG_GPIO_XILINX)       += gpio-xilinx.o
diff --git a/drivers/gpio/devres.c b/drivers/gpio/devres.c
index 903fcf4d04a0..b760cbbb41d8 100644
--- a/drivers/gpio/devres.c
+++ b/drivers/gpio/devres.c
@@ -155,7 +155,7 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,
                                                                suffixes[i]);
 
                 desc = fwnode_get_named_gpiod(child, prop_name);
-                if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER))
+                if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
                         break;
         }
         if (IS_ERR(desc)) {
diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c
new file mode 100644
index 000000000000..448a903089ef
--- /dev/null
+++ b/drivers/gpio/gpio-104-dio-48e.c
@@ -0,0 +1,430 @@
+/*
+ * GPIO driver for the ACCES 104-DIO-48E
+ * Copyright (C) 2016 William Breathitt Gray
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+#include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/gpio/driver.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/interrupt.h>
+#include <linux/irqdesc.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+
+static unsigned dio_48e_base;
+module_param(dio_48e_base, uint, 0);
+MODULE_PARM_DESC(dio_48e_base, "ACCES 104-DIO-48E base address");
+static unsigned dio_48e_irq;
+module_param(dio_48e_irq, uint, 0);
+MODULE_PARM_DESC(dio_48e_irq, "ACCES 104-DIO-48E interrupt line number");
+
+/**
+ * struct dio48e_gpio - GPIO device private data structure
+ * @chip:       instance of the gpio_chip
+ * @io_state:   bit I/O state (whether bit is set to input or output)
+ * @out_state:  output bits state
+ * @control:    Control registers state
+ * @lock:       synchronization lock to prevent I/O race conditions
+ * @base:       base port address of the GPIO device
+ * @irq:        Interrupt line number
+ * @irq_mask:   I/O bits affected by interrupts
+ */
+struct dio48e_gpio {
+        struct gpio_chip chip;
+        unsigned char io_state[6];
+        unsigned char out_state[6];
+        unsigned char control[2];
+        spinlock_t lock;
+        unsigned base;
+        unsigned irq;
+        unsigned char irq_mask;
+};
+
+static int dio48e_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
+{
+        struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
+        const unsigned port = offset / 8;
+        const unsigned mask = BIT(offset % 8);
+
+        return !!(dio48egpio->io_state[port] & mask);
+}
+
+static int dio48e_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
+{
+        struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
+        const unsigned io_port = offset / 8;
+        const unsigned control_port = io_port / 2;
+        const unsigned control_addr = dio48egpio->base + 3 + control_port*4;
+        unsigned long flags;
+        unsigned control;
+
+        spin_lock_irqsave(&dio48egpio->lock, flags);
+
+        /* Check if configuring Port C */
+        if (io_port == 2 || io_port == 5) {
+                /* Port C can be configured by nibble */
+                if (offset % 8 > 3) {
+                        dio48egpio->io_state[io_port] |= 0xF0;
+                        dio48egpio->control[control_port] |= BIT(3);
+                } else {
+                        dio48egpio->io_state[io_port] |= 0x0F;
+                        dio48egpio->control[control_port] |= BIT(0);
+                }
+        } else {
+                dio48egpio->io_state[io_port] |= 0xFF;
+                if (io_port == 0 || io_port == 3)
+                        dio48egpio->control[control_port] |= BIT(4);
+                else
+                        dio48egpio->control[control_port] |= BIT(1);
+        }
+
+        control = BIT(7) | dio48egpio->control[control_port];
+        outb(control, control_addr);
+        control &= ~BIT(7);
+        outb(control, control_addr);
+
+        spin_unlock_irqrestore(&dio48egpio->lock, flags);
+
+        return 0;
+}
+
+static int dio48e_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
+        int value)
+{
+        struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
+        const unsigned io_port = offset / 8;
+        const unsigned control_port = io_port / 2;
+        const unsigned mask = BIT(offset % 8);
+        const unsigned control_addr = dio48egpio->base + 3 + control_port*4;
+        const unsigned out_port = (io_port > 2) ? io_port + 1 : io_port;
+        unsigned long flags;
+        unsigned control;
+
+        spin_lock_irqsave(&dio48egpio->lock, flags);
+
+        /* Check if configuring Port C */
+        if (io_port == 2 || io_port == 5) {
+                /* Port C can be configured by nibble */
+                if (offset % 8 > 3) {
+                        dio48egpio->io_state[io_port] &= 0x0F;
+                        dio48egpio->control[control_port] &= ~BIT(3);
+                } else {
+                        dio48egpio->io_state[io_port] &= 0xF0;
+                        dio48egpio->control[control_port] &= ~BIT(0);
+                }
+        } else {
+                dio48egpio->io_state[io_port] &= 0x00;
+                if (io_port == 0 || io_port == 3)
+                        dio48egpio->control[control_port] &= ~BIT(4);
+                else
+                        dio48egpio->control[control_port] &= ~BIT(1);
+        }
+
+        if (value)
+                dio48egpio->out_state[io_port] |= mask;
+        else
+                dio48egpio->out_state[io_port] &= ~mask;
+
+        control = BIT(7) | dio48egpio->control[control_port];
+        outb(control, control_addr);
+
+        outb(dio48egpio->out_state[io_port], dio48egpio->base + out_port);
+
+        control &= ~BIT(7);
+        outb(control, control_addr);
+
+        spin_unlock_irqrestore(&dio48egpio->lock, flags);
+
+        return 0;
+}
+
+static int dio48e_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+        struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
+        const unsigned port = offset / 8;
+        const unsigned mask = BIT(offset % 8);
+        const unsigned in_port = (port > 2) ? port + 1 : port;
+        unsigned long flags;
+        unsigned port_state;
+
+        spin_lock_irqsave(&dio48egpio->lock, flags);
+
+        /* ensure that GPIO is set for input */
+        if (!(dio48egpio->io_state[port] & mask)) {
+                spin_unlock_irqrestore(&dio48egpio->lock, flags);
+                return -EINVAL;
+        }
+
+        port_state = inb(dio48egpio->base + in_port);
+
+        spin_unlock_irqrestore(&dio48egpio->lock, flags);
+
+        return !!(port_state & mask);
+}
+
+static void dio48e_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+        struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
+        const unsigned port = offset / 8;
+        const unsigned mask = BIT(offset % 8);
+        const unsigned out_port = (port > 2) ? port + 1 : port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dio48egpio->lock, flags);
+
+        if (value)
+                dio48egpio->out_state[port] |= mask;
+        else
+                dio48egpio->out_state[port] &= ~mask;
+
+        outb(dio48egpio->out_state[port], dio48egpio->base + out_port);
+
+        spin_unlock_irqrestore(&dio48egpio->lock, flags);
+}
+
+static void dio48e_irq_ack(struct irq_data *data)
+{
+}
+
+static void dio48e_irq_mask(struct irq_data *data)
+{
+        struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
+        struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
+        const unsigned long offset = irqd_to_hwirq(data);
+        unsigned long flags;
+
+        /* only bit 3 on each respective Port C supports interrupts */
+        if (offset != 19 && offset != 43)
+                return;
+
+        spin_lock_irqsave(&dio48egpio->lock, flags);
+
+        if (offset == 19)
+                dio48egpio->irq_mask &= ~BIT(0);
+        else
+                dio48egpio->irq_mask &= ~BIT(1);
+
+        if (!dio48egpio->irq_mask)
+                /* disable interrupts */
+                inb(dio48egpio->base + 0xB);
+
+        spin_unlock_irqrestore(&dio48egpio->lock, flags);
+}
+
+static void dio48e_irq_unmask(struct irq_data *data)
+{
+        struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
+        struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
+        const unsigned long offset = irqd_to_hwirq(data);
+        unsigned long flags;
+
+        /* only bit 3 on each respective Port C supports interrupts */
+        if (offset != 19 && offset != 43)
+                return;
+
+        spin_lock_irqsave(&dio48egpio->lock, flags);
+
+        if (!dio48egpio->irq_mask) {
+                /* enable interrupts */
+                outb(0x00, dio48egpio->base + 0xF);
+                outb(0x00, dio48egpio->base + 0xB);
+        }
+
+        if (offset == 19)
+                dio48egpio->irq_mask |= BIT(0);
+        else
+                dio48egpio->irq_mask |= BIT(1);
+
+        spin_unlock_irqrestore(&dio48egpio->lock, flags);
+}
+
+static int dio48e_irq_set_type(struct irq_data *data, unsigned flow_type)
+{
+        const unsigned long offset = irqd_to_hwirq(data);
+
+        /* only bit 3 on each respective Port C supports interrupts */
+        if (offset != 19 && offset != 43)
+                return -EINVAL;
+
+        if (flow_type != IRQ_TYPE_NONE && flow_type != IRQ_TYPE_EDGE_RISING)
+                return -EINVAL;
+
+        return 0;
+}
+
+static struct irq_chip dio48e_irqchip = {
+        .name = "104-dio-48e",
+        .irq_ack = dio48e_irq_ack,
+        .irq_mask = dio48e_irq_mask,
+        .irq_unmask = dio48e_irq_unmask,
+        .irq_set_type = dio48e_irq_set_type
+};
+
+static irqreturn_t dio48e_irq_handler(int irq, void *dev_id)
+{
+        struct dio48e_gpio *const dio48egpio = dev_id;
+        struct gpio_chip *const chip = &dio48egpio->chip;
+        const unsigned long irq_mask = dio48egpio->irq_mask;
+        unsigned long gpio;
+
+        for_each_set_bit(gpio, &irq_mask, 2)
+                generic_handle_irq(irq_find_mapping(chip->irqdomain,
+                        19 + gpio*24));
+
+        spin_lock(&dio48egpio->lock);
+
+        outb(0x00, dio48egpio->base + 0xF);
+
+        spin_unlock(&dio48egpio->lock);
+
+        return IRQ_HANDLED;
+}
+
+static int __init dio48e_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct dio48e_gpio *dio48egpio;
+        const unsigned base = dio_48e_base;
+        const unsigned extent = 16;
+        const char *const name = dev_name(dev);
+        int err;
+        const unsigned irq = dio_48e_irq;
+
+        dio48egpio = devm_kzalloc(dev, sizeof(*dio48egpio), GFP_KERNEL);
+        if (!dio48egpio)
+                return -ENOMEM;
+
+        if (!devm_request_region(dev, base, extent, name)) {
+                dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
+                        base, base + extent);
+                return -EBUSY;
+        }
+
+        dio48egpio->chip.label = name;
+        dio48egpio->chip.parent = dev;
+        dio48egpio->chip.owner = THIS_MODULE;
+        dio48egpio->chip.base = -1;
+        dio48egpio->chip.ngpio = 48;
+        dio48egpio->chip.get_direction = dio48e_gpio_get_direction;
+        dio48egpio->chip.direction_input = dio48e_gpio_direction_input;
+        dio48egpio->chip.direction_output = dio48e_gpio_direction_output;
+        dio48egpio->chip.get = dio48e_gpio_get;
+        dio48egpio->chip.set = dio48e_gpio_set;
+        dio48egpio->base = base;
+        dio48egpio->irq = irq;
+
+        spin_lock_init(&dio48egpio->lock);
+
+        dev_set_drvdata(dev, dio48egpio);
+
+        err = gpiochip_add_data(&dio48egpio->chip, dio48egpio);
+        if (err) {
+                dev_err(dev, "GPIO registering failed (%d)\n", err);
+                return err;
+        }
+
+        /* initialize all GPIO as output */
+        outb(0x80, base + 3);
+        outb(0x00, base);
+        outb(0x00, base + 1);
+        outb(0x00, base + 2);
+        outb(0x00, base + 3);
+        outb(0x80, base + 7);
+        outb(0x00, base + 4);
+        outb(0x00, base + 5);
+        outb(0x00, base + 6);
+        outb(0x00, base + 7);
+
+        /* disable IRQ by default */
+        inb(base + 0xB);
+
+        err = gpiochip_irqchip_add(&dio48egpio->chip, &dio48e_irqchip, 0,
+                handle_edge_irq, IRQ_TYPE_NONE);
+        if (err) {
+                dev_err(dev, "Could not add irqchip (%d)\n", err);
+                goto err_gpiochip_remove;
+        }
+
+        err = request_irq(irq, dio48e_irq_handler, 0, name, dio48egpio);
+        if (err) {
+                dev_err(dev, "IRQ handler registering failed (%d)\n", err);
+                goto err_gpiochip_remove;
+        }
+
+        return 0;
+
+err_gpiochip_remove:
+        gpiochip_remove(&dio48egpio->chip);
+        return err;
+}
+
+static int dio48e_remove(struct platform_device *pdev)
+{
+        struct dio48e_gpio *const dio48egpio = platform_get_drvdata(pdev);
+
+        free_irq(dio48egpio->irq, dio48egpio);
+        gpiochip_remove(&dio48egpio->chip);
+
+        return 0;
+}
+
+static struct platform_device *dio48e_device;
+
+static struct platform_driver dio48e_driver = {
+        .driver = {
+                .name = "104-dio-48e"
+        },
+        .remove = dio48e_remove
+};
+
+static void __exit dio48e_exit(void)
+{
+        platform_device_unregister(dio48e_device);
+        platform_driver_unregister(&dio48e_driver);
+}
+
+static int __init dio48e_init(void)
+{
+        int err;
+
+        dio48e_device = platform_device_alloc(dio48e_driver.driver.name, -1);
+        if (!dio48e_device)
+                return -ENOMEM;
+
+        err = platform_device_add(dio48e_device);
+        if (err)
+                goto err_platform_device;
+
+        err = platform_driver_probe(&dio48e_driver, dio48e_probe);
+        if (err)
+                goto err_platform_driver;
+
+        return 0;
+
+err_platform_driver:
+        platform_device_del(dio48e_device);
+err_platform_device:
+        platform_device_put(dio48e_device);
+        return err;
+}
+
+module_init(dio48e_init);
+module_exit(dio48e_exit);
+
+MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
+MODULE_DESCRIPTION("ACCES 104-DIO-48E GPIO driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c
index 52eed328ce99..e37cd4cdda35 100644
--- a/drivers/gpio/gpio-104-idi-48.c
+++ b/drivers/gpio/gpio-104-idi-48.c
@@ -39,7 +39,6 @@ MODULE_PARM_DESC(idi_48_irq, "ACCES 104-IDI-48 interrupt line number");
  * @ack_lock:   synchronization lock to prevent IRQ handler race conditions
  * @irq_mask:   input bits affected by interrupts
  * @base:       base port address of the GPIO device
- * @extent:     extent of port address region of the GPIO device
  * @irq:        Interrupt line number
  * @cos_enb:    Change-Of-State IRQ enable boundaries mask
  */
@@ -49,7 +48,6 @@ struct idi_48_gpio {
         spinlock_t ack_lock;
         unsigned char irq_mask[6];
         unsigned base;
-        unsigned extent;
         unsigned irq;
         unsigned char cos_enb;
 };
@@ -227,11 +225,10 @@ static int __init idi_48_probe(struct platform_device *pdev)
         if (!idi48gpio)
                 return -ENOMEM;
 
-        if (!request_region(base, extent, name)) {
-                dev_err(dev, "Unable to lock %s port addresses (0x%X-0x%X)\n",
-                        name, base, base + extent);
-                err = -EBUSY;
-                goto err_lock_io_port;
+        if (!devm_request_region(dev, base, extent, name)) {
+                dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
+                        base, base + extent);
+                return -EBUSY;
         }
 
         idi48gpio->chip.label = name;
@@ -243,7 +240,6 @@ static int __init idi_48_probe(struct platform_device *pdev)
         idi48gpio->chip.direction_input = idi_48_gpio_direction_input;
         idi48gpio->chip.get = idi_48_gpio_get;
         idi48gpio->base = base;
-        idi48gpio->extent = extent;
         idi48gpio->irq = irq;
 
         spin_lock_init(&idi48gpio->lock);
@@ -253,7 +249,7 @@ static int __init idi_48_probe(struct platform_device *pdev)
         err = gpiochip_add_data(&idi48gpio->chip, idi48gpio);
         if (err) {
                 dev_err(dev, "GPIO registering failed (%d)\n", err);
-                goto err_gpio_register;
+                return err;
         }
 
         /* Disable IRQ by default */
@@ -264,23 +260,20 @@ static int __init idi_48_probe(struct platform_device *pdev)
                 handle_edge_irq, IRQ_TYPE_NONE);
         if (err) {
                 dev_err(dev, "Could not add irqchip (%d)\n", err);
-                goto err_gpiochip_irqchip_add;
+                goto err_gpiochip_remove;
         }
 
-        err = request_irq(irq, idi_48_irq_handler, 0, name, idi48gpio);
+        err = request_irq(irq, idi_48_irq_handler, IRQF_SHARED, name,
+                idi48gpio);
         if (err) {
                 dev_err(dev, "IRQ handler registering failed (%d)\n", err);
-                goto err_request_irq;
+                goto err_gpiochip_remove;
         }
 
         return 0;
 
-err_request_irq:
-err_gpiochip_irqchip_add:
+err_gpiochip_remove:
         gpiochip_remove(&idi48gpio->chip);
-err_gpio_register:
-        release_region(base, extent);
-err_lock_io_port:
         return err;
 }
 
@@ -290,7 +283,6 @@ static int idi_48_remove(struct platform_device *pdev)
 
         free_irq(idi48gpio->irq, idi48gpio);
         gpiochip_remove(&idi48gpio->chip);
-        release_region(idi48gpio->base, idi48gpio->extent);
 
         return 0;
 }
@@ -340,4 +332,4 @@ module_exit(idi_48_exit);
 
 MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
 MODULE_DESCRIPTION("ACCES 104-IDI-48 GPIO driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpio/gpio-104-idio-16.c b/drivers/gpio/gpio-104-idio-16.c
index 4d69b50b2d84..ecc85fe9323d 100644
--- a/drivers/gpio/gpio-104-idio-16.c
+++ b/drivers/gpio/gpio-104-idio-16.c
@@ -38,7 +38,6 @@ MODULE_PARM_DESC(idio_16_irq, "ACCES 104-IDIO-16 interrupt line number");
  * @lock:       synchronization lock to prevent I/O race conditions
  * @irq_mask:   I/O bits affected by interrupts
  * @base:       base port address of the GPIO device
- * @extent:     extent of port address region of the GPIO device
  * @irq:        Interrupt line number
  * @out_state:  output bits state
  */
@@ -47,7 +46,6 @@ struct idio_16_gpio {
         spinlock_t lock;
         unsigned long irq_mask;
         unsigned base;
-        unsigned extent;
         unsigned irq;
         unsigned out_state;
 };
@@ -201,11 +199,10 @@ static int __init idio_16_probe(struct platform_device *pdev)
         if (!idio16gpio)
                 return -ENOMEM;
 
-        if (!request_region(base, extent, name)) {
-                dev_err(dev, "Unable to lock %s port addresses (0x%X-0x%X)\n",
-                        name, base, base + extent);
-                err = -EBUSY;
-                goto err_lock_io_port;
+        if (!devm_request_region(dev, base, extent, name)) {
+                dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
+                        base, base + extent);
+                return -EBUSY;
         }
 
         idio16gpio->chip.label = name;
@@ -219,7 +216,6 @@ static int __init idio_16_probe(struct platform_device *pdev)
         idio16gpio->chip.get = idio_16_gpio_get;
         idio16gpio->chip.set = idio_16_gpio_set;
         idio16gpio->base = base;
-        idio16gpio->extent = extent;
         idio16gpio->irq = irq;
         idio16gpio->out_state = 0xFFFF;
 
@@ -230,7 +226,7 @@ static int __init idio_16_probe(struct platform_device *pdev)
         err = gpiochip_add_data(&idio16gpio->chip, idio16gpio);
         if (err) {
                 dev_err(dev, "GPIO registering failed (%d)\n", err);
-                goto err_gpio_register;
+                return err;
         }
 
         /* Disable IRQ by default */
@@ -241,23 +237,19 @@ static int __init idio_16_probe(struct platform_device *pdev)
                 handle_edge_irq, IRQ_TYPE_NONE);
         if (err) {
                 dev_err(dev, "Could not add irqchip (%d)\n", err);
-                goto err_gpiochip_irqchip_add;
+                goto err_gpiochip_remove;
         }
 
         err = request_irq(irq, idio_16_irq_handler, 0, name, idio16gpio);
         if (err) {
                 dev_err(dev, "IRQ handler registering failed (%d)\n", err);
-                goto err_request_irq;
+                goto err_gpiochip_remove;
         }
 
         return 0;
 
-err_request_irq:
-err_gpiochip_irqchip_add:
+err_gpiochip_remove:
         gpiochip_remove(&idio16gpio->chip);
-err_gpio_register:
-        release_region(base, extent);
-err_lock_io_port:
         return err;
 }
 
@@ -267,7 +259,6 @@ static int idio_16_remove(struct platform_device *pdev)
 
         free_irq(idio16gpio->irq, idio16gpio);
         gpiochip_remove(&idio16gpio->chip);
-        release_region(idio16gpio->base, idio16gpio->extent);
 
         return 0;
 }
@@ -317,4 +308,4 @@ module_exit(idio_16_exit);
 
 MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
 MODULE_DESCRIPTION("ACCES 104-IDIO-16 GPIO driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpio/gpio-74xx-mmio.c b/drivers/gpio/gpio-74xx-mmio.c
index 372b0e01adc6..0475e8ec96d0 100644
--- a/drivers/gpio/gpio-74xx-mmio.c
+++ b/drivers/gpio/gpio-74xx-mmio.c
@@ -140,15 +140,7 @@ static int mmio_74xx_gpio_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, priv);
 
-        return gpiochip_add_data(&priv->gc, priv);
-}
-
-static int mmio_74xx_gpio_remove(struct platform_device *pdev)
-{
-        struct mmio_74xx_gpio_priv *priv = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&priv->gc);
-        return 0;
+        return devm_gpiochip_add_data(&pdev->dev, &priv->gc, priv);
 }
 
 static struct platform_driver mmio_74xx_gpio_driver = {
@@ -157,7 +149,6 @@ static struct platform_driver mmio_74xx_gpio_driver = {
                 .of_match_table = mmio_74xx_gpio_ids,
         },
         .probe  = mmio_74xx_gpio_probe,
-        .remove = mmio_74xx_gpio_remove,
 };
 module_platform_driver(mmio_74xx_gpio_driver);
 
diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c
index fb5b47b69f14..8ff7b0d3eac6 100644
--- a/drivers/gpio/gpio-adnp.c
+++ b/drivers/gpio/gpio-adnp.c
@@ -265,7 +265,7 @@ static int adnp_gpio_setup(struct adnp *adnp, unsigned int num_gpios)
         chip->of_node = chip->parent->of_node;
         chip->owner = THIS_MODULE;
 
-        err = gpiochip_add_data(chip, adnp);
+        err = devm_gpiochip_add_data(&adnp->client->dev, chip, adnp);
         if (err)
                 return err;
 
@@ -520,14 +520,6 @@ static int adnp_i2c_probe(struct i2c_client *client,
         return 0;
 }
 
-static int adnp_i2c_remove(struct i2c_client *client)
-{
-        struct adnp *adnp = i2c_get_clientdata(client);
-
-        gpiochip_remove(&adnp->gpio);
-        return 0;
-}
-
 static const struct i2c_device_id adnp_i2c_id[] = {
         { "gpio-adnp" },
         { },
@@ -546,7 +538,6 @@ static struct i2c_driver adnp_i2c_driver = {
                 .of_match_table = adnp_of_match,
         },
         .probe = adnp_i2c_probe,
-        .remove = adnp_i2c_remove,
         .id_table = adnp_i2c_id,
 };
 module_i2c_driver(adnp_i2c_driver);
diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
index 4fa7ff1fec9a..abf199609546 100644
--- a/drivers/gpio/gpio-adp5520.c
+++ b/drivers/gpio/gpio-adp5520.c
@@ -153,7 +153,7 @@ static int adp5520_gpio_probe(struct platform_device *pdev)
                 goto err;
         }
 
-        ret = gpiochip_add_data(&dev->gpio_chip, dev);
+        ret = devm_gpiochip_add_data(&pdev->dev, &dev->gpio_chip, dev);
         if (ret)
                 goto err;
 
@@ -164,22 +164,11 @@ err:
         return ret;
 }
 
-static int adp5520_gpio_remove(struct platform_device *pdev)
-{
-        struct adp5520_gpio *dev;
-
-        dev = platform_get_drvdata(pdev);
-        gpiochip_remove(&dev->gpio_chip);
-
-        return 0;
-}
-
 static struct platform_driver adp5520_gpio_driver = {
         .driver = {
                 .name   = "adp5520-gpio",
         },
         .probe          = adp5520_gpio_probe,
-        .remove         = adp5520_gpio_remove,
 };
 
 module_platform_driver(adp5520_gpio_driver);
diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c
index 19a0eba1e942..c0f718b12317 100644
--- a/drivers/gpio/gpio-adp5588.c
+++ b/drivers/gpio/gpio-adp5588.c
@@ -414,7 +414,7 @@ static int adp5588_gpio_probe(struct i2c_client *client,
                 }
         }
 
-        ret = gpiochip_add_data(&dev->gpio_chip, dev);
+        ret = devm_gpiochip_add_data(&client->dev, &dev->gpio_chip, dev);
         if (ret)
                 goto err_irq;
 
@@ -457,8 +457,6 @@ static int adp5588_gpio_remove(struct i2c_client *client)
         if (dev->irq_base)
                 free_irq(dev->client->irq, dev);
 
-        gpiochip_remove(&dev->gpio_chip);
-
         return 0;
 }
 
diff --git a/drivers/gpio/gpio-amd8111.c b/drivers/gpio/gpio-amd8111.c
index c7040fffc5b4..30ad7d7c1678 100644
--- a/drivers/gpio/gpio-amd8111.c
+++ b/drivers/gpio/gpio-amd8111.c
@@ -25,6 +25,7 @@
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
+#include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
@@ -204,7 +205,8 @@ found:
         gp.pmbase &= 0x0000FF00;
         if (gp.pmbase == 0)
                 goto out;
-        if (!request_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE, "AMD GPIO")) {
+        if (!devm_request_region(&pdev->dev, gp.pmbase + PMBASE_OFFSET,
+                PMBASE_SIZE, "AMD GPIO")) {
                 dev_err(&pdev->dev, "AMD GPIO region 0x%x already in use!\n",
                         gp.pmbase + PMBASE_OFFSET);
                 err = -EBUSY;
@@ -213,7 +215,6 @@ found:
         gp.pm = ioport_map(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE);
         if (!gp.pm) {
                 dev_err(&pdev->dev, "Couldn't map io port into io memory\n");
-                release_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE);
                 err = -ENOMEM;
                 goto out;
         }
@@ -228,7 +229,6 @@ found:
                 printk(KERN_ERR "GPIO registering failed (%d)\n",
                        err);
                 ioport_unmap(gp.pm);
-                release_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE);
                 goto out;
         }
 out:
@@ -239,7 +239,6 @@ static void __exit amd_gpio_exit(void)
 {
         gpiochip_remove(&gp.chip);
         ioport_unmap(gp.pm);
-        release_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE);
 }
 
 module_init(amd_gpio_init);
diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c
index e910c1f41d93..991370494922 100644
--- a/drivers/gpio/gpio-arizona.c
+++ b/drivers/gpio/gpio-arizona.c
@@ -132,7 +132,8 @@ static int arizona_gpio_probe(struct platform_device *pdev)
         else
                 arizona_gpio->gpio_chip.base = -1;
 
-        ret = gpiochip_add_data(&arizona_gpio->gpio_chip, arizona_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &arizona_gpio->gpio_chip,
+                                     arizona_gpio);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Could not register gpiochip, %d\n",
                         ret);
@@ -147,18 +148,9 @@ err:
         return ret;
 }
 
-static int arizona_gpio_remove(struct platform_device *pdev)
-{
-        struct arizona_gpio *arizona_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&arizona_gpio->gpio_chip);
-        return 0;
-}
-
 static struct platform_driver arizona_gpio_driver = {
         .driver.name    = "arizona-gpio",
         .probe          = arizona_gpio_probe,
-        .remove         = arizona_gpio_remove,
 };
 
 module_platform_driver(arizona_gpio_driver);
diff --git a/drivers/gpio/gpio-ath79.c b/drivers/gpio/gpio-ath79.c
index d13dd133a907..c4f4cddc7c1a 100644
--- a/drivers/gpio/gpio-ath79.c
+++ b/drivers/gpio/gpio-ath79.c
@@ -1,12 +1,11 @@
 /*
  *  Atheros AR71XX/AR724X/AR913X GPIO API support
  *
+ *  Copyright (C) 2015 Alban Bedel <albeu@free.fr>
  *  Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
  *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
- *  Parts of this file are based on Atheros' 2.6.15/2.6.31 BSP
- *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
  *  by the Free Software Foundation.
@@ -15,118 +14,204 @@
 #include <linux/gpio/driver.h>
 #include <linux/platform_data/gpio-ath79.h>
 #include <linux/of_device.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+
+#define AR71XX_GPIO_REG_OE              0x00
+#define AR71XX_GPIO_REG_IN              0x04
+#define AR71XX_GPIO_REG_SET             0x0c
+#define AR71XX_GPIO_REG_CLEAR           0x10
 
-#include <asm/mach-ath79/ar71xx_regs.h>
+#define AR71XX_GPIO_REG_INT_ENABLE      0x14
+#define AR71XX_GPIO_REG_INT_TYPE        0x18
+#define AR71XX_GPIO_REG_INT_POLARITY    0x1c
+#define AR71XX_GPIO_REG_INT_PENDING     0x20
+#define AR71XX_GPIO_REG_INT_MASK        0x24
 
 struct ath79_gpio_ctrl {
-        struct gpio_chip chip;
+        struct gpio_chip gc;
         void __iomem *base;
         spinlock_t lock;
+        unsigned long both_edges;
 };
 
-static void ath79_gpio_set_value(struct gpio_chip *chip,
-                                unsigned gpio, int value)
+static struct ath79_gpio_ctrl *irq_data_to_ath79_gpio(struct irq_data *data)
 {
-        struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
+        struct gpio_chip *gc = irq_data_get_irq_chip_data(data);
 
-        if (value)
-                __raw_writel(BIT(gpio), ctrl->base + AR71XX_GPIO_REG_SET);
-        else
-                __raw_writel(BIT(gpio), ctrl->base + AR71XX_GPIO_REG_CLEAR);
+        return container_of(gc, struct ath79_gpio_ctrl, gc);
 }
 
-static int ath79_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
+static u32 ath79_gpio_read(struct ath79_gpio_ctrl *ctrl, unsigned reg)
 {
-        struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
+        return readl(ctrl->base + reg);
+}
 
-        return (__raw_readl(ctrl->base + AR71XX_GPIO_REG_IN) >> gpio) & 1;
+static void ath79_gpio_write(struct ath79_gpio_ctrl *ctrl,
+                        unsigned reg, u32 val)
+{
+        return writel(val, ctrl->base + reg);
 }
 
-static int ath79_gpio_direction_input(struct gpio_chip *chip,
-                                       unsigned offset)
+static bool ath79_gpio_update_bits(
+        struct ath79_gpio_ctrl *ctrl, unsigned reg, u32 mask, u32 bits)
 {
-        struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
+        u32 old_val, new_val;
+
+        old_val = ath79_gpio_read(ctrl, reg);
+        new_val = (old_val & ~mask) | (bits & mask);
+
+        if (new_val != old_val)
+                ath79_gpio_write(ctrl, reg, new_val);
+
+        return new_val != old_val;
+}
+
+static void ath79_gpio_irq_unmask(struct irq_data *data)
+{
+        struct ath79_gpio_ctrl *ctrl = irq_data_to_ath79_gpio(data);
+        u32 mask = BIT(irqd_to_hwirq(data));
         unsigned long flags;
 
         spin_lock_irqsave(&ctrl->lock, flags);
+        ath79_gpio_update_bits(ctrl, AR71XX_GPIO_REG_INT_MASK, mask, mask);
+        spin_unlock_irqrestore(&ctrl->lock, flags);
+}
 
-        __raw_writel(
-                __raw_readl(ctrl->base + AR71XX_GPIO_REG_OE) & ~BIT(offset),
-                ctrl->base + AR71XX_GPIO_REG_OE);
+static void ath79_gpio_irq_mask(struct irq_data *data)
+{
+        struct ath79_gpio_ctrl *ctrl = irq_data_to_ath79_gpio(data);
+        u32 mask = BIT(irqd_to_hwirq(data));
+        unsigned long flags;
 
+        spin_lock_irqsave(&ctrl->lock, flags);
+        ath79_gpio_update_bits(ctrl, AR71XX_GPIO_REG_INT_MASK, mask, 0);
         spin_unlock_irqrestore(&ctrl->lock, flags);
-
-        return 0;
 }
 
-static int ath79_gpio_direction_output(struct gpio_chip *chip,
-                                        unsigned offset, int value)
+static void ath79_gpio_irq_enable(struct irq_data *data)
 {
-        struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
+        struct ath79_gpio_ctrl *ctrl = irq_data_to_ath79_gpio(data);
+        u32 mask = BIT(irqd_to_hwirq(data));
         unsigned long flags;
 
         spin_lock_irqsave(&ctrl->lock, flags);
+        ath79_gpio_update_bits(ctrl, AR71XX_GPIO_REG_INT_ENABLE, mask, mask);
+        ath79_gpio_update_bits(ctrl, AR71XX_GPIO_REG_INT_MASK, mask, mask);
+        spin_unlock_irqrestore(&ctrl->lock, flags);
+}
 
-        if (value)
-                __raw_writel(BIT(offset), ctrl->base + AR71XX_GPIO_REG_SET);
-        else
-                __raw_writel(BIT(offset), ctrl->base + AR71XX_GPIO_REG_CLEAR);
-
-        __raw_writel(
-                __raw_readl(ctrl->base + AR71XX_GPIO_REG_OE) | BIT(offset),
-                ctrl->base + AR71XX_GPIO_REG_OE);
+static void ath79_gpio_irq_disable(struct irq_data *data)
+{
+        struct ath79_gpio_ctrl *ctrl = irq_data_to_ath79_gpio(data);
+        u32 mask = BIT(irqd_to_hwirq(data));
+        unsigned long flags;
 
+        spin_lock_irqsave(&ctrl->lock, flags);
+        ath79_gpio_update_bits(ctrl, AR71XX_GPIO_REG_INT_MASK, mask, 0);
+        ath79_gpio_update_bits(ctrl, AR71XX_GPIO_REG_INT_ENABLE, mask, 0);
         spin_unlock_irqrestore(&ctrl->lock, flags);
-
-        return 0;
 }
 
-static int ar934x_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
+static int ath79_gpio_irq_set_type(struct irq_data *data,
+                                unsigned int flow_type)
 {
-        struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
+        struct ath79_gpio_ctrl *ctrl = irq_data_to_ath79_gpio(data);
+        u32 mask = BIT(irqd_to_hwirq(data));
+        u32 type = 0, polarity = 0;
         unsigned long flags;
+        bool disabled;
+
+        switch (flow_type) {
+        case IRQ_TYPE_EDGE_RISING:
+                polarity |= mask;
+        case IRQ_TYPE_EDGE_FALLING:
+        case IRQ_TYPE_EDGE_BOTH:
+                break;
+
+        case IRQ_TYPE_LEVEL_HIGH:
+                polarity |= mask;
+        case IRQ_TYPE_LEVEL_LOW:
+                type |= mask;
+                break;
+
+        default:
+                return -EINVAL;
+        }
 
         spin_lock_irqsave(&ctrl->lock, flags);
 
-        __raw_writel(
-                __raw_readl(ctrl->base + AR71XX_GPIO_REG_OE) | BIT(offset),
-                ctrl->base + AR71XX_GPIO_REG_OE);
+        if (flow_type == IRQ_TYPE_EDGE_BOTH) {
+                ctrl->both_edges |= mask;
+                polarity = ~ath79_gpio_read(ctrl, AR71XX_GPIO_REG_IN);
+        } else {
+                ctrl->both_edges &= ~mask;
+        }
+
+        /* As the IRQ configuration can't be loaded atomically we
+         * have to disable the interrupt while the configuration state
+         * is invalid.
+         */
+        disabled = ath79_gpio_update_bits(
+                ctrl, AR71XX_GPIO_REG_INT_ENABLE, mask, 0);
+
+        ath79_gpio_update_bits(
+                ctrl, AR71XX_GPIO_REG_INT_TYPE, mask, type);
+        ath79_gpio_update_bits(
+                ctrl, AR71XX_GPIO_REG_INT_POLARITY, mask, polarity);
+
+        if (disabled)
+                ath79_gpio_update_bits(
+                        ctrl, AR71XX_GPIO_REG_INT_ENABLE, mask, mask);
 
         spin_unlock_irqrestore(&ctrl->lock, flags);
 
         return 0;
 }
 
-static int ar934x_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
-                                        int value)
+static struct irq_chip ath79_gpio_irqchip = {
+        .name = "gpio-ath79",
+        .irq_enable = ath79_gpio_irq_enable,
+        .irq_disable = ath79_gpio_irq_disable,
+        .irq_mask = ath79_gpio_irq_mask,
+        .irq_unmask = ath79_gpio_irq_unmask,
+        .irq_set_type = ath79_gpio_irq_set_type,
+};
+
+static void ath79_gpio_irq_handler(struct irq_desc *desc)
 {
-        struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
-        unsigned long flags;
+        struct gpio_chip *gc = irq_desc_get_handler_data(desc);
+        struct irq_chip *irqchip = irq_desc_get_chip(desc);
+        struct ath79_gpio_ctrl *ctrl =
+                container_of(gc, struct ath79_gpio_ctrl, gc);
+        unsigned long flags, pending;
+        u32 both_edges, state;
+        int irq;
+
+        chained_irq_enter(irqchip, desc);
 
         spin_lock_irqsave(&ctrl->lock, flags);
 
-        if (value)
-                __raw_writel(BIT(offset), ctrl->base + AR71XX_GPIO_REG_SET);
-        else
-                __raw_writel(BIT(offset), ctrl->base + AR71XX_GPIO_REG_CLEAR);
+        pending = ath79_gpio_read(ctrl, AR71XX_GPIO_REG_INT_PENDING);
 
-        __raw_writel(
-                __raw_readl(ctrl->base + AR71XX_GPIO_REG_OE) & ~BIT(offset),
-                ctrl->base + AR71XX_GPIO_REG_OE);
+        /* Update the polarity of the both edges irqs */
+        both_edges = ctrl->both_edges & pending;
+        if (both_edges) {
+                state = ath79_gpio_read(ctrl, AR71XX_GPIO_REG_IN);
+                ath79_gpio_update_bits(ctrl, AR71XX_GPIO_REG_INT_POLARITY,
+                                both_edges, ~state);
+        }
 
         spin_unlock_irqrestore(&ctrl->lock, flags);
 
-        return 0;
-}
+        if (pending) {
+                for_each_set_bit(irq, &pending, gc->ngpio)
+                        generic_handle_irq(
+                                irq_linear_revmap(gc->irqdomain, irq));
+        }
 
-static const struct gpio_chip ath79_gpio_chip = {
-        .label                  = "ath79",
-        .get                    = ath79_gpio_get_value,
-        .set                    = ath79_gpio_set_value,
-        .direction_input        = ath79_gpio_direction_input,
-        .direction_output       = ath79_gpio_direction_output,
-        .base                   = 0,
-};
+        chained_irq_exit(irqchip, desc);
+}
 
 static const struct of_device_id ath79_gpio_of_match[] = {
         { .compatible = "qca,ar7100-gpio" },
@@ -147,6 +232,7 @@ static int ath79_gpio_probe(struct platform_device *pdev)
         ctrl = devm_kzalloc(&pdev->dev, sizeof(*ctrl), GFP_KERNEL);
         if (!ctrl)
                 return -ENOMEM;
+        platform_set_drvdata(pdev, ctrl);
 
         if (np) {
                 err = of_property_read_u32(np, "ngpios", &ath79_gpio_count);
@@ -154,10 +240,6 @@ static int ath79_gpio_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev, "ngpios property is not valid\n");
                         return err;
                 }
-                if (ath79_gpio_count >= 32) {
-                        dev_err(&pdev->dev, "ngpios must be less than 32\n");
-                        return -EINVAL;
-                }
                 oe_inverted = of_device_is_compatible(np, "qca,ar9340-gpio");
         } else if (pdata) {
                 ath79_gpio_count = pdata->ngpios;
@@ -167,6 +249,11 @@ static int ath79_gpio_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
+        if (ath79_gpio_count >= 32) {
+                dev_err(&pdev->dev, "ngpios must be less than 32\n");
+                return -EINVAL;
+        }
+
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         ctrl->base = devm_ioremap_nocache(
                 &pdev->dev, res->start, resource_size(res));
@@ -174,21 +261,53 @@ static int ath79_gpio_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         spin_lock_init(&ctrl->lock);
-        memcpy(&ctrl->chip, &ath79_gpio_chip, sizeof(ctrl->chip));
-        ctrl->chip.parent = &pdev->dev;
-        ctrl->chip.ngpio = ath79_gpio_count;
-        if (oe_inverted) {
-                ctrl->chip.direction_input = ar934x_gpio_direction_input;
-                ctrl->chip.direction_output = ar934x_gpio_direction_output;
+        err = bgpio_init(&ctrl->gc, &pdev->dev, 4,
+                        ctrl->base + AR71XX_GPIO_REG_IN,
+                        ctrl->base + AR71XX_GPIO_REG_SET,
+                        ctrl->base + AR71XX_GPIO_REG_CLEAR,
+                        oe_inverted ? NULL : ctrl->base + AR71XX_GPIO_REG_OE,
+                        oe_inverted ? ctrl->base + AR71XX_GPIO_REG_OE : NULL,
+                        0);
+        if (err) {
+                dev_err(&pdev->dev, "bgpio_init failed\n");
+                return err;
         }
+        /* Use base 0 to stay compatible with legacy platforms */
+        ctrl->gc.base = 0;
 
-        err = gpiochip_add_data(&ctrl->chip, ctrl);
+        err = gpiochip_add_data(&ctrl->gc, ctrl);
         if (err) {
                 dev_err(&pdev->dev,
                         "cannot add AR71xx GPIO chip, error=%d", err);
                 return err;
         }
 
+        if (np && !of_property_read_bool(np, "interrupt-controller"))
+                return 0;
+
+        err = gpiochip_irqchip_add(&ctrl->gc, &ath79_gpio_irqchip, 0,
+                                handle_simple_irq, IRQ_TYPE_NONE);
+        if (err) {
+                dev_err(&pdev->dev, "failed to add gpiochip_irqchip\n");
+                goto gpiochip_remove;
+        }
+
+        gpiochip_set_chained_irqchip(&ctrl->gc, &ath79_gpio_irqchip,
+                                platform_get_irq(pdev, 0),
+                                ath79_gpio_irq_handler);
+
+        return 0;
+
+gpiochip_remove:
+        gpiochip_remove(&ctrl->gc);
+        return err;
+}
+
+static int ath79_gpio_remove(struct platform_device *pdev)
+{
+        struct ath79_gpio_ctrl *ctrl = platform_get_drvdata(pdev);
+
+        gpiochip_remove(&ctrl->gc);
         return 0;
 }
 
@@ -198,6 +317,7 @@ static struct platform_driver ath79_gpio_driver = {
                 .of_match_table = ath79_gpio_of_match,
         },
         .probe = ath79_gpio_probe,
+        .remove = ath79_gpio_remove,
 };
 
 module_platform_driver(ath79_gpio_driver);
diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index b6c5abe85daf..2fd38d598f3d 100644
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -630,7 +630,7 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)
 
         bcm_kona_gpio_reset(kona_gpio);
 
-        ret = gpiochip_add_data(chip, kona_gpio);
+        ret = devm_gpiochip_add_data(dev, chip, kona_gpio);
         if (ret < 0) {
                 dev_err(dev, "Couldn't add GPIO chip -- %d\n", ret);
                 goto err_irq_domain;
diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
index d7644251e869..42d51c59ed50 100644
--- a/drivers/gpio/gpio-brcmstb.c
+++ b/drivers/gpio/gpio-brcmstb.c
@@ -233,17 +233,14 @@ static void brcmstb_gpio_irq_handler(struct irq_desc *desc)
         struct gpio_chip *gc = irq_desc_get_handler_data(desc);
         struct brcmstb_gpio_priv *priv = brcmstb_gpio_gc_to_priv(gc);
         struct irq_chip *chip = irq_desc_get_chip(desc);
-        struct list_head *pos;
+        struct brcmstb_gpio_bank *bank;
 
         /* Interrupts weren't properly cleared during probe */
         BUG_ON(!priv || !chip);
 
         chained_irq_enter(chip, desc);
-        list_for_each(pos, &priv->bank_list) {
-                struct brcmstb_gpio_bank *bank =
-                        list_entry(pos, struct brcmstb_gpio_bank, node);
+        list_for_each_entry(bank, &priv->bank_list, node)
                 brcmstb_gpio_irq_bank_handler(bank);
-        }
         chained_irq_exit(chip, desc);
 }
 
@@ -280,7 +277,6 @@ static int brcmstb_gpio_sanity_check_banks(struct device *dev,
 static int brcmstb_gpio_remove(struct platform_device *pdev)
 {
         struct brcmstb_gpio_priv *priv = platform_get_drvdata(pdev);
-        struct list_head *pos;
         struct brcmstb_gpio_bank *bank;
         int ret = 0;
 
@@ -293,10 +289,9 @@ static int brcmstb_gpio_remove(struct platform_device *pdev)
          * You can lose return values below, but we report all errors, and it's
          * more important to actually perform all of the steps.
          */
-        list_for_each(pos, &priv->bank_list) {
-                bank = list_entry(pos, struct brcmstb_gpio_bank, node);
+        list_for_each_entry(bank, &priv->bank_list, node)
                 gpiochip_remove(&bank->gc);
-        }
+
         if (priv->reboot_notifier.notifier_call) {
                 ret = unregister_reboot_notifier(&priv->reboot_notifier);
                 if (ret)
diff --git a/drivers/gpio/gpio-clps711x.c b/drivers/gpio/gpio-clps711x.c
index c84f9551f108..5a690256af9b 100644
--- a/drivers/gpio/gpio-clps711x.c
+++ b/drivers/gpio/gpio-clps711x.c
@@ -67,15 +67,7 @@ static int clps711x_gpio_probe(struct platform_device *pdev)
         gc->owner = THIS_MODULE;
         platform_set_drvdata(pdev, gc);
 
-        return gpiochip_add_data(gc, NULL);
-}
-
-static int clps711x_gpio_remove(struct platform_device *pdev)
-{
-        struct gpio_chip *gc = platform_get_drvdata(pdev);
-
-        gpiochip_remove(gc);
-        return 0;
+        return devm_gpiochip_add_data(&pdev->dev, gc, NULL);
 }
 
 static const struct of_device_id __maybe_unused clps711x_gpio_ids[] = {
@@ -90,7 +82,6 @@ static struct platform_driver clps711x_gpio_driver = {
                 .of_match_table = of_match_ptr(clps711x_gpio_ids),
         },
         .probe  = clps711x_gpio_probe,
-        .remove = clps711x_gpio_remove,
 };
 module_platform_driver(clps711x_gpio_driver);
 
diff --git a/drivers/gpio/gpio-crystalcove.c b/drivers/gpio/gpio-crystalcove.c
index 7865ef0d3352..7c446d118cd6 100644
--- a/drivers/gpio/gpio-crystalcove.c
+++ b/drivers/gpio/gpio-crystalcove.c
@@ -345,7 +345,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev)
         cg->chip.dbg_show = crystalcove_gpio_dbg_show;
         cg->regmap = pmic->regmap;
 
-        retval = gpiochip_add_data(&cg->chip, cg);
+        retval = devm_gpiochip_add_data(&pdev->dev, &cg->chip, cg);
         if (retval) {
                 dev_warn(&pdev->dev, "add gpio chip error: %d\n", retval);
                 return retval;
@@ -359,14 +359,10 @@ static int crystalcove_gpio_probe(struct platform_device *pdev)
 
         if (retval) {
                 dev_warn(&pdev->dev, "request irq failed: %d\n", retval);
-                goto out_remove_gpio;
+                return retval;
         }
 
         return 0;
-
-out_remove_gpio:
-        gpiochip_remove(&cg->chip);
-        return retval;
 }
 
 static int crystalcove_gpio_remove(struct platform_device *pdev)
@@ -374,7 +370,6 @@ static int crystalcove_gpio_remove(struct platform_device *pdev)
         struct crystalcove_gpio *cg = platform_get_drvdata(pdev);
         int irq = platform_get_irq(pdev, 0);
 
-        gpiochip_remove(&cg->chip);
         if (irq >= 0)
                 free_irq(irq, cg);
         return 0;
diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c
index eccb712e09fb..90278b19aa0e 100644
--- a/drivers/gpio/gpio-cs5535.c
+++ b/drivers/gpio/gpio-cs5535.c
@@ -320,13 +320,13 @@ static int cs5535_gpio_probe(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
         if (!res) {
                 dev_err(&pdev->dev, "can't fetch device resource info\n");
-                goto done;
+                return err;
         }
 
         if (!devm_request_region(&pdev->dev, res->start, resource_size(res),
                                  pdev->name)) {
                 dev_err(&pdev->dev, "can't request region\n");
-                goto done;
+                return err;
         }
 
         /* set up the driver-specific struct */
@@ -348,19 +348,10 @@ static int cs5535_gpio_probe(struct platform_device *pdev)
                                 mask_orig, mask);
 
         /* finally, register with the generic GPIO API */
-        err = gpiochip_add_data(&cs5535_gpio_chip.chip, &cs5535_gpio_chip);
+        err = devm_gpiochip_add_data(&pdev->dev, &cs5535_gpio_chip.chip,
+                                     &cs5535_gpio_chip);
         if (err)
-                goto done;
-
-        return 0;
-
-done:
-        return err;
-}
-
-static int cs5535_gpio_remove(struct platform_device *pdev)
-{
-        gpiochip_remove(&cs5535_gpio_chip.chip);
+                return err;
 
         return 0;
 }
@@ -370,7 +361,6 @@ static struct platform_driver cs5535_gpio_driver = {
                 .name = DRV_NAME,
         },
         .probe = cs5535_gpio_probe,
-        .remove = cs5535_gpio_remove,
 };
 
 module_platform_driver(cs5535_gpio_driver);
diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index f9b3247ad14b..e29553b7ccdb 100644
--- a/drivers/gpio/gpio-da9052.c
+++ b/drivers/gpio/gpio-da9052.c
@@ -214,7 +214,7 @@ static int da9052_gpio_probe(struct platform_device *pdev)
         if (pdata && pdata->gpio_base)
                 gpio->gp.base = pdata->gpio_base;
 
-        ret = gpiochip_add_data(&gpio->gp, gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gp, gpio);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
                 return ret;
@@ -225,17 +225,8 @@ static int da9052_gpio_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int da9052_gpio_remove(struct platform_device *pdev)
-{
-        struct da9052_gpio *gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&gpio->gp);
-        return 0;
-}
-
 static struct platform_driver da9052_gpio_driver = {
         .probe = da9052_gpio_probe,
-        .remove = da9052_gpio_remove,
         .driver = {
                 .name   = "da9052-gpio",
         },
diff --git a/drivers/gpio/gpio-da9055.c b/drivers/gpio/gpio-da9055.c
index 18210fb2cb13..2c2c18dc6c4f 100644
--- a/drivers/gpio/gpio-da9055.c
+++ b/drivers/gpio/gpio-da9055.c
@@ -151,31 +151,19 @@ static int da9055_gpio_probe(struct platform_device *pdev)
         if (pdata && pdata->gpio_base)
                 gpio->gp.base = pdata->gpio_base;
 
-        ret = gpiochip_add_data(&gpio->gp, gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gp, gpio);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
-                goto err_mem;
+                return ret;
         }
 
         platform_set_drvdata(pdev, gpio);
 
         return 0;
-
-err_mem:
-        return ret;
-}
-
-static int da9055_gpio_remove(struct platform_device *pdev)
-{
-        struct da9055_gpio *gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&gpio->gp);
-        return 0;
 }
 
 static struct platform_driver da9055_gpio_driver = {
         .probe = da9055_gpio_probe,
-        .remove = da9055_gpio_remove,
         .driver = {
                 .name   = "da9055-gpio",
         },
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index cd007a67b302..dd262f00295d 100644
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -258,6 +258,8 @@ static int davinci_gpio_probe(struct platform_device *pdev)
                 spin_lock_init(&chips[i].lock);
 
                 regs = gpio2regs(base);
+                if (!regs)
+                        return -ENXIO;
                 chips[i].regs = regs;
                 chips[i].set_data = &regs->set_data;
                 chips[i].clr_data = &regs->clr_data;
@@ -433,8 +435,7 @@ static struct irq_chip *davinci_gpio_get_irq_chip(unsigned int irq)
 {
         static struct irq_chip_type gpio_unbanked;
 
-        gpio_unbanked = *container_of(irq_get_chip(irq),
-                                      struct irq_chip_type, chip);
+        gpio_unbanked = *irq_data_get_chip_type(irq_get_irq_data(irq));
 
         return &gpio_unbanked.chip;
 };
diff --git a/drivers/gpio/gpio-dln2.c b/drivers/gpio/gpio-dln2.c
index e11a7d126e74..f7a60a441e95 100644
--- a/drivers/gpio/gpio-dln2.c
+++ b/drivers/gpio/gpio-dln2.c
@@ -479,40 +479,32 @@ static int dln2_gpio_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, dln2);
 
-        ret = gpiochip_add_data(&dln2->gpio, dln2);
+        ret = devm_gpiochip_add_data(dev, &dln2->gpio, dln2);
         if (ret < 0) {
                 dev_err(dev, "failed to add gpio chip: %d\n", ret);
-                goto out;
+                return ret;
         }
 
         ret = gpiochip_irqchip_add(&dln2->gpio, &dln2_gpio_irqchip, 0,
                                    handle_simple_irq, IRQ_TYPE_NONE);
         if (ret < 0) {
                 dev_err(dev, "failed to add irq chip: %d\n", ret);
-                goto out_gpiochip_remove;
+                return ret;
         }
 
         ret = dln2_register_event_cb(pdev, DLN2_GPIO_CONDITION_MET_EV,
                                      dln2_gpio_event);
         if (ret) {
                 dev_err(dev, "failed to register event cb: %d\n", ret);
-                goto out_gpiochip_remove;
+                return ret;
         }
 
         return 0;
-
-out_gpiochip_remove:
-        gpiochip_remove(&dln2->gpio);
-out:
-        return ret;
 }
 
 static int dln2_gpio_remove(struct platform_device *pdev)
 {
-        struct dln2_gpio *dln2 = platform_get_drvdata(pdev);
-
         dln2_unregister_event_cb(pdev, DLN2_GPIO_CONDITION_MET_EV);
-        gpiochip_remove(&dln2->gpio);
 
         return 0;
 }
diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
index ad279078fed7..d054219e18b9 100644
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@ -339,7 +339,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, struct device *dev,
                 gc->to_irq = ep93xx_gpio_to_irq;
         }
 
-        return gpiochip_add_data(gc, NULL);
+        return devm_gpiochip_add_data(dev, gc, NULL);
 }
 
 static int ep93xx_gpio_probe(struct platform_device *pdev)
diff --git a/drivers/gpio/gpio-f7188x.c b/drivers/gpio/gpio-f7188x.c
index d62fd6bbaf82..daac2d480db1 100644
--- a/drivers/gpio/gpio-f7188x.c
+++ b/drivers/gpio/gpio-f7188x.c
@@ -1,5 +1,5 @@
 /*
- * GPIO driver for Fintek Super-I/O F71869, F71869A, F71882 and F71889
+ * GPIO driver for Fintek Super-I/O F71869, F71869A, F71882, F71889 and F81866
  *
  * Copyright (C) 2010-2013 LaCie
  *
@@ -36,14 +36,16 @@
 #define SIO_F71869A_ID          0x1007  /* F71869A chipset ID */
 #define SIO_F71882_ID           0x0541  /* F71882 chipset ID */
 #define SIO_F71889_ID           0x0909  /* F71889 chipset ID */
+#define SIO_F81866_ID           0x1010  /* F81866 chipset ID */
 
-enum chips { f71869, f71869a, f71882fg, f71889f };
+enum chips { f71869, f71869a, f71882fg, f71889f, f81866 };
 
 static const char * const f7188x_names[] = {
         "f71869",
         "f71869a",
         "f71882fg",
         "f71889f",
+        "f81866",
 };
 
 struct f7188x_sio {
@@ -190,6 +192,18 @@ static struct f7188x_gpio_bank f71889_gpio_bank[] = {
         F7188X_GPIO_BANK(70, 8, 0x80),
 };
 
+static struct f7188x_gpio_bank f81866_gpio_bank[] = {
+        F7188X_GPIO_BANK(0, 8, 0xF0),
+        F7188X_GPIO_BANK(10, 8, 0xE0),
+        F7188X_GPIO_BANK(20, 8, 0xD0),
+        F7188X_GPIO_BANK(30, 8, 0xC0),
+        F7188X_GPIO_BANK(40, 8, 0xB0),
+        F7188X_GPIO_BANK(50, 8, 0xA0),
+        F7188X_GPIO_BANK(60, 8, 0x90),
+        F7188X_GPIO_BANK(70, 8, 0x80),
+        F7188X_GPIO_BANK(80, 8, 0x88),
+};
+
 static int f7188x_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
 {
         int err;
@@ -318,6 +332,10 @@ static int f7188x_gpio_probe(struct platform_device *pdev)
                 data->nr_bank = ARRAY_SIZE(f71889_gpio_bank);
                 data->bank = f71889_gpio_bank;
                 break;
+        case f81866:
+                data->nr_bank = ARRAY_SIZE(f81866_gpio_bank);
+                data->bank = f81866_gpio_bank;
+                break;
         default:
                 return -ENODEV;
         }
@@ -332,37 +350,16 @@ static int f7188x_gpio_probe(struct platform_device *pdev)
                 bank->chip.parent = &pdev->dev;
                 bank->data = data;
 
-                err = gpiochip_add_data(&bank->chip, bank);
+                err = devm_gpiochip_add_data(&pdev->dev, &bank->chip, bank);
                 if (err) {
                         dev_err(&pdev->dev,
                                 "Failed to register gpiochip %d: %d\n",
                                 i, err);
-                        goto err_gpiochip;
+                        return err;
                 }
         }
 
         return 0;
-
-err_gpiochip:
-        for (i = i - 1; i >= 0; i--) {
-                struct f7188x_gpio_bank *bank = &data->bank[i];
-                gpiochip_remove(&bank->chip);
-        }
-
-        return err;
-}
-
-static int f7188x_gpio_remove(struct platform_device *pdev)
-{
-        int i;
-        struct f7188x_gpio_data *data = platform_get_drvdata(pdev);
-
-        for (i = 0; i < data->nr_bank; i++) {
-                struct f7188x_gpio_bank *bank = &data->bank[i];
-                gpiochip_remove(&bank->chip);
-        }
-
-        return 0;
 }
 
 static int __init f7188x_find(int addr, struct f7188x_sio *sio)
@@ -395,6 +392,9 @@ static int __init f7188x_find(int addr, struct f7188x_sio *sio)
         case SIO_F71889_ID:
                 sio->type = f71889f;
                 break;
+        case SIO_F81866_ID:
+                sio->type = f81866;
+                break;
         default:
                 pr_info(DRVNAME ": Unsupported Fintek device 0x%04x\n", devid);
                 goto err;
@@ -455,7 +455,6 @@ static struct platform_driver f7188x_gpio_driver = {
                 .name   = DRVNAME,
         },
         .probe          = f7188x_gpio_probe,
-        .remove         = f7188x_gpio_remove,
 };
 
 static int __init f7188x_gpio_init(void)
@@ -485,6 +484,6 @@ static void __exit f7188x_gpio_exit(void)
 }
 module_exit(f7188x_gpio_exit);
 
-MODULE_DESCRIPTION("GPIO driver for Super-I/O chips F71869, F71869A, F71882FG and F71889F");
+MODULE_DESCRIPTION("GPIO driver for Super-I/O chips F71869, F71869A, F71882FG, F71889F and F81866");
 MODULE_AUTHOR("Simon Guinot <simon.guinot@sequanux.org>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c
index cbbec838a9d1..8650b2916f87 100644
--- a/drivers/gpio/gpio-ge.c
+++ b/drivers/gpio/gpio-ge.c
@@ -89,7 +89,7 @@ static int __init gef_gpio_probe(struct platform_device *pdev)
         gc->of_node = pdev->dev.of_node;
 
         /* This function adds a memory mapped GPIO chip */
-        ret = gpiochip_add_data(gc, NULL);
+        ret = devm_gpiochip_add_data(&pdev->dev, gc, NULL);
         if (ret)
                 goto err0;
 
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index 2a4f2333a50b..54cddfa98f50 100644
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -628,15 +628,7 @@ static int bgpio_pdev_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, gc);
 
-        return gpiochip_add_data(gc, NULL);
-}
-
-static int bgpio_pdev_remove(struct platform_device *pdev)
-{
-        struct gpio_chip *gc = platform_get_drvdata(pdev);
-
-        gpiochip_remove(gc);
-        return 0;
+        return devm_gpiochip_add_data(&pdev->dev, gc, NULL);
 }
 
 static const struct platform_device_id bgpio_id_table[] = {
@@ -657,7 +649,6 @@ static struct platform_driver bgpio_driver = {
         },
         .id_table = bgpio_id_table,
         .probe = bgpio_pdev_probe,
-        .remove = bgpio_pdev_remove,
 };
 
 module_platform_driver(bgpio_driver);
diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
index a4893386abbf..4f6d643516b7 100644
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
@@ -20,6 +20,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/gpio.h>
@@ -384,8 +385,8 @@ static struct ichx_desc avoton_desc = {
         .use_outlvl_cache = true,
 };
 
-static int ichx_gpio_request_regions(struct resource *res_base,
-                                                const char *name, u8 use_gpio)
+static int ichx_gpio_request_regions(struct device *dev,
+        struct resource *res_base, const char *name, u8 use_gpio)
 {
         int i;
 
@@ -395,34 +396,12 @@ static int ichx_gpio_request_regions(struct resource *res_base,
         for (i = 0; i < ARRAY_SIZE(ichx_priv.desc->regs[0]); i++) {
                 if (!(use_gpio & (1 << i)))
                         continue;
-                if (!request_region(
+                if (!devm_request_region(dev,
                                 res_base->start + ichx_priv.desc->regs[0][i],
                                 ichx_priv.desc->reglen[i], name))
-                        goto request_err;
+                        return -EBUSY;
         }
         return 0;
-
-request_err:
-        /* Clean up: release already requested regions, if any */
-        for (i--; i >= 0; i--) {
-                if (!(use_gpio & (1 << i)))
-                        continue;
-                release_region(res_base->start + ichx_priv.desc->regs[0][i],
-                               ichx_priv.desc->reglen[i]);
-        }
-        return -EBUSY;
-}
-
-static void ichx_gpio_release_regions(struct resource *res_base, u8 use_gpio)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(ichx_priv.desc->regs[0]); i++) {
-                if (!(use_gpio & (1 << i)))
-                        continue;
-                release_region(res_base->start + ichx_priv.desc->regs[0][i],
-                               ichx_priv.desc->reglen[i]);
-        }
 }
 
 static int ichx_gpio_probe(struct platform_device *pdev)
@@ -468,7 +447,7 @@ static int ichx_gpio_probe(struct platform_device *pdev)
         spin_lock_init(&ichx_priv.lock);
         res_base = platform_get_resource(pdev, IORESOURCE_IO, ICH_RES_GPIO);
         ichx_priv.use_gpio = ich_info->use_gpio;
-        err = ichx_gpio_request_regions(res_base, pdev->name,
+        err = ichx_gpio_request_regions(&pdev->dev, res_base, pdev->name,
                                         ichx_priv.use_gpio);
         if (err)
                 return err;
@@ -489,8 +468,8 @@ static int ichx_gpio_probe(struct platform_device *pdev)
                 goto init;
         }
 
-        if (!request_region(res_pm->start, resource_size(res_pm),
-                        pdev->name)) {
+        if (!devm_request_region(&pdev->dev, res_pm->start,
+                        resource_size(res_pm), pdev->name)) {
                 pr_warn("ACPI BAR is busy, GPI 0 - 15 unavailable\n");
                 goto init;
         }
@@ -502,31 +481,19 @@ init:
         err = gpiochip_add_data(&ichx_priv.chip, NULL);
         if (err) {
                 pr_err("Failed to register GPIOs\n");
-                goto add_err;
+                return err;
         }
 
         pr_info("GPIO from %d to %d on %s\n", ichx_priv.chip.base,
                ichx_priv.chip.base + ichx_priv.chip.ngpio - 1, DRV_NAME);
 
         return 0;
-
-add_err:
-        ichx_gpio_release_regions(ichx_priv.gpio_base, ichx_priv.use_gpio);
-        if (ichx_priv.pm_base)
-                release_region(ichx_priv.pm_base->start,
-                                resource_size(ichx_priv.pm_base));
-        return err;
 }
 
 static int ichx_gpio_remove(struct platform_device *pdev)
 {
         gpiochip_remove(&ichx_priv.chip);
 
-        ichx_gpio_release_regions(ichx_priv.gpio_base, ichx_priv.use_gpio);
-        if (ichx_priv.pm_base)
-                release_region(ichx_priv.pm_base->start,
-                                resource_size(ichx_priv.pm_base));
-
         return 0;
 }
 
diff --git a/drivers/gpio/gpio-iop.c b/drivers/gpio/gpio-iop.c
index fb65e5850e0c..860c535922fd 100644
--- a/drivers/gpio/gpio-iop.c
+++ b/drivers/gpio/gpio-iop.c
@@ -114,7 +114,7 @@ static int iop3xx_gpio_probe(struct platform_device *pdev)
         if (IS_ERR(base))
                 return PTR_ERR(base);
 
-        return gpiochip_add_data(&iop3xx_chip, NULL);
+        return devm_gpiochip_add_data(&pdev->dev, &iop3xx_chip, NULL);
 }
 
 static struct platform_driver iop3xx_gpio_driver = {
diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index 482aa0353868..a8d0a6b8025a 100644
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -182,7 +182,7 @@ static int ttl_probe(struct platform_device *pdev)
         gpio->base = -1;
         gpio->ngpio = 20;
 
-        ret = gpiochip_add_data(gpio, NULL);
+        ret = devm_gpiochip_add_data(dev, gpio, NULL);
         if (ret) {
                 dev_err(dev, "unable to add GPIO chip\n");
                 return ret;
@@ -191,21 +191,11 @@ static int ttl_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int ttl_remove(struct platform_device *pdev)
-{
-        struct ttl_module *mod = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&mod->gpio);
-
-        return 0;
-}
-
 static struct platform_driver ttl_driver = {
         .driver         = {
                 .name   = DRV_NAME,
         },
         .probe          = ttl_probe,
-        .remove         = ttl_remove,
 };
 
 module_platform_driver(ttl_driver);
diff --git a/drivers/gpio/gpio-kempld.c b/drivers/gpio/gpio-kempld.c
index 01117747b965..701f1510328c 100644
--- a/drivers/gpio/gpio-kempld.c
+++ b/drivers/gpio/gpio-kempld.c
@@ -178,7 +178,7 @@ static int kempld_gpio_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        ret = gpiochip_add_data(chip, gpio);
+        ret = devm_gpiochip_add_data(dev, chip, gpio);
         if (ret) {
                 dev_err(dev, "Could not register GPIO chip\n");
                 return ret;
@@ -190,20 +190,11 @@ static int kempld_gpio_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int kempld_gpio_remove(struct platform_device *pdev)
-{
-        struct kempld_gpio_data *gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&gpio->chip);
-        return 0;
-}
-
 static struct platform_driver kempld_gpio_driver = {
         .driver = {
                 .name = "kempld-gpio",
         },
         .probe          = kempld_gpio_probe,
-        .remove         = kempld_gpio_remove,
 };
 
 module_platform_driver(kempld_gpio_driver);
diff --git a/drivers/gpio/gpio-ks8695.c b/drivers/gpio/gpio-ks8695.c
index 9f86ed9c753b..179723d02f55 100644
--- a/drivers/gpio/gpio-ks8695.c
+++ b/drivers/gpio/gpio-ks8695.c
@@ -205,18 +205,6 @@ static int ks8695_gpio_to_irq(struct gpio_chip *gc, unsigned int pin)
         return gpio_irq[pin];
 }
 
-/*
- * Map IRQ number to GPIO line.
- */
-int irq_to_gpio(unsigned int irq)
-{
-        if ((irq < KS8695_IRQ_EXTERN0) || (irq > KS8695_IRQ_EXTERN3))
-                return -EINVAL;
-
-        return (irq - KS8695_IRQ_EXTERN0);
-}
-EXPORT_SYMBOL(irq_to_gpio);
-
 /* GPIOLIB interface */
 
 static struct gpio_chip ks8695_gpio_chip = {
diff --git a/drivers/gpio/gpio-lp3943.c b/drivers/gpio/gpio-lp3943.c
index 1c8e2ae26938..6dc6725403ec 100644
--- a/drivers/gpio/gpio-lp3943.c
+++ b/drivers/gpio/gpio-lp3943.c
@@ -204,15 +204,8 @@ static int lp3943_gpio_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, lp3943_gpio);
 
-        return gpiochip_add_data(&lp3943_gpio->chip, lp3943_gpio);
-}
-
-static int lp3943_gpio_remove(struct platform_device *pdev)
-{
-        struct lp3943_gpio *lp3943_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&lp3943_gpio->chip);
-        return 0;
+        return devm_gpiochip_add_data(&pdev->dev, &lp3943_gpio->chip,
+                                      lp3943_gpio);
 }
 
 static const struct of_device_id lp3943_gpio_of_match[] = {
@@ -223,7 +216,6 @@ MODULE_DEVICE_TABLE(of, lp3943_gpio_of_match);
 
 static struct platform_driver lp3943_gpio_driver = {
         .probe = lp3943_gpio_probe,
-        .remove = lp3943_gpio_remove,
         .driver = {
                 .name = "lp3943-gpio",
                 .of_match_table = lp3943_gpio_of_match,
diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index 4cecf4ce96c1..d39014daeef9 100644
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -547,7 +547,7 @@ static int lpc32xx_gpio_probe(struct platform_device *pdev)
                         lpc32xx_gpiochip[i].chip.of_gpio_n_cells = 3;
                         lpc32xx_gpiochip[i].chip.of_node = pdev->dev.of_node;
                 }
-                gpiochip_add_data(&lpc32xx_gpiochip[i].chip,
+                devm_gpiochip_add_data(&pdev->dev, &lpc32xx_gpiochip[i].chip,
                                   &lpc32xx_gpiochip[i]);
         }
 
diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c
index 13107772be4f..9df015e85ad9 100644
--- a/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@ -370,7 +370,7 @@ static int lp_gpio_probe(struct platform_device *pdev)
         gc->can_sleep = false;
         gc->parent = dev;
 
-        ret = gpiochip_add_data(gc, lg);
+        ret = devm_gpiochip_add_data(dev, gc, lg);
         if (ret) {
                 dev_err(dev, "failed adding lp-gpio chip\n");
                 return ret;
@@ -439,9 +439,7 @@ MODULE_DEVICE_TABLE(acpi, lynxpoint_gpio_acpi_match);
 
 static int lp_gpio_remove(struct platform_device *pdev)
 {
-        struct lp_gpio *lg = platform_get_drvdata(pdev);
         pm_runtime_disable(&pdev->dev);
-        gpiochip_remove(&lg->chip);
         return 0;
 }
 
diff --git a/drivers/gpio/gpio-mc9s08dz60.c b/drivers/gpio/gpio-mc9s08dz60.c
index ba22fb92a6e7..14f252f9eb29 100644
--- a/drivers/gpio/gpio-mc9s08dz60.c
+++ b/drivers/gpio/gpio-mc9s08dz60.c
@@ -103,17 +103,7 @@ static int mc9s08dz60_probe(struct i2c_client *client,
         mc9s->client = client;
         i2c_set_clientdata(client, mc9s);
 
-        return gpiochip_add_data(&mc9s->chip, mc9s);
-}
-
-static int mc9s08dz60_remove(struct i2c_client *client)
-{
-        struct mc9s08dz60 *mc9s;
-
-        mc9s = i2c_get_clientdata(client);
-
-        gpiochip_remove(&mc9s->chip);
-        return 0;
+        return devm_gpiochip_add_data(&client->dev, &mc9s->chip, mc9s);
 }
 
 static const struct i2c_device_id mc9s08dz60_id[] = {
@@ -128,7 +118,6 @@ static struct i2c_driver mc9s08dz60_i2c_driver = {
                 .name = "mc9s08dz60",
         },
         .probe = mc9s08dz60_probe,
-        .remove = mc9s08dz60_remove,
         .id_table = mc9s08dz60_id,
 };
 
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index c767879e4dd9..47e486910aab 100644
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -31,6 +31,7 @@
 #define MCP_TYPE_S17    1
 #define MCP_TYPE_008    2
 #define MCP_TYPE_017    3
+#define MCP_TYPE_S18    4
 
 /* Registers are all 8 bits wide.
  *
@@ -48,6 +49,7 @@
 #       define IOCON_HAEN       (1 << 3)
 #       define IOCON_ODR        (1 << 2)
 #       define IOCON_INTPOL     (1 << 1)
+#       define IOCON_INTCC      (1)
 #define MCP_GPPU        0x06
 #define MCP_INTF        0x07
 #define MCP_INTCAP      0x08
@@ -617,6 +619,12 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
                 mcp->chip.ngpio = 16;
                 mcp->chip.label = "mcp23s17";
                 break;
+
+        case MCP_TYPE_S18:
+                mcp->ops = &mcp23s17_ops;
+                mcp->chip.ngpio = 16;
+                mcp->chip.label = "mcp23s18";
+                break;
 #endif /* CONFIG_SPI_MASTER */
 
 #if IS_ENABLED(CONFIG_I2C)
@@ -657,8 +665,7 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
                         of_property_read_bool(mcp->chip.parent->of_node,
                                               "microchip,irq-active-high");
 
-                if (type == MCP_TYPE_017)
-                        mirror = pdata->mirror;
+                mirror = pdata->mirror;
         }
 
         if ((status & IOCON_SEQOP) || !(status & IOCON_HAEN) || mirror ||
@@ -674,6 +681,9 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
                 if (mirror)
                         status |= IOCON_MIRROR | (IOCON_MIRROR << 8);
 
+                if (type == MCP_TYPE_S18)
+                        status |= IOCON_INTCC | (IOCON_INTCC << 8);
+
                 status = mcp->ops->write(mcp, MCP_IOCON, status);
                 if (status < 0)
                         goto fail;
@@ -735,6 +745,10 @@ static const struct of_device_id mcp23s08_spi_of_match[] = {
                 .compatible = "microchip,mcp23s17",
                 .data = (void *) MCP_TYPE_S17,
         },
+        {
+                .compatible = "microchip,mcp23s18",
+                .data = (void *) MCP_TYPE_S18,
+        },
 /* NOTE: The use of the mcp prefix is deprecated and will be removed. */
         {
                 .compatible = "mcp,mcp23s08",
@@ -803,6 +817,8 @@ static int mcp230xx_probe(struct i2c_client *client,
                         pdata = devm_kzalloc(&client->dev,
                                         sizeof(struct mcp23s08_platform_data),
                                         GFP_KERNEL);
+                        if (!pdata)
+                                return -ENOMEM;
                         pdata->base = -1;
                 }
         }
@@ -969,8 +985,8 @@ static int mcp23s08_probe(struct spi_device *spi)
                         goto fail;
 
                 if (pdata->base != -1)
-                        pdata->base += (type == MCP_TYPE_S17) ? 16 : 8;
-                ngpio += (type == MCP_TYPE_S17) ? 16 : 8;
+                        pdata->base += data->mcp[addr]->chip.ngpio;
+                ngpio += data->mcp[addr]->chip.ngpio;
         }
         data->ngpio = ngpio;
 
@@ -1012,6 +1028,7 @@ static int mcp23s08_remove(struct spi_device *spi)
 static const struct spi_device_id mcp23s08_ids[] = {
         { "mcp23s08", MCP_TYPE_S08 },
         { "mcp23s17", MCP_TYPE_S17 },
+        { "mcp23s18", MCP_TYPE_S18 },
         { },
 };
 MODULE_DEVICE_TABLE(spi, mcp23s08_ids);
diff --git a/drivers/gpio/gpio-menz127.c b/drivers/gpio/gpio-menz127.c
new file mode 100644
index 000000000000..a68e199d579d
--- /dev/null
+++ b/drivers/gpio/gpio-menz127.c
@@ -0,0 +1,200 @@
+/*
+ * MEN 16Z127 GPIO driver
+ *
+ * Copyright (C) 2016 MEN Mikroelektronik GmbH (www.men.de)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/err.h>
+#include <linux/mcb.h>
+#include <linux/bitops.h>
+#include <linux/gpio/driver.h>
+
+#define MEN_Z127_CTRL   0x00
+#define MEN_Z127_PSR    0x04
+#define MEN_Z127_IRQR   0x08
+#define MEN_Z127_GPIODR 0x0c
+#define MEN_Z127_IER1   0x10
+#define MEN_Z127_IER2   0x14
+#define MEN_Z127_DBER   0x18
+#define MEN_Z127_ODER   0x1C
+#define GPIO_TO_DBCNT_REG(gpio) ((gpio * 4) + 0x80)
+
+#define MEN_Z127_DB_MIN_US      50
+/* 16 bit compare register. Each bit represents 50us */
+#define MEN_Z127_DB_MAX_US      (0xffff * MEN_Z127_DB_MIN_US)
+#define MEN_Z127_DB_IN_RANGE(db)        ((db >= MEN_Z127_DB_MIN_US) && \
+                                         (db <= MEN_Z127_DB_MAX_US))
+
+struct men_z127_gpio {
+        struct gpio_chip gc;
+        void __iomem *reg_base;
+        struct mcb_device *mdev;
+        struct resource *mem;
+        spinlock_t lock;
+};
+
+static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio,
+                             unsigned debounce)
+{
+        struct men_z127_gpio *priv = gpiochip_get_data(gc);
+        struct device *dev = &priv->mdev->dev;
+        unsigned int rnd;
+        u32 db_en, db_cnt;
+
+        if (!MEN_Z127_DB_IN_RANGE(debounce)) {
+                dev_err(dev, "debounce value %u out of range", debounce);
+                return -EINVAL;
+        }
+
+        if (debounce > 0) {
+                /* round up or down depending on MSB-1 */
+                rnd = fls(debounce) - 1;
+
+                if (rnd && (debounce & BIT(rnd - 1)))
+                        debounce = round_up(debounce, MEN_Z127_DB_MIN_US);
+                else
+                        debounce = round_down(debounce, MEN_Z127_DB_MIN_US);
+
+                if (debounce > MEN_Z127_DB_MAX_US)
+                        debounce = MEN_Z127_DB_MAX_US;
+
+                /* 50us per register unit */
+                debounce /= 50;
+        }
+
+        spin_lock(&priv->lock);
+
+        db_en = readl(priv->reg_base + MEN_Z127_DBER);
+
+        if (debounce == 0) {
+                db_en &= ~BIT(gpio);
+                db_cnt = 0;
+        } else {
+                db_en |= BIT(gpio);
+                db_cnt = debounce;
+        }
+
+        writel(db_en, priv->reg_base + MEN_Z127_DBER);
+        writel(db_cnt, priv->reg_base + GPIO_TO_DBCNT_REG(gpio));
+
+        spin_unlock(&priv->lock);
+
+        return 0;
+}
+
+static int men_z127_request(struct gpio_chip *gc, unsigned gpio_pin)
+{
+        struct men_z127_gpio *priv = gpiochip_get_data(gc);
+        u32 od_en;
+
+        if (gpio_pin >= gc->ngpio)
+                return -EINVAL;
+
+        spin_lock(&priv->lock);
+        od_en = readl(priv->reg_base + MEN_Z127_ODER);
+
+        if (gpiochip_line_is_open_drain(gc, gpio_pin))
+                od_en |= BIT(gpio_pin);
+        else
+                od_en &= ~BIT(gpio_pin);
+
+        writel(od_en, priv->reg_base + MEN_Z127_ODER);
+        spin_unlock(&priv->lock);
+
+        return 0;
+}
+
+static int men_z127_probe(struct mcb_device *mdev,
+                          const struct mcb_device_id *id)
+{
+        struct men_z127_gpio *men_z127_gpio;
+        struct device *dev = &mdev->dev;
+        int ret;
+
+        men_z127_gpio = devm_kzalloc(dev, sizeof(struct men_z127_gpio),
+                                     GFP_KERNEL);
+        if (!men_z127_gpio)
+                return -ENOMEM;
+
+        men_z127_gpio->mem = mcb_request_mem(mdev, dev_name(dev));
+        if (IS_ERR(men_z127_gpio->mem)) {
+                dev_err(dev, "failed to request device memory");
+                return PTR_ERR(men_z127_gpio->mem);
+        }
+
+        men_z127_gpio->reg_base = ioremap(men_z127_gpio->mem->start,
+                                          resource_size(men_z127_gpio->mem));
+        if (men_z127_gpio->reg_base == NULL) {
+                ret = -ENXIO;
+                goto err_release;
+        }
+
+        men_z127_gpio->mdev = mdev;
+        mcb_set_drvdata(mdev, men_z127_gpio);
+
+        ret = bgpio_init(&men_z127_gpio->gc, &mdev->dev, 4,
+                         men_z127_gpio->reg_base + MEN_Z127_PSR,
+                         men_z127_gpio->reg_base + MEN_Z127_CTRL,
+                         NULL,
+                         men_z127_gpio->reg_base + MEN_Z127_GPIODR,
+                         NULL, 0);
+        if (ret)
+                goto err_unmap;
+
+        men_z127_gpio->gc.set_debounce = men_z127_debounce;
+        men_z127_gpio->gc.request = men_z127_request;
+
+        ret = gpiochip_add_data(&men_z127_gpio->gc, men_z127_gpio);
+        if (ret) {
+                dev_err(dev, "failed to register MEN 16Z127 GPIO controller");
+                goto err_unmap;
+        }
+
+        dev_info(dev, "MEN 16Z127 GPIO driver registered");
+
+        return 0;
+
+err_unmap:
+        iounmap(men_z127_gpio->reg_base);
+err_release:
+        mcb_release_mem(men_z127_gpio->mem);
+        return ret;
+}
+
+static void men_z127_remove(struct mcb_device *mdev)
+{
+        struct men_z127_gpio *men_z127_gpio = mcb_get_drvdata(mdev);
+
+        gpiochip_remove(&men_z127_gpio->gc);
+        iounmap(men_z127_gpio->reg_base);
+        mcb_release_mem(men_z127_gpio->mem);
+}
+
+static const struct mcb_device_id men_z127_ids[] = {
+        { .device = 0x7f },
+        { }
+};
+MODULE_DEVICE_TABLE(mcb, men_z127_ids);
+
+static struct mcb_driver men_z127_driver = {
+        .driver = {
+                .name = "z127-gpio",
+                .owner = THIS_MODULE,
+        },
+        .probe = men_z127_probe,
+        .remove = men_z127_remove,
+        .id_table = men_z127_ids,
+};
+module_mcb_driver(men_z127_driver);
+
+MODULE_AUTHOR("Andreas Werner <andreas.werner@men.de>");
+MODULE_DESCRIPTION("MEN 16z127 GPIO Controller");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("mcb:16z127");
diff --git a/drivers/gpio/gpio-moxart.c b/drivers/gpio/gpio-moxart.c
index ca604538ebf7..f02d0b490978 100644
--- a/drivers/gpio/gpio-moxart.c
+++ b/drivers/gpio/gpio-moxart.c
@@ -57,13 +57,10 @@ static int moxart_gpio_probe(struct platform_device *pdev)
         gc->label = "moxart-gpio";
         gc->request = gpiochip_generic_request;
         gc->free = gpiochip_generic_free;
-        gc->bgpio_data = gc->read_reg(gc->reg_set);
         gc->base = 0;
-        gc->ngpio = 32;
-        gc->parent = dev;
         gc->owner = THIS_MODULE;
 
-        ret = gpiochip_add_data(gc, NULL);
+        ret = devm_gpiochip_add_data(dev, gc, NULL);
         if (ret) {
                 dev_err(dev, "%s: gpiochip_add failed\n",
                         dev->of_node->full_name);
diff --git a/drivers/gpio/gpio-mpc5200.c b/drivers/gpio/gpio-mpc5200.c
index 0e5a6709f27d..fc10cf59691c 100644
--- a/drivers/gpio/gpio-mpc5200.c
+++ b/drivers/gpio/gpio-mpc5200.c
@@ -25,7 +25,6 @@
 #include <linux/of_platform.h>
 #include <linux/module.h>
 
-#include <asm/gpio.h>
 #include <asm/mpc52xx.h>
 #include <sysdev/fsl_soc.h>
 
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
index 9d40787e66c0..425501c39527 100644
--- a/drivers/gpio/gpio-mpc8xxx.c
+++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -1,7 +1,8 @@
 /*
- * GPIOs on MPC512x/8349/8572/8610 and compatible
+ * GPIOs on MPC512x/8349/8572/8610/QorIQ and compatible
  *
  * Copyright (C) 2008 Peter Korsgaard <jacmet@sunsite.dk>
+ * Copyright (C) 2016 Freescale Semiconductor Inc.
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2.  This program is licensed "as is" without any warranty of any
@@ -14,11 +15,12 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
-#include <linux/gpio.h>
 #include <linux/slab.h>
 #include <linux/irq.h>
+#include <linux/gpio/driver.h>
 
 #define MPC8XXX_GPIO_PINS       32
 
@@ -31,32 +33,17 @@
 #define GPIO_ICR2               0x18
 
 struct mpc8xxx_gpio_chip {
-        struct of_mm_gpio_chip mm_gc;
+        struct gpio_chip        gc;
+        void __iomem *regs;
         raw_spinlock_t lock;
 
-        /*
-         * shadowed data register to be able to clear/set output pins in
-         * open drain mode safely
-         */
-        u32 data;
+        int (*direction_output)(struct gpio_chip *chip,
+                                unsigned offset, int value);
+
         struct irq_domain *irq;
         unsigned int irqn;
-        const void *of_dev_id_data;
 };
 
-static inline u32 mpc8xxx_gpio2mask(unsigned int gpio)
-{
-        return 1u << (MPC8XXX_GPIO_PINS - 1 - gpio);
-}
-
-static void mpc8xxx_gpio_save_regs(struct of_mm_gpio_chip *mm)
-{
-        struct mpc8xxx_gpio_chip *mpc8xxx_gc =
-                container_of(mm, struct mpc8xxx_gpio_chip, mm_gc);
-
-        mpc8xxx_gc->data = in_be32(mm->regs + GPIO_DAT);
-}
-
 /* Workaround GPIO 1 errata on MPC8572/MPC8536. The status of GPIOs
  * defined as output cannot be determined by reading GPDAT register,
  * so we use shadow data register instead. The status of input pins
@@ -65,117 +52,36 @@ static void mpc8xxx_gpio_save_regs(struct of_mm_gpio_chip *mm)
 static int mpc8572_gpio_get(struct gpio_chip *gc, unsigned int gpio)
 {
         u32 val;
-        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = gpiochip_get_data(gc);
         u32 out_mask, out_shadow;
 
-        out_mask = in_be32(mm->regs + GPIO_DIR);
-
-        val = in_be32(mm->regs + GPIO_DAT) & ~out_mask;
-        out_shadow = mpc8xxx_gc->data & out_mask;
-
-        return !!((val | out_shadow) & mpc8xxx_gpio2mask(gpio));
-}
-
-static int mpc8xxx_gpio_get(struct gpio_chip *gc, unsigned int gpio)
-{
-        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
-
-        return in_be32(mm->regs + GPIO_DAT) & mpc8xxx_gpio2mask(gpio);
-}
-
-static void mpc8xxx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
-{
-        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
-        struct mpc8xxx_gpio_chip *mpc8xxx_gc = gpiochip_get_data(gc);
-        unsigned long flags;
-
-        raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
-
-        if (val)
-                mpc8xxx_gc->data |= mpc8xxx_gpio2mask(gpio);
-        else
-                mpc8xxx_gc->data &= ~mpc8xxx_gpio2mask(gpio);
-
-        out_be32(mm->regs + GPIO_DAT, mpc8xxx_gc->data);
-
-        raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
-}
-
-static void mpc8xxx_gpio_set_multiple(struct gpio_chip *gc,
-                                      unsigned long *mask, unsigned long *bits)
-{
-        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
-        struct mpc8xxx_gpio_chip *mpc8xxx_gc = gpiochip_get_data(gc);
-        unsigned long flags;
-        int i;
-
-        raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
-
-        for (i = 0; i < gc->ngpio; i++) {
-                if (*mask == 0)
-                        break;
-                if (__test_and_clear_bit(i, mask)) {
-                        if (test_bit(i, bits))
-                                mpc8xxx_gc->data |= mpc8xxx_gpio2mask(i);
-                        else
-                                mpc8xxx_gc->data &= ~mpc8xxx_gpio2mask(i);
-                }
-        }
-
-        out_be32(mm->regs + GPIO_DAT, mpc8xxx_gc->data);
-
-        raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
-}
-
-static int mpc8xxx_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
-{
-        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
-        struct mpc8xxx_gpio_chip *mpc8xxx_gc = gpiochip_get_data(gc);
-        unsigned long flags;
+        out_mask = gc->read_reg(mpc8xxx_gc->regs + GPIO_DIR);
+        val = gc->read_reg(mpc8xxx_gc->regs + GPIO_DAT) & ~out_mask;
+        out_shadow = gc->bgpio_data & out_mask;
 
-        raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
-
-        clrbits32(mm->regs + GPIO_DIR, mpc8xxx_gpio2mask(gpio));
-
-        raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
-
-        return 0;
+        return !!((val | out_shadow) & gc->pin2mask(gc, gpio));
 }
 
-static int mpc8xxx_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
+static int mpc5121_gpio_dir_out(struct gpio_chip *gc,
+                                unsigned int gpio, int val)
 {
-        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = gpiochip_get_data(gc);
-        unsigned long flags;
-
-        mpc8xxx_gpio_set(gc, gpio, val);
-
-        raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
-
-        setbits32(mm->regs + GPIO_DIR, mpc8xxx_gpio2mask(gpio));
-
-        raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
-
-        return 0;
-}
-
-static int mpc5121_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
-{
         /* GPIO 28..31 are input only on MPC5121 */
         if (gpio >= 28)
                 return -EINVAL;
 
-        return mpc8xxx_gpio_dir_out(gc, gpio, val);
+        return mpc8xxx_gc->direction_output(gc, gpio, val);
 }
 
-static int mpc5125_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
+static int mpc5125_gpio_dir_out(struct gpio_chip *gc,
+                                unsigned int gpio, int val)
 {
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = gpiochip_get_data(gc);
         /* GPIO 0..3 are input only on MPC5125 */
         if (gpio <= 3)
                 return -EINVAL;
 
-        return mpc8xxx_gpio_dir_out(gc, gpio, val);
+        return mpc8xxx_gc->direction_output(gc, gpio, val);
 }
 
 static int mpc8xxx_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
@@ -192,10 +98,11 @@ static void mpc8xxx_gpio_irq_cascade(struct irq_desc *desc)
 {
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_desc_get_handler_data(desc);
         struct irq_chip *chip = irq_desc_get_chip(desc);
-        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        struct gpio_chip *gc = &mpc8xxx_gc->gc;
         unsigned int mask;
 
-        mask = in_be32(mm->regs + GPIO_IER) & in_be32(mm->regs + GPIO_IMR);
+        mask = gc->read_reg(mpc8xxx_gc->regs + GPIO_IER)
+                & gc->read_reg(mpc8xxx_gc->regs + GPIO_IMR);
         if (mask)
                 generic_handle_irq(irq_linear_revmap(mpc8xxx_gc->irq,
                                                      32 - ffs(mask)));
@@ -206,12 +113,14 @@ static void mpc8xxx_gpio_irq_cascade(struct irq_desc *desc)
 static void mpc8xxx_irq_unmask(struct irq_data *d)
 {
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
-        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        struct gpio_chip *gc = &mpc8xxx_gc->gc;
         unsigned long flags;
 
         raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
 
-        setbits32(mm->regs + GPIO_IMR, mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
+        gc->write_reg(mpc8xxx_gc->regs + GPIO_IMR,
+                gc->read_reg(mpc8xxx_gc->regs + GPIO_IMR)
+                | gc->pin2mask(gc, irqd_to_hwirq(d)));
 
         raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
 }
@@ -219,12 +128,14 @@ static void mpc8xxx_irq_unmask(struct irq_data *d)
 static void mpc8xxx_irq_mask(struct irq_data *d)
 {
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
-        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        struct gpio_chip *gc = &mpc8xxx_gc->gc;
         unsigned long flags;
 
         raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
 
-        clrbits32(mm->regs + GPIO_IMR, mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
+        gc->write_reg(mpc8xxx_gc->regs + GPIO_IMR,
+                gc->read_reg(mpc8xxx_gc->regs + GPIO_IMR)
+                & ~(gc->pin2mask(gc, irqd_to_hwirq(d))));
 
         raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
 }
@@ -232,29 +143,32 @@ static void mpc8xxx_irq_mask(struct irq_data *d)
 static void mpc8xxx_irq_ack(struct irq_data *d)
 {
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
-        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        struct gpio_chip *gc = &mpc8xxx_gc->gc;
 
-        out_be32(mm->regs + GPIO_IER, mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
+        gc->write_reg(mpc8xxx_gc->regs + GPIO_IER,
+                      gc->pin2mask(gc, irqd_to_hwirq(d)));
 }
 
 static int mpc8xxx_irq_set_type(struct irq_data *d, unsigned int flow_type)
 {
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
-        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        struct gpio_chip *gc = &mpc8xxx_gc->gc;
         unsigned long flags;
 
         switch (flow_type) {
         case IRQ_TYPE_EDGE_FALLING:
                 raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
-                setbits32(mm->regs + GPIO_ICR,
-                          mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
+                gc->write_reg(mpc8xxx_gc->regs + GPIO_ICR,
+                        gc->read_reg(mpc8xxx_gc->regs + GPIO_ICR)
+                        | gc->pin2mask(gc, irqd_to_hwirq(d)));
                 raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
                 break;
 
         case IRQ_TYPE_EDGE_BOTH:
                 raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
-                clrbits32(mm->regs + GPIO_ICR,
-                          mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
+                gc->write_reg(mpc8xxx_gc->regs + GPIO_ICR,
+                        gc->read_reg(mpc8xxx_gc->regs + GPIO_ICR)
+                        & ~(gc->pin2mask(gc, irqd_to_hwirq(d))));
                 raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
                 break;
 
@@ -268,17 +182,17 @@ static int mpc8xxx_irq_set_type(struct irq_data *d, unsigned int flow_type)
 static int mpc512x_irq_set_type(struct irq_data *d, unsigned int flow_type)
 {
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
-        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        struct gpio_chip *gc = &mpc8xxx_gc->gc;
         unsigned long gpio = irqd_to_hwirq(d);
         void __iomem *reg;
         unsigned int shift;
         unsigned long flags;
 
         if (gpio < 16) {
-                reg = mm->regs + GPIO_ICR;
+                reg = mpc8xxx_gc->regs + GPIO_ICR;
                 shift = (15 - gpio) * 2;
         } else {
-                reg = mm->regs + GPIO_ICR2;
+                reg = mpc8xxx_gc->regs + GPIO_ICR2;
                 shift = (15 - (gpio % 16)) * 2;
         }
 
@@ -286,20 +200,22 @@ static int mpc512x_irq_set_type(struct irq_data *d, unsigned int flow_type)
         case IRQ_TYPE_EDGE_FALLING:
         case IRQ_TYPE_LEVEL_LOW:
                 raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
-                clrsetbits_be32(reg, 3 << shift, 2 << shift);
+                gc->write_reg(reg, (gc->read_reg(reg) & ~(3 << shift))
+                        | (2 << shift));
                 raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
                 break;
 
         case IRQ_TYPE_EDGE_RISING:
         case IRQ_TYPE_LEVEL_HIGH:
                 raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
-                clrsetbits_be32(reg, 3 << shift, 1 << shift);
+                gc->write_reg(reg, (gc->read_reg(reg) & ~(3 << shift))
+                        | (1 << shift));
                 raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
                 break;
 
         case IRQ_TYPE_EDGE_BOTH:
                 raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
-                clrbits32(reg, 3 << shift);
+                gc->write_reg(reg, (gc->read_reg(reg) & ~(3 << shift)));
                 raw_spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
                 break;
 
@@ -354,8 +270,6 @@ static const struct mpc8xxx_gpio_devtype mpc8572_gpio_devtype = {
 };
 
 static const struct mpc8xxx_gpio_devtype mpc8xxx_gpio_devtype_default = {
-        .gpio_dir_out = mpc8xxx_gpio_dir_out,
-        .gpio_get = mpc8xxx_gpio_get,
         .irq_set_type = mpc8xxx_irq_set_type,
 };
 
@@ -374,9 +288,7 @@ static int mpc8xxx_probe(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
         struct mpc8xxx_gpio_chip *mpc8xxx_gc;
-        struct of_mm_gpio_chip *mm_gc;
-        struct gpio_chip *gc;
-        const struct of_device_id *id;
+        struct gpio_chip        *gc;
         const struct mpc8xxx_gpio_devtype *devtype =
                 of_device_get_match_data(&pdev->dev);
         int ret;
@@ -389,12 +301,34 @@ static int mpc8xxx_probe(struct platform_device *pdev)
 
         raw_spin_lock_init(&mpc8xxx_gc->lock);
 
-        mm_gc = &mpc8xxx_gc->mm_gc;
-        gc = &mm_gc->gc;
+        mpc8xxx_gc->regs = of_iomap(np, 0);
+        if (!mpc8xxx_gc->regs)
+                return -ENOMEM;
+
+        gc = &mpc8xxx_gc->gc;
+
+        if (of_property_read_bool(np, "little-endian")) {
+                ret = bgpio_init(gc, &pdev->dev, 4,
+                                 mpc8xxx_gc->regs + GPIO_DAT,
+                                 NULL, NULL,
+                                 mpc8xxx_gc->regs + GPIO_DIR, NULL,
+                                 BGPIOF_BIG_ENDIAN);
+                if (ret)
+                        goto err;
+                dev_dbg(&pdev->dev, "GPIO registers are LITTLE endian\n");
+        } else {
+                ret = bgpio_init(gc, &pdev->dev, 4,
+                                 mpc8xxx_gc->regs + GPIO_DAT,
+                                 NULL, NULL,
+                                 mpc8xxx_gc->regs + GPIO_DIR, NULL,
+                                 BGPIOF_BIG_ENDIAN
+                                 | BGPIOF_BIG_ENDIAN_BYTE_ORDER);
+                if (ret)
+                        goto err;
+                dev_dbg(&pdev->dev, "GPIO registers are BIG endian\n");
+        }
 
-        mm_gc->save_regs = mpc8xxx_gpio_save_regs;
-        gc->ngpio = MPC8XXX_GPIO_PINS;
-        gc->direction_input = mpc8xxx_gpio_dir_in;
+        mpc8xxx_gc->direction_output = gc->direction_output;
 
         if (!devtype)
                 devtype = &mpc8xxx_gpio_devtype_default;
@@ -405,18 +339,22 @@ static int mpc8xxx_probe(struct platform_device *pdev)
          */
         mpc8xxx_irq_chip.irq_set_type = devtype->irq_set_type;
 
-        gc->direction_output = devtype->gpio_dir_out ?: mpc8xxx_gpio_dir_out;
-        gc->get = devtype->gpio_get ?: mpc8xxx_gpio_get;
-        gc->set = mpc8xxx_gpio_set;
-        gc->set_multiple = mpc8xxx_gpio_set_multiple;
+        if (devtype->gpio_dir_out)
+                gc->direction_output = devtype->gpio_dir_out;
+        if (devtype->gpio_get)
+                gc->get = devtype->gpio_get;
+
         gc->to_irq = mpc8xxx_gpio_to_irq;
 
-        ret = of_mm_gpiochip_add_data(np, mm_gc, mpc8xxx_gc);
-        if (ret)
-                return ret;
+        ret = gpiochip_add_data(gc, mpc8xxx_gc);
+        if (ret) {
+                pr_err("%s: GPIO chip registration failed with status %d\n",
+                       np->full_name, ret);
+                goto err;
+        }
 
         mpc8xxx_gc->irqn = irq_of_parse_and_map(np, 0);
-        if (mpc8xxx_gc->irqn == NO_IRQ)
+        if (!mpc8xxx_gc->irqn)
                 return 0;
 
         mpc8xxx_gc->irq = irq_domain_add_linear(np, MPC8XXX_GPIO_PINS,
@@ -424,18 +362,16 @@ static int mpc8xxx_probe(struct platform_device *pdev)
         if (!mpc8xxx_gc->irq)
                 return 0;
 
-        id = of_match_node(mpc8xxx_gpio_ids, np);
-        if (id)
-                mpc8xxx_gc->of_dev_id_data = id->data;
-
         /* ack and mask all irqs */
-        out_be32(mm_gc->regs + GPIO_IER, 0xffffffff);
-        out_be32(mm_gc->regs + GPIO_IMR, 0);
+        gc->write_reg(mpc8xxx_gc->regs + GPIO_IER, 0xffffffff);
+        gc->write_reg(mpc8xxx_gc->regs + GPIO_IMR, 0);
 
         irq_set_chained_handler_and_data(mpc8xxx_gc->irqn,
                                          mpc8xxx_gpio_irq_cascade, mpc8xxx_gc);
-
         return 0;
+err:
+        iounmap(mpc8xxx_gc->regs);
+        return ret;
 }
 
 static int mpc8xxx_remove(struct platform_device *pdev)
@@ -447,7 +383,8 @@ static int mpc8xxx_remove(struct platform_device *pdev)
                 irq_domain_remove(mpc8xxx_gc->irq);
         }
 
-        of_mm_gpiochip_remove(&mpc8xxx_gc->mm_gc);
+        gpiochip_remove(&mpc8xxx_gc->gc);
+        iounmap(mpc8xxx_gc->regs);
 
         return 0;
 }
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index a5eacc1dff09..11c6582ef0a6 100644
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -756,7 +756,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
                 BUG();
         }
 
-        gpiochip_add_data(&mvchip->chip, mvchip);
+        devm_gpiochip_add_data(&pdev->dev, &mvchip->chip, mvchip);
 
         /* Some gpio controllers do not provide irq support */
         if (!of_irq_count(np))
@@ -777,16 +777,14 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
         mvchip->irqbase = irq_alloc_descs(-1, 0, ngpios, -1);
         if (mvchip->irqbase < 0) {
                 dev_err(&pdev->dev, "no irqs\n");
-                err = mvchip->irqbase;
-                goto err_gpiochip_add;
+                return mvchip->irqbase;
         }
 
         gc = irq_alloc_generic_chip("mvebu_gpio_irq", 2, mvchip->irqbase,
                                     mvchip->membase, handle_level_irq);
         if (!gc) {
                 dev_err(&pdev->dev, "Cannot allocate generic irq_chip\n");
-                err = -ENOMEM;
-                goto err_gpiochip_add;
+                return -ENOMEM;
         }
 
         gc->private = mvchip;
@@ -828,9 +826,6 @@ err_generic_chip:
                                 IRQ_LEVEL | IRQ_NOPROBE);
         kfree(gc);
 
-err_gpiochip_add:
-        gpiochip_remove(&mvchip->chip);
-
         return err;
 }
 
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 7fd21cb53c81..1b342a3842c8 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -462,14 +462,14 @@ static int mxc_gpio_probe(struct platform_device *pdev)
         port->gc.base = (pdev->id < 0) ? of_alias_get_id(np, "gpio") * 32 :
                                              pdev->id * 32;
 
-        err = gpiochip_add_data(&port->gc, port);
+        err = devm_gpiochip_add_data(&pdev->dev, &port->gc, port);
         if (err)
                 goto out_bgio;
 
         irq_base = irq_alloc_descs(-1, 0, 32, numa_node_id());
         if (irq_base < 0) {
                 err = irq_base;
-                goto out_gpiochip_remove;
+                goto out_bgio;
         }
 
         port->domain = irq_domain_add_legacy(np, 32, irq_base, 0,
@@ -492,8 +492,6 @@ out_irqdomain_remove:
         irq_domain_remove(port->domain);
 out_irqdesc_free:
         irq_free_descs(irq_base, 32);
-out_gpiochip_remove:
-        gpiochip_remove(&port->gc);
 out_bgio:
         dev_info(&pdev->dev, "%s failed with errno %d\n", __func__, err);
         return err;
diff --git a/drivers/gpio/gpio-octeon.c b/drivers/gpio/gpio-octeon.c
index 7665ebcd0c1d..47aead1ed1cc 100644
--- a/drivers/gpio/gpio-octeon.c
+++ b/drivers/gpio/gpio-octeon.c
@@ -117,7 +117,7 @@ static int octeon_gpio_probe(struct platform_device *pdev)
         chip->get = octeon_gpio_get;
         chip->direction_output = octeon_gpio_dir_out;
         chip->set = octeon_gpio_set;
-        err = gpiochip_add_data(chip, gpio);
+        err = devm_gpiochip_add_data(&pdev->dev, chip, gpio);
         if (err)
                 goto out;
 
@@ -126,13 +126,6 @@ out:
         return err;
 }
 
-static int octeon_gpio_remove(struct platform_device *pdev)
-{
-        struct gpio_chip *chip = dev_get_platdata(&pdev->dev);
-        gpiochip_remove(chip);
-        return 0;
-}
-
 static struct of_device_id octeon_gpio_match[] = {
         {
                 .compatible = "cavium,octeon-3860-gpio",
@@ -147,7 +140,6 @@ static struct platform_driver octeon_gpio_driver = {
                 .of_match_table = octeon_gpio_match,
         },
         .probe          = octeon_gpio_probe,
-        .remove         = octeon_gpio_remove,
 };
 
 module_platform_driver(octeon_gpio_driver);
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 189f672bebc1..551dfa9d97ab 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -66,7 +66,6 @@ struct gpio_bank {
         u32 irq_usage;
         u32 dbck_enable_mask;
         bool dbck_enabled;
-        struct device *dev;
         bool is_mpuio;
         bool dbck_flag;
         bool loses_context;
@@ -627,7 +626,7 @@ static int omap_set_gpio_wakeup(struct gpio_bank *bank, unsigned offset,
         unsigned long flags;
 
         if (bank->non_wakeup_gpios & gpio_bit) {
-                dev_err(bank->dev,
+                dev_err(bank->chip.parent,
                         "Unable to modify wakeup on non-wakeup GPIO%d\n",
                         offset);
                 return -EINVAL;
@@ -669,7 +668,7 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
          * enable the bank module.
          */
         if (!BANK_USED(bank))
-                pm_runtime_get_sync(bank->dev);
+                pm_runtime_get_sync(chip->parent);
 
         raw_spin_lock_irqsave(&bank->lock, flags);
         omap_enable_gpio_module(bank, offset);
@@ -698,7 +697,7 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
          * disable the bank module.
          */
         if (!BANK_USED(bank))
-                pm_runtime_put(bank->dev);
+                pm_runtime_put(chip->parent);
 }
 
 /*
@@ -723,7 +722,7 @@ static irqreturn_t omap_gpio_irq_handler(int irq, void *gpiobank)
         if (WARN_ON(!isr_reg))
                 goto exit;
 
-        pm_runtime_get_sync(bank->dev);
+        pm_runtime_get_sync(bank->chip.parent);
 
         while (1) {
                 u32 isr_saved, level_mask = 0;
@@ -776,7 +775,7 @@ static irqreturn_t omap_gpio_irq_handler(int irq, void *gpiobank)
                 }
         }
 exit:
-        pm_runtime_put(bank->dev);
+        pm_runtime_put(bank->chip.parent);
         return IRQ_HANDLED;
 }
 
@@ -826,7 +825,7 @@ static void omap_gpio_irq_bus_lock(struct irq_data *data)
         struct gpio_bank *bank = omap_irq_data_get_bank(data);
 
         if (!BANK_USED(bank))
-                pm_runtime_get_sync(bank->dev);
+                pm_runtime_get_sync(bank->chip.parent);
 }
 
 static void gpio_irq_bus_sync_unlock(struct irq_data *data)
@@ -838,7 +837,7 @@ static void gpio_irq_bus_sync_unlock(struct irq_data *data)
          * disable the bank module.
          */
         if (!BANK_USED(bank))
-                pm_runtime_put(bank->dev);
+                pm_runtime_put(bank->chip.parent);
 }
 
 static void omap_gpio_ack_irq(struct irq_data *d)
@@ -1100,7 +1099,8 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
 
         ret = gpiochip_add_data(&bank->chip, bank);
         if (ret) {
-                dev_err(bank->dev, "Could not register gpio chip %d\n", ret);
+                dev_err(bank->chip.parent,
+                        "Could not register gpio chip %d\n", ret);
                 return ret;
         }
 
@@ -1114,7 +1114,7 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
          */
         irq_base = irq_alloc_descs(-1, 0, bank->width, 0);
         if (irq_base < 0) {
-                dev_err(bank->dev, "Couldn't allocate IRQ numbers\n");
+                dev_err(bank->chip.parent, "Couldn't allocate IRQ numbers\n");
                 return -ENODEV;
         }
 #endif
@@ -1131,15 +1131,17 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
                                    IRQ_TYPE_NONE);
 
         if (ret) {
-                dev_err(bank->dev, "Couldn't add irqchip to gpiochip %d\n", ret);
+                dev_err(bank->chip.parent,
+                        "Couldn't add irqchip to gpiochip %d\n", ret);
                 gpiochip_remove(&bank->chip);
                 return -ENODEV;
         }
 
         gpiochip_set_chained_irqchip(&bank->chip, irqc, bank->irq, NULL);
 
-        ret = devm_request_irq(bank->dev, bank->irq, omap_gpio_irq_handler,
-                               0, dev_name(bank->dev), bank);
+        ret = devm_request_irq(bank->chip.parent, bank->irq,
+                               omap_gpio_irq_handler,
+                               0, dev_name(bank->chip.parent), bank);
         if (ret)
                 gpiochip_remove(&bank->chip);
 
@@ -1196,7 +1198,6 @@ static int omap_gpio_probe(struct platform_device *pdev)
                 return bank->irq;
         }
 
-        bank->dev = dev;
         bank->chip.parent = dev;
         bank->chip.owner = THIS_MODULE;
         bank->dbck_flag = pdata->dbck_flag;
@@ -1235,9 +1236,9 @@ static int omap_gpio_probe(struct platform_device *pdev)
         }
 
         if (bank->dbck_flag) {
-                bank->dbck = devm_clk_get(bank->dev, "dbclk");
+                bank->dbck = devm_clk_get(dev, "dbclk");
                 if (IS_ERR(bank->dbck)) {
-                        dev_err(bank->dev,
+                        dev_err(dev,
                                 "Could not get gpio dbck. Disable debounce\n");
                         bank->dbck_flag = false;
                 } else {
@@ -1247,9 +1248,9 @@ static int omap_gpio_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, bank);
 
-        pm_runtime_enable(bank->dev);
-        pm_runtime_irq_safe(bank->dev);
-        pm_runtime_get_sync(bank->dev);
+        pm_runtime_enable(dev);
+        pm_runtime_irq_safe(dev);
+        pm_runtime_get_sync(dev);
 
         if (bank->is_mpuio)
                 omap_mpuio_init(bank);
@@ -1258,14 +1259,14 @@ static int omap_gpio_probe(struct platform_device *pdev)
 
         ret = omap_gpio_chip_init(bank, irqc);
         if (ret) {
-                pm_runtime_put_sync(bank->dev);
-                pm_runtime_disable(bank->dev);
+                pm_runtime_put_sync(dev);
+                pm_runtime_disable(dev);
                 return ret;
         }
 
         omap_gpio_show_rev(bank);
 
-        pm_runtime_put(bank->dev);
+        pm_runtime_put(dev);
 
         list_add_tail(&bank->node, &omap_gpio_list);
 
@@ -1278,7 +1279,7 @@ static int omap_gpio_remove(struct platform_device *pdev)
 
         list_del(&bank->node);
         gpiochip_remove(&bank->chip);
-        pm_runtime_disable(bank->dev);
+        pm_runtime_disable(&pdev->dev);
         if (bank->dbck_flag)
                 clk_unprepare(bank->dbck);
 
@@ -1348,7 +1349,7 @@ static int omap_gpio_runtime_suspend(struct device *dev)
 update_gpio_context_count:
         if (bank->get_context_loss_count)
                 bank->context_loss_count =
-                                bank->get_context_loss_count(bank->dev);
+                                bank->get_context_loss_count(dev);
 
         omap_gpio_dbck_disable(bank);
         raw_spin_unlock_irqrestore(&bank->lock, flags);
@@ -1378,7 +1379,7 @@ static int omap_gpio_runtime_resume(struct device *dev)
 
                 if (bank->get_context_loss_count)
                         bank->context_loss_count =
-                                bank->get_context_loss_count(bank->dev);
+                                bank->get_context_loss_count(dev);
         }
 
         omap_gpio_dbck_enable(bank);
@@ -1398,7 +1399,7 @@ static int omap_gpio_runtime_resume(struct device *dev)
                 if (!bank->get_context_loss_count) {
                         omap_gpio_restore_context(bank);
                 } else {
-                        c = bank->get_context_loss_count(bank->dev);
+                        c = bank->get_context_loss_count(dev);
                         if (c != bank->context_loss_count) {
                                 omap_gpio_restore_context(bank);
                         } else {
@@ -1481,7 +1482,7 @@ void omap2_gpio_prepare_for_idle(int pwr_mode)
 
                 bank->power_mode = pwr_mode;
 
-                pm_runtime_put_sync_suspend(bank->dev);
+                pm_runtime_put_sync_suspend(bank->chip.parent);
         }
 }
 
@@ -1493,7 +1494,7 @@ void omap2_gpio_resume_after_idle(void)
                 if (!BANK_USED(bank) || !bank->loses_context)
                         continue;
 
-                pm_runtime_get_sync(bank->dev);
+                pm_runtime_get_sync(bank->chip.parent);
         }
 }
 #endif
diff --git a/drivers/gpio/gpio-palmas.c b/drivers/gpio/gpio-palmas.c
index fdfb3b1e0def..6f27b3d94d53 100644
--- a/drivers/gpio/gpio-palmas.c
+++ b/drivers/gpio/gpio-palmas.c
@@ -195,7 +195,8 @@ static int palmas_gpio_probe(struct platform_device *pdev)
         else
                 palmas_gpio->gpio_chip.base = -1;
 
-        ret = gpiochip_add_data(&palmas_gpio->gpio_chip, palmas_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &palmas_gpio->gpio_chip,
+                                     palmas_gpio);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
                 return ret;
@@ -205,20 +206,11 @@ static int palmas_gpio_probe(struct platform_device *pdev)
         return ret;
 }
 
-static int palmas_gpio_remove(struct platform_device *pdev)
-{
-        struct palmas_gpio *palmas_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&palmas_gpio->gpio_chip);
-        return 0;
-}
-
 static struct platform_driver palmas_gpio_driver = {
         .driver.name    = "palmas-gpio",
         .driver.owner   = THIS_MODULE,
         .driver.of_match_table = of_palmas_gpio_match,
         .probe          = palmas_gpio_probe,
-        .remove         = palmas_gpio_remove,
 };
 
 static int __init palmas_gpio_init(void)
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 23196c5fc17c..d0d3065a7557 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -367,9 +367,11 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
         memcpy(reg_val, chip->reg_output, NBANK(chip));
         mutex_lock(&chip->i2c_lock);
         for(bank=0; bank<NBANK(chip); bank++) {
-                unsigned bankmask = mask[bank/4] >> ((bank % 4) * 8);
+                unsigned bankmask = mask[bank / sizeof(*mask)] >>
+                                    ((bank % sizeof(*mask)) * 8);
                 if(bankmask) {
-                        unsigned bankval  = bits[bank/4] >> ((bank % 4) * 8);
+                        unsigned bankval  = bits[bank / sizeof(*bits)] >>
+                                            ((bank % sizeof(*bits)) * 8);
                         reg_val[bank] = (reg_val[bank] & ~bankmask) | bankval;
                 }
         }
@@ -754,7 +756,7 @@ static int pca953x_probe(struct i2c_client *client,
         if (ret)
                 return ret;
 
-        ret = gpiochip_add_data(&chip->gpio_chip, chip);
+        ret = devm_gpiochip_add_data(&client->dev, &chip->gpio_chip, chip);
         if (ret)
                 return ret;
 
@@ -789,8 +791,6 @@ static int pca953x_remove(struct i2c_client *client)
                 }
         }
 
-        gpiochip_remove(&chip->gpio_chip);
-
         return 0;
 }
 
diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 709cd3fc2a70..169c09aa33c8 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -372,7 +372,7 @@ static int pcf857x_probe(struct i2c_client *client,
         gpio->out = ~n_latch;
         gpio->status = gpio->out;
 
-        status = gpiochip_add_data(&gpio->chip, gpio);
+        status = devm_gpiochip_add_data(&client->dev, &gpio->chip, gpio);
         if (status < 0)
                 goto fail;
 
@@ -383,7 +383,7 @@ static int pcf857x_probe(struct i2c_client *client,
                                               IRQ_TYPE_NONE);
                 if (status) {
                         dev_err(&client->dev, "cannot add irqchip\n");
-                        goto fail_irq;
+                        goto fail;
                 }
 
                 status = devm_request_threaded_irq(&client->dev, client->irq,
@@ -391,7 +391,7 @@ static int pcf857x_probe(struct i2c_client *client,
                                         IRQF_TRIGGER_FALLING | IRQF_SHARED,
                                         dev_name(&client->dev), gpio);
                 if (status)
-                        goto fail_irq;
+                        goto fail;
 
                 gpiochip_set_chained_irqchip(&gpio->chip, &pcf857x_irq_chip,
                                              client->irq, NULL);
@@ -413,9 +413,6 @@ static int pcf857x_probe(struct i2c_client *client,
 
         return 0;
 
-fail_irq:
-        gpiochip_remove(&gpio->chip);
-
 fail:
         dev_dbg(&client->dev, "probe error %d for '%s'\n", status,
                 client->name);
@@ -440,7 +437,6 @@ static int pcf857x_remove(struct i2c_client *client)
                 }
         }
 
-        gpiochip_remove(&gpio->chip);
         return status;
 }
 
diff --git a/drivers/gpio/gpio-pisosr.c b/drivers/gpio/gpio-pisosr.c
new file mode 100644
index 000000000000..cb14b8d1d512
--- /dev/null
+++ b/drivers/gpio/gpio-pisosr.c
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *      Andrew F. Davis <afd@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.
+ */
+
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/gpio/driver.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/spi/spi.h>
+
+#define DEFAULT_NGPIO 8
+
+/**
+ * struct pisosr_gpio - GPIO driver data
+ * @chip: GPIO controller chip
+ * @spi: SPI device pointer
+ * @buffer: Buffer for device reads
+ * @buffer_size: Size of buffer
+ * @load_gpio: GPIO pin used to load input into device
+ * @lock: Protects read sequences
+ */
+struct pisosr_gpio {
+        struct gpio_chip chip;
+        struct spi_device *spi;
+        u8 *buffer;
+        size_t buffer_size;
+        struct gpio_desc *load_gpio;
+        struct mutex lock;
+};
+
+static int pisosr_gpio_refresh(struct pisosr_gpio *gpio)
+{
+        int ret;
+
+        mutex_lock(&gpio->lock);
+
+        if (gpio->load_gpio) {
+                gpiod_set_value_cansleep(gpio->load_gpio, 1);
+                udelay(1); /* registers load time (~10ns) */
+                gpiod_set_value_cansleep(gpio->load_gpio, 0);
+                udelay(1); /* registers recovery time (~5ns) */
+        }
+
+        ret = spi_read(gpio->spi, gpio->buffer, gpio->buffer_size);
+
+        mutex_unlock(&gpio->lock);
+
+        return ret;
+}
+
+static int pisosr_gpio_get_direction(struct gpio_chip *chip,
+                                     unsigned offset)
+{
+        /* This device always input */
+        return 1;
+}
+
+static int pisosr_gpio_direction_input(struct gpio_chip *chip,
+                                       unsigned offset)
+{
+        /* This device always input */
+        return 0;
+}
+
+static int pisosr_gpio_direction_output(struct gpio_chip *chip,
+                                        unsigned offset, int value)
+{
+        /* This device is input only */
+        return -EINVAL;
+}
+
+static int pisosr_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+        struct pisosr_gpio *gpio = gpiochip_get_data(chip);
+
+        /* Refresh may not always be needed */
+        pisosr_gpio_refresh(gpio);
+
+        return (gpio->buffer[offset / 8] >> (offset % 8)) & 0x1;
+}
+
+static struct gpio_chip template_chip = {
+        .label                  = "pisosr-gpio",
+        .owner                  = THIS_MODULE,
+        .get_direction          = pisosr_gpio_get_direction,
+        .direction_input        = pisosr_gpio_direction_input,
+        .direction_output       = pisosr_gpio_direction_output,
+        .get                    = pisosr_gpio_get,
+        .base                   = -1,
+        .ngpio                  = DEFAULT_NGPIO,
+        .can_sleep              = true,
+};
+
+static int pisosr_gpio_probe(struct spi_device *spi)
+{
+        struct device *dev = &spi->dev;
+        struct pisosr_gpio *gpio;
+        int ret;
+
+        gpio = devm_kzalloc(dev, sizeof(*gpio), GFP_KERNEL);
+        if (!gpio)
+                return -ENOMEM;
+
+        spi_set_drvdata(spi, gpio);
+
+        gpio->chip = template_chip;
+        gpio->chip.parent = dev;
+        of_property_read_u16(dev->of_node, "ngpios", &gpio->chip.ngpio);
+
+        gpio->spi = spi;
+
+        gpio->buffer_size = DIV_ROUND_UP(gpio->chip.ngpio, 8);
+        gpio->buffer = devm_kzalloc(dev, gpio->buffer_size, GFP_KERNEL);
+        if (!gpio->buffer)
+                return -ENOMEM;
+
+        gpio->load_gpio = devm_gpiod_get_optional(dev, "load", GPIOD_OUT_LOW);
+        if (IS_ERR(gpio->load_gpio)) {
+                ret = PTR_ERR(gpio->load_gpio);
+                if (ret != -EPROBE_DEFER)
+                        dev_err(dev, "Unable to allocate load GPIO\n");
+                return ret;
+        }
+
+        mutex_init(&gpio->lock);
+
+        ret = gpiochip_add_data(&gpio->chip, gpio);
+        if (ret < 0) {
+                dev_err(dev, "Unable to register gpiochip\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int pisosr_gpio_remove(struct spi_device *spi)
+{
+        struct pisosr_gpio *gpio = spi_get_drvdata(spi);
+
+        gpiochip_remove(&gpio->chip);
+
+        mutex_destroy(&gpio->lock);
+
+        return 0;
+}
+
+static const struct spi_device_id pisosr_gpio_id_table[] = {
+        { "pisosr-gpio", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(spi, pisosr_gpio_id_table);
+
+static const struct of_device_id pisosr_gpio_of_match_table[] = {
+        { .compatible = "pisosr-gpio", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, pisosr_gpio_of_match_table);
+
+static struct spi_driver pisosr_gpio_driver = {
+        .driver = {
+                .name = "pisosr-gpio",
+                .of_match_table = pisosr_gpio_of_match_table,
+        },
+        .probe = pisosr_gpio_probe,
+        .remove = pisosr_gpio_remove,
+        .id_table = pisosr_gpio_id_table,
+};
+module_spi_driver(pisosr_gpio_driver);
+
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("SPI Compatible PISO Shift Register GPIO Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpio/gpio-rc5t583.c b/drivers/gpio/gpio-rc5t583.c
index 1e2d210b3369..1d6100fa312a 100644
--- a/drivers/gpio/gpio-rc5t583.c
+++ b/drivers/gpio/gpio-rc5t583.c
@@ -136,15 +136,8 @@ static int rc5t583_gpio_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, rc5t583_gpio);
 
-        return gpiochip_add_data(&rc5t583_gpio->gpio_chip, rc5t583_gpio);
-}
-
-static int rc5t583_gpio_remove(struct platform_device *pdev)
-{
-        struct rc5t583_gpio *rc5t583_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&rc5t583_gpio->gpio_chip);
-        return 0;
+        return devm_gpiochip_add_data(&pdev->dev, &rc5t583_gpio->gpio_chip,
+                                      rc5t583_gpio);
 }
 
 static struct platform_driver rc5t583_gpio_driver = {
@@ -152,7 +145,6 @@ static struct platform_driver rc5t583_gpio_driver = {
                 .name    = "rc5t583-gpio",
         },
         .probe          = rc5t583_gpio_probe,
-        .remove         = rc5t583_gpio_remove,
 };
 
 static int __init rc5t583_gpio_init(void)
diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c
index 96ddee3f464a..ec945b90f54d 100644
--- a/drivers/gpio/gpio-rdc321x.c
+++ b/drivers/gpio/gpio-rdc321x.c
@@ -194,23 +194,14 @@ static int rdc321x_gpio_probe(struct platform_device *pdev)
 
         dev_info(&pdev->dev, "registering %d GPIOs\n",
                                         rdc321x_gpio_dev->chip.ngpio);
-        return gpiochip_add_data(&rdc321x_gpio_dev->chip, rdc321x_gpio_dev);
-}
-
-static int rdc321x_gpio_remove(struct platform_device *pdev)
-{
-        struct rdc321x_gpio *rdc321x_gpio_dev = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&rdc321x_gpio_dev->chip);
-
-        return 0;
+        return devm_gpiochip_add_data(&pdev->dev, &rdc321x_gpio_dev->chip,
+                                      rdc321x_gpio_dev);
 }
 
 static struct platform_driver rdc321x_gpio_driver = {
         .driver.name    = "rdc321x-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = rdc321x_gpio_probe,
-        .remove         = rdc321x_gpio_remove,
 };
 
 module_platform_driver(rdc321x_gpio_driver);
diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c
index 5314ee4b947d..e85e7539cf5d 100644
--- a/drivers/gpio/gpio-sch.c
+++ b/drivers/gpio/gpio-sch.c
@@ -215,15 +215,7 @@ static int sch_gpio_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, sch);
 
-        return gpiochip_add_data(&sch->chip, sch);
-}
-
-static int sch_gpio_remove(struct platform_device *pdev)
-{
-        struct sch_gpio *sch = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&sch->chip);
-        return 0;
+        return devm_gpiochip_add_data(&pdev->dev, &sch->chip, sch);
 }
 
 static struct platform_driver sch_gpio_driver = {
@@ -231,7 +223,6 @@ static struct platform_driver sch_gpio_driver = {
                 .name = "sch_gpio",
         },
         .probe          = sch_gpio_probe,
-        .remove         = sch_gpio_remove,
 };
 
 module_platform_driver(sch_gpio_driver);
diff --git a/drivers/gpio/gpio-sch311x.c b/drivers/gpio/gpio-sch311x.c
index 1cbd77a04e7b..a03b38ee2e02 100644
--- a/drivers/gpio/gpio-sch311x.c
+++ b/drivers/gpio/gpio-sch311x.c
@@ -12,6 +12,7 @@
  * (at your option) any later version.
  */
 
+#include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -228,7 +229,8 @@ static int sch311x_gpio_probe(struct platform_device *pdev)
         int err, i;
 
         /* we can register all GPIO data registers at once */
-        if (!request_region(pdata->runtime_reg + GP1, 6, DRV_NAME)) {
+        if (!devm_request_region(&pdev->dev, pdata->runtime_reg + GP1, 6,
+                DRV_NAME)) {
                 dev_err(&pdev->dev, "Failed to request region 0x%04x-0x%04x.\n",
                         pdata->runtime_reg + GP1, pdata->runtime_reg + GP1 + 5);
                 return -EBUSY;
@@ -273,7 +275,6 @@ static int sch311x_gpio_probe(struct platform_device *pdev)
         return 0;
 
 exit_err:
-        release_region(pdata->runtime_reg + GP1, 6);
         /* release already registered chips */
         for (--i; i >= 0; i--)
                 gpiochip_remove(&priv->blocks[i].chip);
@@ -282,12 +283,9 @@ exit_err:
 
 static int sch311x_gpio_remove(struct platform_device *pdev)
 {
-        struct sch311x_pdev_data *pdata = dev_get_platdata(&pdev->dev);
         struct sch311x_gpio_priv *priv = platform_get_drvdata(pdev);
         int i;
 
-        release_region(pdata->runtime_reg + GP1, 6);
-
         for (i = 0; i < ARRAY_SIZE(priv->blocks); i++) {
                 gpiochip_remove(&priv->blocks[i].chip);
                 dev_info(&pdev->dev,
diff --git a/drivers/gpio/gpio-spear-spics.c b/drivers/gpio/gpio-spear-spics.c
index 50fb09080a6b..7ffd16495286 100644
--- a/drivers/gpio/gpio-spear-spics.c
+++ b/drivers/gpio/gpio-spear-spics.c
@@ -165,7 +165,7 @@ static int spics_gpio_probe(struct platform_device *pdev)
         spics->chip.owner = THIS_MODULE;
         spics->last_off = -1;
 
-        ret = gpiochip_add_data(&spics->chip, spics);
+        ret = devm_gpiochip_add_data(&pdev->dev, &spics->chip, spics);
         if (ret) {
                 dev_err(&pdev->dev, "unable to add gpio chip\n");
                 return ret;
diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c
index 83af1cb36333..0d5b8c525dd9 100644
--- a/drivers/gpio/gpio-sta2x11.c
+++ b/drivers/gpio/gpio-sta2x11.c
@@ -409,7 +409,7 @@ static int gsta_probe(struct platform_device *dev)
                 goto err_free_descs;
         }
 
-        err = gpiochip_add_data(&chip->gpio, chip);
+        err = devm_gpiochip_add_data(&dev->dev, &chip->gpio, chip);
         if (err < 0) {
                 dev_err(&dev->dev, "sta2x11 gpio: Can't register (%i)\n",
                         -err);
diff --git a/drivers/gpio/gpio-stp-xway.c b/drivers/gpio/gpio-stp-xway.c
index d11dd48570b2..19e654f88b3a 100644
--- a/drivers/gpio/gpio-stp-xway.c
+++ b/drivers/gpio/gpio-stp-xway.c
@@ -258,7 +258,7 @@ static int xway_stp_probe(struct platform_device *pdev)
 
         ret = xway_stp_hw_init(chip);
         if (!ret)
-                ret = gpiochip_add_data(&chip->gc, chip);
+                ret = devm_gpiochip_add_data(&pdev->dev, &chip->gc, chip);
 
         if (!ret)
                 dev_info(&pdev->dev, "Init done\n");
diff --git a/drivers/gpio/gpio-sx150x.c b/drivers/gpio/gpio-sx150x.c
index e6cff1cabd0c..d387eb524bf3 100644
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
@@ -687,7 +687,7 @@ static int sx150x_probe(struct i2c_client *client,
         if (rc < 0)
                 return rc;
 
-        rc = gpiochip_add_data(&chip->gpio_chip, chip);
+        rc = devm_gpiochip_add_data(&client->dev, &chip->gpio_chip, chip);
         if (rc)
                 return rc;
 
@@ -696,25 +696,12 @@ static int sx150x_probe(struct i2c_client *client,
                                         pdata->irq_summary,
                                         pdata->irq_base);
                 if (rc < 0)
-                        goto probe_fail_post_gpiochip_add;
+                        return rc;
         }
 
         i2c_set_clientdata(client, chip);
 
         return 0;
-probe_fail_post_gpiochip_add:
-        gpiochip_remove(&chip->gpio_chip);
-        return rc;
-}
-
-static int sx150x_remove(struct i2c_client *client)
-{
-        struct sx150x_chip *chip;
-
-        chip = i2c_get_clientdata(client);
-        gpiochip_remove(&chip->gpio_chip);
-
-        return 0;
 }
 
 static struct i2c_driver sx150x_driver = {
@@ -723,7 +710,6 @@ static struct i2c_driver sx150x_driver = {
                 .of_match_table = of_match_ptr(sx150x_of_match),
         },
         .probe    = sx150x_probe,
-        .remove   = sx150x_remove,
         .id_table = sx150x_id,
 };
 
diff --git a/drivers/gpio/gpio-syscon.c b/drivers/gpio/gpio-syscon.c
index e5c5b6205886..24b6d643ecdb 100644
--- a/drivers/gpio/gpio-syscon.c
+++ b/drivers/gpio/gpio-syscon.c
@@ -238,15 +238,7 @@ static int syscon_gpio_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, priv);
 
-        return gpiochip_add_data(&priv->chip, priv);
-}
-
-static int syscon_gpio_remove(struct platform_device *pdev)
-{
-        struct syscon_gpio_priv *priv = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&priv->chip);
-        return 0;
+        return devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv);
 }
 
 static struct platform_driver syscon_gpio_driver = {
@@ -255,7 +247,6 @@ static struct platform_driver syscon_gpio_driver = {
                 .of_match_table = syscon_gpio_ids,
         },
         .probe  = syscon_gpio_probe,
-        .remove = syscon_gpio_remove,
 };
 module_platform_driver(syscon_gpio_driver);
 
diff --git a/drivers/gpio/gpio-tb10x.c b/drivers/gpio/gpio-tb10x.c
index 5eaec20ddbc7..80b6959ae995 100644
--- a/drivers/gpio/gpio-tb10x.c
+++ b/drivers/gpio/gpio-tb10x.c
@@ -205,10 +205,10 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
         tb10x_gpio->gc.can_sleep        = false;
 
 
-        ret = gpiochip_add_data(&tb10x_gpio->gc, tb10x_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &tb10x_gpio->gc, tb10x_gpio);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Could not add gpiochip.\n");
-                goto fail_gpiochip_registration;
+                return ret;
         }
 
         platform_set_drvdata(pdev, tb10x_gpio);
@@ -219,7 +219,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
                 ret = platform_get_irq(pdev, 0);
                 if (ret < 0) {
                         dev_err(&pdev->dev, "No interrupt specified.\n");
-                        goto fail_get_irq;
+                        return ret;
                 }
 
                 tb10x_gpio->gc.to_irq   = tb10x_gpio_to_irq;
@@ -229,14 +229,13 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
                                 IRQF_TRIGGER_NONE | IRQF_SHARED,
                                 dev_name(&pdev->dev), tb10x_gpio);
                 if (ret != 0)
-                        goto fail_request_irq;
+                        return ret;
 
                 tb10x_gpio->domain = irq_domain_add_linear(dn,
                                                 tb10x_gpio->gc.ngpio,
                                                 &irq_generic_chip_ops, NULL);
                 if (!tb10x_gpio->domain) {
-                        ret = -ENOMEM;
-                        goto fail_irq_domain;
+                        return -ENOMEM;
                 }
 
                 ret = irq_alloc_domain_generic_chips(tb10x_gpio->domain,
@@ -244,7 +243,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
                                 handle_edge_irq, IRQ_NOREQUEST, IRQ_NOPROBE,
                                 IRQ_GC_INIT_MASK_CACHE);
                 if (ret)
-                        goto fail_irq_domain;
+                        return ret;
 
                 gc = tb10x_gpio->domain->gc->gc[0];
                 gc->reg_base                         = tb10x_gpio->base;
@@ -258,14 +257,6 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
         }
 
         return 0;
-
-fail_irq_domain:
-fail_request_irq:
-fail_get_irq:
-        gpiochip_remove(&tb10x_gpio->gc);
-fail_gpiochip_registration:
-fail_ioremap:
-        return ret;
 }
 
 static int tb10x_gpio_remove(struct platform_device *pdev)
@@ -278,7 +269,6 @@ static int tb10x_gpio_remove(struct platform_device *pdev)
                 kfree(tb10x_gpio->domain->gc);
                 irq_domain_remove(tb10x_gpio->domain);
         }
-        gpiochip_remove(&tb10x_gpio->gc);
 
         return 0;
 }
diff --git a/drivers/gpio/gpio-tc3589x.c b/drivers/gpio/gpio-tc3589x.c
index 05a27ec55add..4f566e6b81f1 100644
--- a/drivers/gpio/gpio-tc3589x.c
+++ b/drivers/gpio/gpio-tc3589x.c
@@ -272,7 +272,8 @@ static int tc3589x_gpio_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        ret = gpiochip_add_data(&tc3589x_gpio->chip, tc3589x_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &tc3589x_gpio->chip,
+                                     tc3589x_gpio);
         if (ret) {
                 dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
                 return ret;
@@ -299,20 +300,10 @@ static int tc3589x_gpio_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int tc3589x_gpio_remove(struct platform_device *pdev)
-{
-        struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&tc3589x_gpio->chip);
-
-        return 0;
-}
-
 static struct platform_driver tc3589x_gpio_driver = {
         .driver.name    = "tc3589x-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = tc3589x_gpio_probe,
-        .remove         = tc3589x_gpio_remove,
 };
 
 static int __init tc3589x_gpio_init(void)
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 9a1a7e2ef388..790bb111b2cb 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -545,7 +545,7 @@ static int tegra_gpio_probe(struct platform_device *pdev)
 
         tegra_gpio_chip.of_node = pdev->dev.of_node;
 
-        ret = gpiochip_add_data(&tegra_gpio_chip, NULL);
+        ret = devm_gpiochip_add_data(&pdev->dev, &tegra_gpio_chip, NULL);
         if (ret < 0) {
                 irq_domain_remove(irq_domain);
                 return ret;
diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index a6de10c5275b..85ed608c2b27 100644
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -237,12 +237,6 @@ static int timbgpio_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!iomem) {
-                dev_err(dev, "Unable to get resource\n");
-                return -EINVAL;
-        }
-
         tgpio = devm_kzalloc(dev, sizeof(struct timbgpio), GFP_KERNEL);
         if (!tgpio) {
                 dev_err(dev, "Memory alloc failed\n");
@@ -252,17 +246,10 @@ static int timbgpio_probe(struct platform_device *pdev)
 
         spin_lock_init(&tgpio->lock);
 
-        if (!devm_request_mem_region(dev, iomem->start, resource_size(iomem),
-                                     DRIVER_NAME)) {
-                dev_err(dev, "Region already claimed\n");
-                return -EBUSY;
-        }
-
-        tgpio->membase = devm_ioremap(dev, iomem->start, resource_size(iomem));
-        if (!tgpio->membase) {
-                dev_err(dev, "Cannot ioremap\n");
-                return -ENOMEM;
-        }
+        iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        tgpio->membase = devm_ioremap_resource(dev, iomem);
+        if (IS_ERR(tgpio->membase))
+                return PTR_ERR(tgpio->membase);
 
         gc = &tgpio->gpio;
 
@@ -279,7 +266,7 @@ static int timbgpio_probe(struct platform_device *pdev)
         gc->ngpio = pdata->nr_pins;
         gc->can_sleep = false;
 
-        err = gpiochip_add_data(gc, tgpio);
+        err = devm_gpiochip_add_data(&pdev->dev, gc, tgpio);
         if (err)
                 return err;
 
@@ -320,8 +307,6 @@ static int timbgpio_remove(struct platform_device *pdev)
                 irq_set_handler_data(irq, NULL);
         }
 
-        gpiochip_remove(&tgpio->gpio);
-
         return 0;
 }
 
diff --git a/drivers/gpio/gpio-tpic2810.c b/drivers/gpio/gpio-tpic2810.c
new file mode 100644
index 000000000000..9f020aa4b067
--- /dev/null
+++ b/drivers/gpio/gpio-tpic2810.c
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *      Andrew F. Davis <afd@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.
+ */
+
+#include <linux/gpio/driver.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+
+#define TPIC2810_WS_COMMAND 0x44
+
+/**
+ * struct tpic2810 - GPIO driver data
+ * @chip: GPIO controller chip
+ * @client: I2C device pointer
+ * @buffer: Buffer for device register
+ * @lock: Protects write sequences
+ */
+struct tpic2810 {
+        struct gpio_chip chip;
+        struct i2c_client *client;
+        u8 buffer;
+        struct mutex lock;
+};
+
+static void tpic2810_set(struct gpio_chip *chip, unsigned offset, int value);
+
+static int tpic2810_get_direction(struct gpio_chip *chip,
+                                  unsigned offset)
+{
+        /* This device always output */
+        return 0;
+}
+
+static int tpic2810_direction_input(struct gpio_chip *chip,
+                                    unsigned offset)
+{
+        /* This device is output only */
+        return -EINVAL;
+}
+
+static int tpic2810_direction_output(struct gpio_chip *chip,
+                                     unsigned offset, int value)
+{
+        /* This device always output */
+        tpic2810_set(chip, offset, value);
+        return 0;
+}
+
+static void tpic2810_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+        struct tpic2810 *gpio = gpiochip_get_data(chip);
+
+        mutex_lock(&gpio->lock);
+
+        if (value)
+                gpio->buffer |= BIT(offset);
+        else
+                gpio->buffer &= ~BIT(offset);
+
+        i2c_smbus_write_byte_data(gpio->client, TPIC2810_WS_COMMAND,
+                                  gpio->buffer);
+
+        mutex_unlock(&gpio->lock);
+}
+
+static void tpic2810_set_multiple(struct gpio_chip *chip, unsigned long *mask,
+                                  unsigned long *bits)
+{
+        struct tpic2810 *gpio = gpiochip_get_data(chip);
+
+        mutex_lock(&gpio->lock);
+
+        /* clear bits under mask */
+        gpio->buffer &= ~(*mask);
+        /* set bits under mask */
+        gpio->buffer |= ((*mask) & (*bits));
+
+        i2c_smbus_write_byte_data(gpio->client, TPIC2810_WS_COMMAND,
+                                  gpio->buffer);
+
+        mutex_unlock(&gpio->lock);
+}
+
+static struct gpio_chip template_chip = {
+        .label                  = "tpic2810",
+        .owner                  = THIS_MODULE,
+        .get_direction          = tpic2810_get_direction,
+        .direction_input        = tpic2810_direction_input,
+        .direction_output       = tpic2810_direction_output,
+        .set                    = tpic2810_set,
+        .set_multiple           = tpic2810_set_multiple,
+        .base                   = -1,
+        .ngpio                  = 8,
+        .can_sleep              = true,
+};
+
+static const struct of_device_id tpic2810_of_match_table[] = {
+        { .compatible = "ti,tpic2810" },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, tpic2810_of_match_table);
+
+static int tpic2810_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
+{
+        struct tpic2810 *gpio;
+        int ret;
+
+        gpio = devm_kzalloc(&client->dev, sizeof(*gpio), GFP_KERNEL);
+        if (!gpio)
+                return -ENOMEM;
+
+        i2c_set_clientdata(client, gpio);
+
+        gpio->chip = template_chip;
+        gpio->chip.parent = &client->dev;
+
+        gpio->client = client;
+
+        mutex_init(&gpio->lock);
+
+        ret = gpiochip_add_data(&gpio->chip, gpio);
+        if (ret < 0) {
+                dev_err(&client->dev, "Unable to register gpiochip\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int tpic2810_remove(struct i2c_client *client)
+{
+        struct tpic2810 *gpio = i2c_get_clientdata(client);
+
+        gpiochip_remove(&gpio->chip);
+
+        return 0;
+}
+
+static const struct i2c_device_id tpic2810_id_table[] = {
+        { "tpic2810", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(i2c, tpic2810_id_table);
+
+static struct i2c_driver tpic2810_driver = {
+        .driver = {
+                .name = "tpic2810",
+                .of_match_table = tpic2810_of_match_table,
+        },
+        .probe = tpic2810_probe,
+        .remove = tpic2810_remove,
+        .id_table = tpic2810_id_table,
+};
+module_i2c_driver(tpic2810_driver);
+
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPIC2810 8-Bit LED Driver GPIO Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpio/gpio-tps65218.c b/drivers/gpio/gpio-tps65218.c
new file mode 100644
index 000000000000..313c0e484607
--- /dev/null
+++ b/drivers/gpio/gpio-tps65218.c
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2015 Verifone Int.
+ *
+ * Author: Nicolas Saenz Julienne <nicolassaenzj@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify i t
+ * under  the terms of the GNU General  Public License as published by th e
+ * Free Software Foundation;  either version 2 of the License, or (at you r
+ * option) any later version.
+ *
+ * This driver is based on the gpio-tps65912 implementation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/gpio/driver.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/tps65218.h>
+
+struct tps65218_gpio {
+        struct tps65218 *tps65218;
+        struct gpio_chip gpio_chip;
+};
+
+static int tps65218_gpio_get(struct gpio_chip *gc, unsigned offset)
+{
+        struct tps65218_gpio *tps65218_gpio = gpiochip_get_data(gc);
+        struct tps65218 *tps65218 = tps65218_gpio->tps65218;
+        unsigned int val;
+        int ret;
+
+        ret = tps65218_reg_read(tps65218, TPS65218_REG_ENABLE2, &val);
+        if (ret)
+                return ret;
+
+        return !!(val & (TPS65218_ENABLE2_GPIO1 << offset));
+}
+
+static void tps65218_gpio_set(struct gpio_chip *gc, unsigned offset,
+                              int value)
+{
+        struct tps65218_gpio *tps65218_gpio = gpiochip_get_data(gc);
+        struct tps65218 *tps65218 = tps65218_gpio->tps65218;
+
+        if (value)
+                tps65218_set_bits(tps65218, TPS65218_REG_ENABLE2,
+                                  TPS65218_ENABLE2_GPIO1 << offset,
+                                  TPS65218_ENABLE2_GPIO1 << offset,
+                                  TPS65218_PROTECT_L1);
+        else
+                tps65218_clear_bits(tps65218, TPS65218_REG_ENABLE2,
+                                    TPS65218_ENABLE2_GPIO1 << offset,
+                                    TPS65218_PROTECT_L1);
+}
+
+static int tps65218_gpio_output(struct gpio_chip *gc, unsigned offset,
+                                int value)
+{
+        /* Only drives GPOs */
+        tps65218_gpio_set(gc, offset, value);
+        return 0;
+}
+
+static int tps65218_gpio_input(struct gpio_chip *gc, unsigned offset)
+{
+        return -EPERM;
+}
+
+static int tps65218_gpio_request(struct gpio_chip *gc, unsigned offset)
+{
+        struct tps65218_gpio *tps65218_gpio = gpiochip_get_data(gc);
+        struct tps65218 *tps65218 = tps65218_gpio->tps65218;
+        int ret;
+
+        if (gpiochip_line_is_open_source(gc, offset)) {
+                dev_err(gc->parent, "can't work as open source\n");
+                return -EINVAL;
+        }
+
+        switch (offset) {
+        case 0:
+                if (!gpiochip_line_is_open_drain(gc, offset)) {
+                        dev_err(gc->parent, "GPO1 works only as open drain\n");
+                        return -EINVAL;
+                }
+
+                /* Disable sequencer for GPO1 */
+                ret = tps65218_clear_bits(tps65218, TPS65218_REG_SEQ7,
+                                          TPS65218_SEQ7_GPO1_SEQ_MASK,
+                                          TPS65218_PROTECT_L1);
+                if (ret)
+                        return ret;
+
+                /* Setup GPO1 */
+                ret = tps65218_clear_bits(tps65218, TPS65218_REG_CONFIG1,
+                                          TPS65218_CONFIG1_IO1_SEL,
+                                          TPS65218_PROTECT_L1);
+                if (ret)
+                        return ret;
+
+                break;
+        case 1:
+                /* GP02 is push-pull by default, can be set as open drain. */
+                if (gpiochip_line_is_open_drain(gc, offset)) {
+                        ret = tps65218_clear_bits(tps65218,
+                                                  TPS65218_REG_CONFIG1,
+                                                  TPS65218_CONFIG1_GPO2_BUF,
+                                                  TPS65218_PROTECT_L1);
+                        if (ret)
+                                return ret;
+                }
+
+                /* Setup GPO2 */
+                ret = tps65218_clear_bits(tps65218, TPS65218_REG_CONFIG1,
+                                          TPS65218_CONFIG1_IO1_SEL,
+                                          TPS65218_PROTECT_L1);
+                if (ret)
+                        return ret;
+
+                break;
+
+        case 2:
+                if (!gpiochip_line_is_open_drain(gc, offset)) {
+                        dev_err(gc->parent, "GPO3 works only as open drain\n");
+                        return -EINVAL;
+                }
+
+                /* Disable sequencer for GPO3 */
+                ret = tps65218_clear_bits(tps65218, TPS65218_REG_SEQ7,
+                                          TPS65218_SEQ7_GPO3_SEQ_MASK,
+                                          TPS65218_PROTECT_L1);
+                if (ret)
+                        return ret;
+
+                /* Setup GPO3 */
+                ret = tps65218_clear_bits(tps65218, TPS65218_REG_CONFIG2,
+                                          TPS65218_CONFIG2_DC12_RST,
+                                          TPS65218_PROTECT_L1);
+                if (ret)
+                        return ret;
+
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static struct gpio_chip template_chip = {
+        .label                  = "gpio-tps65218",
+        .owner                  = THIS_MODULE,
+        .request                = tps65218_gpio_request,
+        .direction_output       = tps65218_gpio_output,
+        .direction_input        = tps65218_gpio_input,
+        .get                    = tps65218_gpio_get,
+        .set                    = tps65218_gpio_set,
+        .can_sleep              = true,
+        .ngpio                  = 3,
+        .base                   = -1,
+};
+
+static int tps65218_gpio_probe(struct platform_device *pdev)
+{
+        struct tps65218 *tps65218 = dev_get_drvdata(pdev->dev.parent);
+        struct tps65218_gpio *tps65218_gpio;
+        int ret;
+
+        tps65218_gpio = devm_kzalloc(&pdev->dev, sizeof(*tps65218_gpio),
+                                     GFP_KERNEL);
+        if (!tps65218_gpio)
+                return -ENOMEM;
+
+        tps65218_gpio->tps65218 = tps65218;
+        tps65218_gpio->gpio_chip = template_chip;
+        tps65218_gpio->gpio_chip.parent = &pdev->dev;
+#ifdef CONFIG_OF_GPIO
+        tps65218_gpio->gpio_chip.of_node = pdev->dev.of_node;
+#endif
+
+        ret = gpiochip_add_data(&tps65218_gpio->gpio_chip, tps65218_gpio);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to register gpiochip, %d\n", ret);
+                return ret;
+        }
+
+        platform_set_drvdata(pdev, tps65218_gpio);
+
+        return ret;
+}
+
+static int tps65218_gpio_remove(struct platform_device *pdev)
+{
+        struct tps65218_gpio *tps65218_gpio = platform_get_drvdata(pdev);
+
+        gpiochip_remove(&tps65218_gpio->gpio_chip);
+
+        return 0;
+}
+
+static const struct of_device_id tps65218_dt_match[] = {
+        { .compatible = "ti,tps65218-gpio" },
+        {  }
+};
+MODULE_DEVICE_TABLE(of, tps65218_dt_match);
+
+static struct platform_driver tps65218_gpio_driver = {
+        .driver = {
+                .name = "tps65218-gpio",
+                .of_match_table = of_match_ptr(tps65218_dt_match)
+        },
+        .probe = tps65218_gpio_probe,
+        .remove = tps65218_gpio_remove,
+};
+
+module_platform_driver(tps65218_gpio_driver);
+
+MODULE_AUTHOR("Nicolas Saenz Julienne <nicolassaenzj@gmail.com>");
+MODULE_DESCRIPTION("GPO interface for TPS65218 PMICs");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:tps65218-gpio");
diff --git a/drivers/gpio/gpio-tps6586x.c b/drivers/gpio/gpio-tps6586x.c
index 87de5486a29e..c88bdc8ee2c9 100644
--- a/drivers/gpio/gpio-tps6586x.c
+++ b/drivers/gpio/gpio-tps6586x.c
@@ -117,7 +117,8 @@ static int tps6586x_gpio_probe(struct platform_device *pdev)
         else
                 tps6586x_gpio->gpio_chip.base = -1;
 
-        ret = gpiochip_add_data(&tps6586x_gpio->gpio_chip, tps6586x_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &tps6586x_gpio->gpio_chip,
+                                     tps6586x_gpio);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
                 return ret;
@@ -128,19 +129,10 @@ static int tps6586x_gpio_probe(struct platform_device *pdev)
         return ret;
 }
 
-static int tps6586x_gpio_remove(struct platform_device *pdev)
-{
-        struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&tps6586x_gpio->gpio_chip);
-        return 0;
-}
-
 static struct platform_driver tps6586x_gpio_driver = {
         .driver.name    = "tps6586x-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = tps6586x_gpio_probe,
-        .remove         = tps6586x_gpio_remove,
 };
 
 static int __init tps6586x_gpio_init(void)
diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c
index e81eee7627a3..cdbd7c740043 100644
--- a/drivers/gpio/gpio-tps65910.c
+++ b/drivers/gpio/gpio-tps65910.c
@@ -170,7 +170,8 @@ static int tps65910_gpio_probe(struct platform_device *pdev)
         }
 
 skip_init:
-        ret = gpiochip_add_data(&tps65910_gpio->gpio_chip, tps65910_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &tps65910_gpio->gpio_chip,
+                                     tps65910_gpio);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
                 return ret;
@@ -181,19 +182,10 @@ skip_init:
         return ret;
 }
 
-static int tps65910_gpio_remove(struct platform_device *pdev)
-{
-        struct tps65910_gpio *tps65910_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&tps65910_gpio->gpio_chip);
-        return 0;
-}
-
 static struct platform_driver tps65910_gpio_driver = {
         .driver.name    = "tps65910-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = tps65910_gpio_probe,
-        .remove         = tps65910_gpio_remove,
 };
 
 static int __init tps65910_gpio_init(void)
diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c
index 4f2029c7da3a..acfd30a13a56 100644
--- a/drivers/gpio/gpio-tps65912.c
+++ b/drivers/gpio/gpio-tps65912.c
@@ -1,151 +1,149 @@
 /*
- * Copyright 2011 Texas Instruments Inc.
+ * GPIO driver for TI TPS65912x PMICs
  *
- * Author: Margarita Olaya <magi@slimlogic.co.uk>
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *      Andrew F. Davis <afd@ti.com>
  *
- *  This program is free software; you can redistribute it and/or modify it
- *  under  the terms of the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the License, or (at your
- *  option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
- * This driver is based on wm8350 implementation.
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.
+ *
+ * Based on the Arizona GPIO driver and the previous TPS65912 driver by
+ * Margarita Olaya Cabrera <magi@slimlogic.co.uk>
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/errno.h>
 #include <linux/gpio.h>
-#include <linux/mfd/core.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
+
 #include <linux/mfd/tps65912.h>
 
-struct tps65912_gpio_data {
-        struct tps65912 *tps65912;
+struct tps65912_gpio {
         struct gpio_chip gpio_chip;
+        struct tps65912 *tps;
 };
 
-static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset)
+static int tps65912_gpio_get_direction(struct gpio_chip *gc,
+                                       unsigned offset)
 {
-        struct tps65912_gpio_data *tps65912_gpio = gpiochip_get_data(gc);
-        struct tps65912 *tps65912 = tps65912_gpio->tps65912;
-        int val;
+        struct tps65912_gpio *gpio = gpiochip_get_data(gc);
 
-        val = tps65912_reg_read(tps65912, TPS65912_GPIO1 + offset);
+        int ret, val;
 
-        if (val & GPIO_STS_MASK)
-                return 1;
+        ret = regmap_read(gpio->tps->regmap, TPS65912_GPIO1 + offset, &val);
+        if (ret)
+                return ret;
 
-        return 0;
+        if (val & GPIO_CFG_MASK)
+                return GPIOF_DIR_OUT;
+        else
+                return GPIOF_DIR_IN;
 }
 
-static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset,
-                              int value)
+static int tps65912_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
 {
-        struct tps65912_gpio_data *tps65912_gpio = gpiochip_get_data(gc);
-        struct tps65912 *tps65912 = tps65912_gpio->tps65912;
+        struct tps65912_gpio *gpio = gpiochip_get_data(gc);
 
-        if (value)
-                tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset,
-                                                        GPIO_SET_MASK);
-        else
-                tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset,
-                                                                GPIO_SET_MASK);
+        return regmap_update_bits(gpio->tps->regmap, TPS65912_GPIO1 + offset,
+                                  GPIO_CFG_MASK, 0);
 }
 
-static int tps65912_gpio_output(struct gpio_chip *gc, unsigned offset,
-                                int value)
+static int tps65912_gpio_direction_output(struct gpio_chip *gc,
+                                          unsigned offset, int value)
 {
-        struct tps65912_gpio_data *tps65912_gpio = gpiochip_get_data(gc);
-        struct tps65912 *tps65912 = tps65912_gpio->tps65912;
+        struct tps65912_gpio *gpio = gpiochip_get_data(gc);
 
         /* Set the initial value */
-        tps65912_gpio_set(gc, offset, value);
+        regmap_update_bits(gpio->tps->regmap, TPS65912_GPIO1 + offset,
+                           GPIO_SET_MASK, value ? GPIO_SET_MASK : 0);
+
+        return regmap_update_bits(gpio->tps->regmap, TPS65912_GPIO1 + offset,
+                                  GPIO_CFG_MASK, GPIO_CFG_MASK);
+}
+
+static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset)
+{
+        struct tps65912_gpio *gpio = gpiochip_get_data(gc);
+        int ret, val;
+
+        ret = regmap_read(gpio->tps->regmap, TPS65912_GPIO1 + offset, &val);
+        if (ret)
+                return ret;
+
+        if (val & GPIO_STS_MASK)
+                return 1;
 
-        return tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset,
-                                                                GPIO_CFG_MASK);
+        return 0;
 }
 
-static int tps65912_gpio_input(struct gpio_chip *gc, unsigned offset)
+static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset,
+                              int value)
 {
-        struct tps65912_gpio_data *tps65912_gpio = gpiochip_get_data(gc);
-        struct tps65912 *tps65912 = tps65912_gpio->tps65912;
+        struct tps65912_gpio *gpio = gpiochip_get_data(gc);
 
-        return tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset,
-                                                                GPIO_CFG_MASK);
+        regmap_update_bits(gpio->tps->regmap, TPS65912_GPIO1 + offset,
+                           GPIO_SET_MASK, value ? GPIO_SET_MASK : 0);
 }
 
 static struct gpio_chip template_chip = {
-        .label                  = "tps65912",
+        .label                  = "tps65912-gpio",
         .owner                  = THIS_MODULE,
-        .direction_input        = tps65912_gpio_input,
-        .direction_output       = tps65912_gpio_output,
+        .get_direction          = tps65912_gpio_get_direction,
+        .direction_input        = tps65912_gpio_direction_input,
+        .direction_output       = tps65912_gpio_direction_output,
         .get                    = tps65912_gpio_get,
         .set                    = tps65912_gpio_set,
-        .can_sleep              = true,
-        .ngpio                  = 5,
         .base                   = -1,
+        .ngpio                  = 5,
+        .can_sleep              = true,
 };
 
 static int tps65912_gpio_probe(struct platform_device *pdev)
 {
-        struct tps65912 *tps65912 = dev_get_drvdata(pdev->dev.parent);
-        struct tps65912_board *pdata = dev_get_platdata(tps65912->dev);
-        struct tps65912_gpio_data *tps65912_gpio;
+        struct tps65912 *tps = dev_get_drvdata(pdev->dev.parent);
+        struct tps65912_gpio *gpio;
         int ret;
 
-        tps65912_gpio = devm_kzalloc(&pdev->dev, sizeof(*tps65912_gpio),
-                                     GFP_KERNEL);
-        if (tps65912_gpio == NULL)
+        gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
+        if (!gpio)
                 return -ENOMEM;
 
-        tps65912_gpio->tps65912 = tps65912;
-        tps65912_gpio->gpio_chip = template_chip;
-        tps65912_gpio->gpio_chip.parent = &pdev->dev;
-        if (pdata && pdata->gpio_base)
-                tps65912_gpio->gpio_chip.base = pdata->gpio_base;
+        gpio->tps = dev_get_drvdata(pdev->dev.parent);
+        gpio->gpio_chip = template_chip;
+        gpio->gpio_chip.parent = tps->dev;
 
-        ret = gpiochip_add_data(&tps65912_gpio->gpio_chip, tps65912_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gpio_chip,
+                                     gpio);
         if (ret < 0) {
-                dev_err(&pdev->dev, "Failed to register gpiochip, %d\n", ret);
+                dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
                 return ret;
         }
 
-        platform_set_drvdata(pdev, tps65912_gpio);
-
-        return ret;
-}
+        platform_set_drvdata(pdev, gpio);
 
-static int tps65912_gpio_remove(struct platform_device *pdev)
-{
-        struct tps65912_gpio_data  *tps65912_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&tps65912_gpio->gpio_chip);
         return 0;
 }
 
+static const struct platform_device_id tps65912_gpio_id_table[] = {
+        { "tps65912-gpio", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, tps65912_gpio_id_table);
+
 static struct platform_driver tps65912_gpio_driver = {
         .driver = {
                 .name = "tps65912-gpio",
         },
         .probe = tps65912_gpio_probe,
-        .remove = tps65912_gpio_remove,
+        .id_table = tps65912_gpio_id_table,
 };
+module_platform_driver(tps65912_gpio_driver);
 
-static int __init tps65912_gpio_init(void)
-{
-        return platform_driver_register(&tps65912_gpio_driver);
-}
-subsys_initcall(tps65912_gpio_init);
-
-static void __exit tps65912_gpio_exit(void)
-{
-        platform_driver_unregister(&tps65912_gpio_driver);
-}
-module_exit(tps65912_gpio_exit);
-
-MODULE_AUTHOR("Margarita Olaya Cabrera <magi@slimlogic.co.uk>");
-MODULE_DESCRIPTION("GPIO interface for TPS65912 PMICs");
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65912 GPIO driver");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:tps65912-gpio");
diff --git a/drivers/gpio/gpio-ts4800.c b/drivers/gpio/gpio-ts4800.c
new file mode 100644
index 000000000000..0c144a72f9af
--- /dev/null
+++ b/drivers/gpio/gpio-ts4800.c
@@ -0,0 +1,81 @@
+/*
+ * GPIO driver for the TS-4800 board
+ *
+ * Copyright (c) 2016 - Savoir-faire Linux
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/gpio/driver.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+
+#define DEFAULT_PIN_NUMBER      16
+#define INPUT_REG_OFFSET        0x00
+#define OUTPUT_REG_OFFSET       0x02
+#define DIRECTION_REG_OFFSET    0x04
+
+static int ts4800_gpio_probe(struct platform_device *pdev)
+{
+        struct device_node *node;
+        struct gpio_chip *chip;
+        struct resource *res;
+        void __iomem *base_addr;
+        int retval;
+        u32 ngpios;
+
+        chip = devm_kzalloc(&pdev->dev, sizeof(struct gpio_chip), GFP_KERNEL);
+        if (!chip)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        base_addr = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(base_addr))
+                return PTR_ERR(base_addr);
+
+        node = pdev->dev.of_node;
+        if (!node)
+                return -EINVAL;
+
+        retval = of_property_read_u32(node, "ngpios", &ngpios);
+        if (retval == -EINVAL)
+                ngpios = DEFAULT_PIN_NUMBER;
+        else if (retval)
+                return retval;
+
+        retval = bgpio_init(chip, &pdev->dev, 2, base_addr + INPUT_REG_OFFSET,
+                            base_addr + OUTPUT_REG_OFFSET, NULL,
+                            base_addr + DIRECTION_REG_OFFSET, NULL, 0);
+        if (retval) {
+                dev_err(&pdev->dev, "bgpio_init failed\n");
+                return retval;
+        }
+
+        chip->ngpio = ngpios;
+
+        platform_set_drvdata(pdev, chip);
+
+        return devm_gpiochip_add_data(&pdev->dev, chip, NULL);
+}
+
+static const struct of_device_id ts4800_gpio_of_match[] = {
+        { .compatible = "technologic,ts4800-gpio", },
+        {},
+};
+
+static struct platform_driver ts4800_gpio_driver = {
+        .driver = {
+                   .name = "ts4800-gpio",
+                   .of_match_table = ts4800_gpio_of_match,
+                   },
+        .probe = ts4800_gpio_probe,
+};
+
+module_platform_driver_probe(ts4800_gpio_driver, ts4800_gpio_probe);
+
+MODULE_AUTHOR("Julien Grossholtz <julien.grossholtz@savoirfairelinux.com>");
+MODULE_DESCRIPTION("TS4800 FPGA GPIO driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpio/gpio-ts5500.c b/drivers/gpio/gpio-ts5500.c
index 5f945083f9d8..6cfeba07f882 100644
--- a/drivers/gpio/gpio-ts5500.c
+++ b/drivers/gpio/gpio-ts5500.c
@@ -409,7 +409,7 @@ static int ts5500_dio_probe(struct platform_device *pdev)
                 break;
         }
 
-        ret = gpiochip_add_data(&priv->gpio_chip, priv);
+        ret = devm_gpiochip_add_data(dev, &priv->gpio_chip, priv);
         if (ret) {
                 dev_err(dev, "failed to register the gpio chip\n");
                 return ret;
@@ -418,13 +418,10 @@ static int ts5500_dio_probe(struct platform_device *pdev)
         ret = ts5500_enable_irq(priv);
         if (ret) {
                 dev_err(dev, "invalid interrupt %d\n", priv->hwirq);
-                goto cleanup;
+                return ret;
         }
 
         return 0;
-cleanup:
-        gpiochip_remove(&priv->gpio_chip);
-        return ret;
 }
 
 static int ts5500_dio_remove(struct platform_device *pdev)
@@ -432,7 +429,7 @@ static int ts5500_dio_remove(struct platform_device *pdev)
         struct ts5500_priv *priv = platform_get_drvdata(pdev);
 
         ts5500_disable_irq(priv);
-        gpiochip_remove(&priv->gpio_chip);
+
         return 0;
 }
 
diff --git a/drivers/gpio/gpio-twl6040.c b/drivers/gpio/gpio-twl6040.c
index 8e9e9853f3bd..b780314cdfc9 100644
--- a/drivers/gpio/gpio-twl6040.c
+++ b/drivers/gpio/gpio-twl6040.c
@@ -100,7 +100,7 @@ static int gpo_twl6040_probe(struct platform_device *pdev)
         twl6040gpo_chip.of_node = twl6040_core_dev->of_node;
 #endif
 
-        ret = gpiochip_add_data(&twl6040gpo_chip, NULL);
+        ret = devm_gpiochip_add_data(&pdev->dev, &twl6040gpo_chip, NULL);
         if (ret < 0) {
                 dev_err(&pdev->dev, "could not register gpiochip, %d\n", ret);
                 twl6040gpo_chip.ngpio = 0;
@@ -109,12 +109,6 @@ static int gpo_twl6040_probe(struct platform_device *pdev)
         return ret;
 }
 
-static int gpo_twl6040_remove(struct platform_device *pdev)
-{
-        gpiochip_remove(&twl6040gpo_chip);
-        return 0;
-}
-
 /* Note:  this hardware lives inside an I2C-based multi-function device. */
 MODULE_ALIAS("platform:twl6040-gpo");
 
@@ -123,7 +117,6 @@ static struct platform_driver gpo_twl6040_driver = {
                 .name   = "twl6040-gpo",
         },
         .probe          = gpo_twl6040_probe,
-        .remove         = gpo_twl6040_remove,
 };
 
 module_platform_driver(gpo_twl6040_driver);
diff --git a/drivers/gpio/gpio-ucb1400.c b/drivers/gpio/gpio-ucb1400.c
index 2c5cd46bfa6e..5dbe31bf6699 100644
--- a/drivers/gpio/gpio-ucb1400.c
+++ b/drivers/gpio/gpio-ucb1400.c
@@ -67,7 +67,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
         ucb->gc.set = ucb1400_gpio_set;
         ucb->gc.can_sleep = true;
 
-        err = gpiochip_add_data(&ucb->gc, ucb);
+        err = devm_gpiochip_add_data(&dev->dev, &ucb->gc, ucb);
         if (err)
                 goto err;
 
@@ -90,7 +90,6 @@ static int ucb1400_gpio_remove(struct platform_device *dev)
                         return err;
         }
 
-        gpiochip_remove(&ucb->gc);
         return err;
 }
 
diff --git a/drivers/gpio/gpio-viperboard.c b/drivers/gpio/gpio-viperboard.c
index 1170b035cb92..dec47aafd5cd 100644
--- a/drivers/gpio/gpio-viperboard.c
+++ b/drivers/gpio/gpio-viperboard.c
@@ -410,10 +410,10 @@ static int vprbrd_gpio_probe(struct platform_device *pdev)
         vb_gpio->gpioa.get = vprbrd_gpioa_get;
         vb_gpio->gpioa.direction_input = vprbrd_gpioa_direction_input;
         vb_gpio->gpioa.direction_output = vprbrd_gpioa_direction_output;
-        ret = gpiochip_add_data(&vb_gpio->gpioa, vb_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &vb_gpio->gpioa, vb_gpio);
         if (ret < 0) {
                 dev_err(vb_gpio->gpioa.parent, "could not add gpio a");
-                goto err_gpioa;
+                return ret;
         }
 
         /* registering gpio b */
@@ -427,37 +427,21 @@ static int vprbrd_gpio_probe(struct platform_device *pdev)
         vb_gpio->gpiob.get = vprbrd_gpiob_get;
         vb_gpio->gpiob.direction_input = vprbrd_gpiob_direction_input;
         vb_gpio->gpiob.direction_output = vprbrd_gpiob_direction_output;
-        ret = gpiochip_add_data(&vb_gpio->gpiob, vb_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &vb_gpio->gpiob, vb_gpio);
         if (ret < 0) {
                 dev_err(vb_gpio->gpiob.parent, "could not add gpio b");
-                goto err_gpiob;
+                return ret;
         }
 
         platform_set_drvdata(pdev, vb_gpio);
 
         return ret;
-
-err_gpiob:
-        gpiochip_remove(&vb_gpio->gpioa);
-
-err_gpioa:
-        return ret;
-}
-
-static int vprbrd_gpio_remove(struct platform_device *pdev)
-{
-        struct vprbrd_gpio *vb_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&vb_gpio->gpiob);
-
-        return 0;
 }
 
 static struct platform_driver vprbrd_gpio_driver = {
         .driver.name    = "viperboard-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = vprbrd_gpio_probe,
-        .remove         = vprbrd_gpio_remove,
 };
 
 static int __init vprbrd_gpio_init(void)
diff --git a/drivers/gpio/gpio-vx855.c b/drivers/gpio/gpio-vx855.c
index 764999cc0794..8cdb9f7ec7e0 100644
--- a/drivers/gpio/gpio-vx855.c
+++ b/drivers/gpio/gpio-vx855.c
@@ -259,16 +259,7 @@ static int vx855gpio_probe(struct platform_device *pdev)
 
         vx855gpio_gpio_setup(vg);
 
-        return gpiochip_add_data(&vg->gpio, vg);
-}
-
-static int vx855gpio_remove(struct platform_device *pdev)
-{
-        struct vx855_gpio *vg = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&vg->gpio);
-
-        return 0;
+        return devm_gpiochip_add_data(&pdev->dev, &vg->gpio, vg);
 }
 
 static struct platform_driver vx855gpio_driver = {
@@ -276,7 +267,6 @@ static struct platform_driver vx855gpio_driver = {
                 .name   = MODULE_NAME,
         },
         .probe          = vx855gpio_probe,
-        .remove         = vx855gpio_remove,
 };
 
 module_platform_driver(vx855gpio_driver);
diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c
index 98390070fb64..18cb0f534b91 100644
--- a/drivers/gpio/gpio-wm831x.c
+++ b/drivers/gpio/gpio-wm831x.c
@@ -259,7 +259,8 @@ static int wm831x_gpio_probe(struct platform_device *pdev)
         else
                 wm831x_gpio->gpio_chip.base = -1;
 
-        ret = gpiochip_add_data(&wm831x_gpio->gpio_chip, wm831x_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &wm831x_gpio->gpio_chip,
+                                     wm831x_gpio);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
                 return ret;
@@ -270,19 +271,10 @@ static int wm831x_gpio_probe(struct platform_device *pdev)
         return ret;
 }
 
-static int wm831x_gpio_remove(struct platform_device *pdev)
-{
-        struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&wm831x_gpio->gpio_chip);
-        return 0;
-}
-
 static struct platform_driver wm831x_gpio_driver = {
         .driver.name    = "wm831x-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = wm831x_gpio_probe,
-        .remove         = wm831x_gpio_remove,
 };
 
 static int __init wm831x_gpio_init(void)
diff --git a/drivers/gpio/gpio-wm8350.c b/drivers/gpio/gpio-wm8350.c
index 0a306b4baa73..07d45a3b205a 100644
--- a/drivers/gpio/gpio-wm8350.c
+++ b/drivers/gpio/gpio-wm8350.c
@@ -125,7 +125,8 @@ static int wm8350_gpio_probe(struct platform_device *pdev)
         else
                 wm8350_gpio->gpio_chip.base = -1;
 
-        ret = gpiochip_add_data(&wm8350_gpio->gpio_chip, wm8350_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &wm8350_gpio->gpio_chip,
+                                     wm8350_gpio);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
                 return ret;
@@ -136,19 +137,10 @@ static int wm8350_gpio_probe(struct platform_device *pdev)
         return ret;
 }
 
-static int wm8350_gpio_remove(struct platform_device *pdev)
-{
-        struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&wm8350_gpio->gpio_chip);
-        return 0;
-}
-
 static struct platform_driver wm8350_gpio_driver = {
         .driver.name    = "wm8350-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = wm8350_gpio_probe,
-        .remove         = wm8350_gpio_remove,
 };
 
 static int __init wm8350_gpio_init(void)
diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c
index 3ae4c1597494..b089df99a0d0 100644
--- a/drivers/gpio/gpio-wm8994.c
+++ b/drivers/gpio/gpio-wm8994.c
@@ -261,34 +261,23 @@ static int wm8994_gpio_probe(struct platform_device *pdev)
         else
                 wm8994_gpio->gpio_chip.base = -1;
 
-        ret = gpiochip_add_data(&wm8994_gpio->gpio_chip, wm8994_gpio);
+        ret = devm_gpiochip_add_data(&pdev->dev, &wm8994_gpio->gpio_chip,
+                                     wm8994_gpio);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Could not register gpiochip, %d\n",
                         ret);
-                goto err;
+                return ret;
         }
 
         platform_set_drvdata(pdev, wm8994_gpio);
 
         return ret;
-
-err:
-        return ret;
-}
-
-static int wm8994_gpio_remove(struct platform_device *pdev)
-{
-        struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&wm8994_gpio->gpio_chip);
-        return 0;
 }
 
 static struct platform_driver wm8994_gpio_driver = {
         .driver.name    = "wm8994-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = wm8994_gpio_probe,
-        .remove         = wm8994_gpio_remove,
 };
 
 static int __init wm8994_gpio_init(void)
diff --git a/drivers/gpio/gpio-ws16c48.c b/drivers/gpio/gpio-ws16c48.c
new file mode 100644
index 000000000000..51f41e8fd21e
--- /dev/null
+++ b/drivers/gpio/gpio-ws16c48.c
@@ -0,0 +1,427 @@
+/*
+ * GPIO driver for the WinSystems WS16C48
+ * Copyright (C) 2016 William Breathitt Gray
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+#include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/gpio/driver.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/interrupt.h>
+#include <linux/irqdesc.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+
+static unsigned ws16c48_base;
+module_param(ws16c48_base, uint, 0);
+MODULE_PARM_DESC(ws16c48_base, "WinSystems WS16C48 base address");
+static unsigned ws16c48_irq;
+module_param(ws16c48_irq, uint, 0);
+MODULE_PARM_DESC(ws16c48_irq, "WinSystems WS16C48 interrupt line number");
+
+/**
+ * struct ws16c48_gpio - GPIO device private data structure
+ * @chip:       instance of the gpio_chip
+ * @io_state:   bit I/O state (whether bit is set to input or output)
+ * @out_state:  output bits state
+ * @lock:       synchronization lock to prevent I/O race conditions
+ * @irq_mask:   I/O bits affected by interrupts
+ * @flow_mask:  IRQ flow type mask for the respective I/O bits
+ * @base:       base port address of the GPIO device
+ * @irq:        Interrupt line number
+ */
+struct ws16c48_gpio {
+        struct gpio_chip chip;
+        unsigned char io_state[6];
+        unsigned char out_state[6];
+        spinlock_t lock;
+        unsigned long irq_mask;
+        unsigned long flow_mask;
+        unsigned base;
+        unsigned irq;
+};
+
+static int ws16c48_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
+{
+        struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
+        const unsigned port = offset / 8;
+        const unsigned mask = BIT(offset % 8);
+
+        return !!(ws16c48gpio->io_state[port] & mask);
+}
+
+static int ws16c48_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
+{
+        struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
+        const unsigned port = offset / 8;
+        const unsigned mask = BIT(offset % 8);
+        unsigned long flags;
+
+        spin_lock_irqsave(&ws16c48gpio->lock, flags);
+
+        ws16c48gpio->io_state[port] |= mask;
+        ws16c48gpio->out_state[port] &= ~mask;
+        outb(ws16c48gpio->out_state[port], ws16c48gpio->base + port);
+
+        spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+
+        return 0;
+}
+
+static int ws16c48_gpio_direction_output(struct gpio_chip *chip,
+        unsigned offset, int value)
+{
+        struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
+        const unsigned port = offset / 8;
+        const unsigned mask = BIT(offset % 8);
+        unsigned long flags;
+
+        spin_lock_irqsave(&ws16c48gpio->lock, flags);
+
+        ws16c48gpio->io_state[port] &= ~mask;
+        if (value)
+                ws16c48gpio->out_state[port] |= mask;
+        else
+                ws16c48gpio->out_state[port] &= ~mask;
+        outb(ws16c48gpio->out_state[port], ws16c48gpio->base + port);
+
+        spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+
+        return 0;
+}
+
+static int ws16c48_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+        struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
+        const unsigned port = offset / 8;
+        const unsigned mask = BIT(offset % 8);
+        unsigned long flags;
+        unsigned port_state;
+
+        spin_lock_irqsave(&ws16c48gpio->lock, flags);
+
+        /* ensure that GPIO is set for input */
+        if (!(ws16c48gpio->io_state[port] & mask)) {
+                spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+                return -EINVAL;
+        }
+
+        port_state = inb(ws16c48gpio->base + port);
+
+        spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+
+        return !!(port_state & mask);
+}
+
+static void ws16c48_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+        struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
+        const unsigned port = offset / 8;
+        const unsigned mask = BIT(offset % 8);
+        unsigned long flags;
+
+        spin_lock_irqsave(&ws16c48gpio->lock, flags);
+
+        /* ensure that GPIO is set for output */
+        if (ws16c48gpio->io_state[port] & mask) {
+                spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+                return;
+        }
+
+        if (value)
+                ws16c48gpio->out_state[port] |= mask;
+        else
+                ws16c48gpio->out_state[port] &= ~mask;
+        outb(ws16c48gpio->out_state[port], ws16c48gpio->base + port);
+
+        spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+}
+
+static void ws16c48_irq_ack(struct irq_data *data)
+{
+        struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
+        struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
+        const unsigned long offset = irqd_to_hwirq(data);
+        const unsigned port = offset / 8;
+        const unsigned mask = BIT(offset % 8);
+        unsigned long flags;
+        unsigned port_state;
+
+        /* only the first 3 ports support interrupts */
+        if (port > 2)
+                return;
+
+        spin_lock_irqsave(&ws16c48gpio->lock, flags);
+
+        port_state = ws16c48gpio->irq_mask >> (8*port);
+
+        outb(0x80, ws16c48gpio->base + 7);
+        outb(port_state & ~mask, ws16c48gpio->base + 8 + port);
+        outb(port_state | mask, ws16c48gpio->base + 8 + port);
+        outb(0xC0, ws16c48gpio->base + 7);
+
+        spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+}
+
+static void ws16c48_irq_mask(struct irq_data *data)
+{
+        struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
+        struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
+        const unsigned long offset = irqd_to_hwirq(data);
+        const unsigned long mask = BIT(offset);
+        const unsigned port = offset / 8;
+        unsigned long flags;
+
+        /* only the first 3 ports support interrupts */
+        if (port > 2)
+                return;
+
+        spin_lock_irqsave(&ws16c48gpio->lock, flags);
+
+        ws16c48gpio->irq_mask &= ~mask;
+
+        outb(0x80, ws16c48gpio->base + 7);
+        outb(ws16c48gpio->irq_mask >> (8*port), ws16c48gpio->base + 8 + port);
+        outb(0xC0, ws16c48gpio->base + 7);
+
+        spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+}
+
+static void ws16c48_irq_unmask(struct irq_data *data)
+{
+        struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
+        struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
+        const unsigned long offset = irqd_to_hwirq(data);
+        const unsigned long mask = BIT(offset);
+        const unsigned port = offset / 8;
+        unsigned long flags;
+
+        /* only the first 3 ports support interrupts */
+        if (port > 2)
+                return;
+
+        spin_lock_irqsave(&ws16c48gpio->lock, flags);
+
+        ws16c48gpio->irq_mask |= mask;
+
+        outb(0x80, ws16c48gpio->base + 7);
+        outb(ws16c48gpio->irq_mask >> (8*port), ws16c48gpio->base + 8 + port);
+        outb(0xC0, ws16c48gpio->base + 7);
+
+        spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+}
+
+static int ws16c48_irq_set_type(struct irq_data *data, unsigned flow_type)
+{
+        struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
+        struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
+        const unsigned long offset = irqd_to_hwirq(data);
+        const unsigned long mask = BIT(offset);
+        const unsigned port = offset / 8;
+        unsigned long flags;
+
+        /* only the first 3 ports support interrupts */
+        if (port > 2)
+                return -EINVAL;
+
+        spin_lock_irqsave(&ws16c48gpio->lock, flags);
+
+        switch (flow_type) {
+        case IRQ_TYPE_NONE:
+                break;
+        case IRQ_TYPE_EDGE_RISING:
+                ws16c48gpio->flow_mask |= mask;
+                break;
+        case IRQ_TYPE_EDGE_FALLING:
+                ws16c48gpio->flow_mask &= ~mask;
+                break;
+        default:
+                spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+                return -EINVAL;
+        }
+
+        outb(0x40, ws16c48gpio->base + 7);
+        outb(ws16c48gpio->flow_mask >> (8*port), ws16c48gpio->base + 8 + port);
+        outb(0xC0, ws16c48gpio->base + 7);
+
+        spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
+
+        return 0;
+}
+
+static struct irq_chip ws16c48_irqchip = {
+        .name = "ws16c48",
+        .irq_ack = ws16c48_irq_ack,
+        .irq_mask = ws16c48_irq_mask,
+        .irq_unmask = ws16c48_irq_unmask,
+        .irq_set_type = ws16c48_irq_set_type
+};
+
+static irqreturn_t ws16c48_irq_handler(int irq, void *dev_id)
+{
+        struct ws16c48_gpio *const ws16c48gpio = dev_id;
+        struct gpio_chip *const chip = &ws16c48gpio->chip;
+        unsigned long int_pending;
+        unsigned long port;
+        unsigned long int_id;
+        unsigned long gpio;
+
+        int_pending = inb(ws16c48gpio->base + 6) & 0x7;
+        if (!int_pending)
+                return IRQ_NONE;
+
+        /* loop until all pending interrupts are handled */
+        do {
+                for_each_set_bit(port, &int_pending, 3) {
+                        int_id = inb(ws16c48gpio->base + 8 + port);
+                        for_each_set_bit(gpio, &int_id, 8)
+                                generic_handle_irq(irq_find_mapping(
+                                        chip->irqdomain, gpio + 8*port));
+                }
+
+                int_pending = inb(ws16c48gpio->base + 6) & 0x7;
+        } while (int_pending);
+
+        return IRQ_HANDLED;
+}
+
+static int __init ws16c48_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct ws16c48_gpio *ws16c48gpio;
+        const unsigned base = ws16c48_base;
+        const unsigned extent = 16;
+        const char *const name = dev_name(dev);
+        int err;
+        const unsigned irq = ws16c48_irq;
+
+        ws16c48gpio = devm_kzalloc(dev, sizeof(*ws16c48gpio), GFP_KERNEL);
+        if (!ws16c48gpio)
+                return -ENOMEM;
+
+        if (!devm_request_region(dev, base, extent, name)) {
+                dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
+                        base, base + extent);
+                return -EBUSY;
+        }
+
+        ws16c48gpio->chip.label = name;
+        ws16c48gpio->chip.parent = dev;
+        ws16c48gpio->chip.owner = THIS_MODULE;
+        ws16c48gpio->chip.base = -1;
+        ws16c48gpio->chip.ngpio = 48;
+        ws16c48gpio->chip.get_direction = ws16c48_gpio_get_direction;
+        ws16c48gpio->chip.direction_input = ws16c48_gpio_direction_input;
+        ws16c48gpio->chip.direction_output = ws16c48_gpio_direction_output;
+        ws16c48gpio->chip.get = ws16c48_gpio_get;
+        ws16c48gpio->chip.set = ws16c48_gpio_set;
+        ws16c48gpio->base = base;
+        ws16c48gpio->irq = irq;
+
+        spin_lock_init(&ws16c48gpio->lock);
+
+        dev_set_drvdata(dev, ws16c48gpio);
+
+        err = gpiochip_add_data(&ws16c48gpio->chip, ws16c48gpio);
+        if (err) {
+                dev_err(dev, "GPIO registering failed (%d)\n", err);
+                return err;
+        }
+
+        /* Disable IRQ by default */
+        outb(0x80, base + 7);
+        outb(0, base + 8);
+        outb(0, base + 9);
+        outb(0, base + 10);
+        outb(0xC0, base + 7);
+
+        err = gpiochip_irqchip_add(&ws16c48gpio->chip, &ws16c48_irqchip, 0,
+                handle_edge_irq, IRQ_TYPE_NONE);
+        if (err) {
+                dev_err(dev, "Could not add irqchip (%d)\n", err);
+                goto err_gpiochip_remove;
+        }
+
+        err = request_irq(irq, ws16c48_irq_handler, IRQF_SHARED, name,
+                ws16c48gpio);
+        if (err) {
+                dev_err(dev, "IRQ handler registering failed (%d)\n", err);
+                goto err_gpiochip_remove;
+        }
+
+        return 0;
+
+err_gpiochip_remove:
+        gpiochip_remove(&ws16c48gpio->chip);
+        return err;
+}
+
+static int ws16c48_remove(struct platform_device *pdev)
+{
+        struct ws16c48_gpio *const ws16c48gpio = platform_get_drvdata(pdev);
+
+        free_irq(ws16c48gpio->irq, ws16c48gpio);
+        gpiochip_remove(&ws16c48gpio->chip);
+
+        return 0;
+}
+
+static struct platform_device *ws16c48_device;
+
+static struct platform_driver ws16c48_driver = {
+        .driver = {
+                .name = "ws16c48"
+        },
+        .remove = ws16c48_remove
+};
+
+static void __exit ws16c48_exit(void)
+{
+        platform_device_unregister(ws16c48_device);
+        platform_driver_unregister(&ws16c48_driver);
+}
+
+static int __init ws16c48_init(void)
+{
+        int err;
+
+        ws16c48_device = platform_device_alloc(ws16c48_driver.driver.name, -1);
+        if (!ws16c48_device)
+                return -ENOMEM;
+
+        err = platform_device_add(ws16c48_device);
+        if (err)
+                goto err_platform_device;
+
+        err = platform_driver_probe(&ws16c48_driver, ws16c48_probe);
+        if (err)
+                goto err_platform_driver;
+
+        return 0;
+
+err_platform_driver:
+        platform_device_del(ws16c48_device);
+err_platform_device:
+        platform_device_put(ws16c48_device);
+        return err;
+}
+
+module_init(ws16c48_init);
+module_exit(ws16c48_exit);
+
+MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
+MODULE_DESCRIPTION("WinSystems WS16C48 GPIO driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpio/gpio-xgene-sb.c b/drivers/gpio/gpio-xgene-sb.c
index 282004deb5d4..31cbcb84cfaf 100644
--- a/drivers/gpio/gpio-xgene-sb.c
+++ b/drivers/gpio/gpio-xgene-sb.c
@@ -2,8 +2,9 @@
  * AppliedMicro X-Gene SoC GPIO-Standby Driver
  *
  * Copyright (c) 2014, Applied Micro Circuits Corporation
- * Author:      Tin Huynh <tnhuynh@apm.com>.
- *              Y Vo <yvo@apm.com>.
+ * Author:      Tin Huynh <tnhuynh@apm.com>.
+ *              Y Vo <yvo@apm.com>.
+ *              Quan Nguyen <qnguyen@apm.com>.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -28,9 +29,14 @@
 
 #include "gpiolib.h"
 
-#define XGENE_MAX_GPIO_DS               22
-#define XGENE_MAX_GPIO_DS_IRQ           6
+/* Common property names */
+#define XGENE_NIRQ_PROPERTY             "apm,nr-irqs"
+#define XGENE_NGPIO_PROPERTY            "apm,nr-gpios"
+#define XGENE_IRQ_START_PROPERTY        "apm,irq-start"
 
+#define XGENE_DFLT_MAX_NGPIO            22
+#define XGENE_DFLT_MAX_NIRQ             6
+#define XGENE_DFLT_IRQ_START_PIN        8
 #define GPIO_MASK(x)                    (1U << ((x) % 32))
 
 #define MPA_GPIO_INT_LVL                0x0290
@@ -39,19 +45,32 @@
 #define MPA_GPIO_IN_ADDR                0x02a4
 #define MPA_GPIO_SEL_LO                 0x0294
 
+#define GPIO_INT_LEVEL_H        0x000001
+#define GPIO_INT_LEVEL_L        0x000000
+
 /**
  * struct xgene_gpio_sb - GPIO-Standby private data structure.
  * @gc:                         memory-mapped GPIO controllers.
- * @irq:                        Mapping GPIO pins and interrupt number
- * nirq:                        Number of GPIO pins that supports interrupt
+ * @regs:                       GPIO register base offset
+ * @irq_domain:                 GPIO interrupt domain
+ * @irq_start:                  GPIO pin that start support interrupt
+ * @nirq:                       Number of GPIO pins that supports interrupt
+ * @parent_irq_base:            Start parent HWIRQ
  */
 struct xgene_gpio_sb {
         struct gpio_chip        gc;
-        u32 *irq;
-        u32 nirq;
+        void __iomem            *regs;
+        struct irq_domain       *irq_domain;
+        u16                     irq_start;
+        u16                     nirq;
+        u16                     parent_irq_base;
 };
 
-static void xgene_gpio_set_bit(struct gpio_chip *gc, void __iomem *reg, u32 gpio, int val)
+#define HWIRQ_TO_GPIO(priv, hwirq) ((hwirq) + (priv)->irq_start)
+#define GPIO_TO_HWIRQ(priv, gpio) ((gpio) - (priv)->irq_start)
+
+static void xgene_gpio_set_bit(struct gpio_chip *gc,
+                                void __iomem *reg, u32 gpio, int val)
 {
         u32 data;
 
@@ -63,23 +82,170 @@ static void xgene_gpio_set_bit(struct gpio_chip *gc, void __iomem *reg, u32 gpio
         gc->write_reg(reg, data);
 }
 
-static int apm_gpio_sb_to_irq(struct gpio_chip *gc, u32 gpio)
+static int xgene_gpio_sb_irq_set_type(struct irq_data *d, unsigned int type)
+{
+        struct xgene_gpio_sb *priv = irq_data_get_irq_chip_data(d);
+        int gpio = HWIRQ_TO_GPIO(priv, d->hwirq);
+        int lvl_type = GPIO_INT_LEVEL_H;
+
+        switch (type & IRQ_TYPE_SENSE_MASK) {
+        case IRQ_TYPE_EDGE_RISING:
+        case IRQ_TYPE_LEVEL_HIGH:
+                lvl_type = GPIO_INT_LEVEL_H;
+                break;
+        case IRQ_TYPE_EDGE_FALLING:
+        case IRQ_TYPE_LEVEL_LOW:
+                lvl_type = GPIO_INT_LEVEL_L;
+                break;
+        default:
+                break;
+        }
+
+        xgene_gpio_set_bit(&priv->gc, priv->regs + MPA_GPIO_SEL_LO,
+                        gpio * 2, 1);
+        xgene_gpio_set_bit(&priv->gc, priv->regs + MPA_GPIO_INT_LVL,
+                        d->hwirq, lvl_type);
+
+        /* Propagate IRQ type setting to parent */
+        if (type & IRQ_TYPE_EDGE_BOTH)
+                return irq_chip_set_type_parent(d, IRQ_TYPE_EDGE_RISING);
+        else
+                return irq_chip_set_type_parent(d, IRQ_TYPE_LEVEL_HIGH);
+}
+
+static struct irq_chip xgene_gpio_sb_irq_chip = {
+        .name           = "sbgpio",
+        .irq_eoi        = irq_chip_eoi_parent,
+        .irq_mask       = irq_chip_mask_parent,
+        .irq_unmask     = irq_chip_unmask_parent,
+        .irq_set_type   = xgene_gpio_sb_irq_set_type,
+};
+
+static int xgene_gpio_sb_to_irq(struct gpio_chip *gc, u32 gpio)
 {
         struct xgene_gpio_sb *priv = gpiochip_get_data(gc);
+        struct irq_fwspec fwspec;
+
+        if ((gpio < priv->irq_start) ||
+                        (gpio > HWIRQ_TO_GPIO(priv, priv->nirq)))
+                return -ENXIO;
+
+        if (gc->parent->of_node)
+                fwspec.fwnode = of_node_to_fwnode(gc->parent->of_node);
+        else
+                fwspec.fwnode = gc->parent->fwnode;
+        fwspec.param_count = 2;
+        fwspec.param[0] = GPIO_TO_HWIRQ(priv, gpio);
+        fwspec.param[1] = IRQ_TYPE_NONE;
+        return irq_create_fwspec_mapping(&fwspec);
+}
+
+static void xgene_gpio_sb_domain_activate(struct irq_domain *d,
+                struct irq_data *irq_data)
+{
+        struct xgene_gpio_sb *priv = d->host_data;
+        u32 gpio = HWIRQ_TO_GPIO(priv, irq_data->hwirq);
+
+        if (gpiochip_lock_as_irq(&priv->gc, gpio)) {
+                dev_err(priv->gc.parent,
+                "Unable to configure XGene GPIO standby pin %d as IRQ\n",
+                                gpio);
+                return;
+        }
+
+        xgene_gpio_set_bit(&priv->gc, priv->regs + MPA_GPIO_SEL_LO,
+                        gpio * 2, 1);
+}
+
+static void xgene_gpio_sb_domain_deactivate(struct irq_domain *d,
+                struct irq_data *irq_data)
+{
+        struct xgene_gpio_sb *priv = d->host_data;
+        u32 gpio = HWIRQ_TO_GPIO(priv, irq_data->hwirq);
+
+        gpiochip_unlock_as_irq(&priv->gc, gpio);
+        xgene_gpio_set_bit(&priv->gc, priv->regs + MPA_GPIO_SEL_LO,
+                        gpio * 2, 0);
+}
+
+static int xgene_gpio_sb_domain_translate(struct irq_domain *d,
+                struct irq_fwspec *fwspec,
+                unsigned long *hwirq,
+                unsigned int *type)
+{
+        struct xgene_gpio_sb *priv = d->host_data;
+
+        if ((fwspec->param_count != 2) ||
+                (fwspec->param[0] >= priv->nirq))
+                return -EINVAL;
+        *hwirq = fwspec->param[0];
+        *type = fwspec->param[1];
+        return 0;
+}
+
+static int xgene_gpio_sb_domain_alloc(struct irq_domain *domain,
+                                        unsigned int virq,
+                                        unsigned int nr_irqs, void *data)
+{
+        struct irq_fwspec *fwspec = data;
+        struct irq_fwspec parent_fwspec;
+        struct xgene_gpio_sb *priv = domain->host_data;
+        irq_hw_number_t hwirq;
+        unsigned int i;
+
+        hwirq = fwspec->param[0];
+        for (i = 0; i < nr_irqs; i++)
+                irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i,
+                                &xgene_gpio_sb_irq_chip, priv);
 
-        if (priv->irq[gpio])
-                return priv->irq[gpio];
+        parent_fwspec.fwnode = domain->parent->fwnode;
+        if (is_of_node(parent_fwspec.fwnode)) {
+                parent_fwspec.param_count = 3;
+                parent_fwspec.param[0] = 0;/* SPI */
+                /* Skip SGIs and PPIs*/
+                parent_fwspec.param[1] = hwirq + priv->parent_irq_base - 32;
+                parent_fwspec.param[2] = fwspec->param[1];
+        } else if (is_fwnode_irqchip(parent_fwspec.fwnode)) {
+                parent_fwspec.param_count = 2;
+                parent_fwspec.param[0] = hwirq + priv->parent_irq_base;
+                parent_fwspec.param[1] = fwspec->param[1];
+        } else
+                return -EINVAL;
 
-        return -ENXIO;
+        return irq_domain_alloc_irqs_parent(domain, virq, nr_irqs,
+                        &parent_fwspec);
 }
 
+static void xgene_gpio_sb_domain_free(struct irq_domain *domain,
+                unsigned int virq,
+                unsigned int nr_irqs)
+{
+        struct irq_data *d;
+        unsigned int i;
+
+        for (i = 0; i < nr_irqs; i++) {
+                d = irq_domain_get_irq_data(domain, virq + i);
+                irq_domain_reset_irq_data(d);
+        }
+}
+
+static const struct irq_domain_ops xgene_gpio_sb_domain_ops = {
+        .translate      = xgene_gpio_sb_domain_translate,
+        .alloc          = xgene_gpio_sb_domain_alloc,
+        .free           = xgene_gpio_sb_domain_free,
+        .activate       = xgene_gpio_sb_domain_activate,
+        .deactivate     = xgene_gpio_sb_domain_deactivate,
+};
+
 static int xgene_gpio_sb_probe(struct platform_device *pdev)
 {
         struct xgene_gpio_sb *priv;
-        u32 ret, i;
-        u32 default_lines[] = {0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D};
+        int ret;
         struct resource *res;
         void __iomem *regs;
+        struct irq_domain *parent_domain = NULL;
+        struct fwnode_handle *fwnode;
+        u32 val32;
 
         priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
@@ -90,6 +256,18 @@ static int xgene_gpio_sb_probe(struct platform_device *pdev)
         if (IS_ERR(regs))
                 return PTR_ERR(regs);
 
+        priv->regs = regs;
+
+        ret = platform_get_irq(pdev, 0);
+        if (ret > 0) {
+                priv->parent_irq_base = irq_get_irq_data(ret)->hwirq;
+                parent_domain = irq_get_irq_data(ret)->domain;
+        }
+        if (!parent_domain) {
+                dev_err(&pdev->dev, "unable to obtain parent domain\n");
+                return -ENODEV;
+        }
+
         ret = bgpio_init(&priv->gc, &pdev->dev, 4,
                         regs + MPA_GPIO_IN_ADDR,
                         regs + MPA_GPIO_OUT_ADDR, NULL,
@@ -97,30 +275,51 @@ static int xgene_gpio_sb_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
-        priv->gc.to_irq = apm_gpio_sb_to_irq;
-        priv->gc.ngpio = XGENE_MAX_GPIO_DS;
+        priv->gc.to_irq = xgene_gpio_sb_to_irq;
 
-        priv->nirq = XGENE_MAX_GPIO_DS_IRQ;
+        /* Retrieve start irq pin, use default if property not found */
+        priv->irq_start = XGENE_DFLT_IRQ_START_PIN;
+        if (!device_property_read_u32(&pdev->dev,
+                                        XGENE_IRQ_START_PROPERTY, &val32))
+                priv->irq_start = val32;
 
-        priv->irq = devm_kzalloc(&pdev->dev, sizeof(u32) * XGENE_MAX_GPIO_DS,
-                                   GFP_KERNEL);
-        if (!priv->irq)
-                return -ENOMEM;
+        /* Retrieve number irqs, use default if property not found */
+        priv->nirq = XGENE_DFLT_MAX_NIRQ;
+        if (!device_property_read_u32(&pdev->dev, XGENE_NIRQ_PROPERTY, &val32))
+                priv->nirq = val32;
 
-        for (i = 0; i < priv->nirq; i++) {
-                priv->irq[default_lines[i]] = platform_get_irq(pdev, i);
-                xgene_gpio_set_bit(&priv->gc, regs + MPA_GPIO_SEL_LO,
-                                   default_lines[i] * 2, 1);
-                xgene_gpio_set_bit(&priv->gc, regs + MPA_GPIO_INT_LVL, i, 1);
-        }
+        /* Retrieve number gpio, use default if property not found */
+        priv->gc.ngpio = XGENE_DFLT_MAX_NGPIO;
+        if (!device_property_read_u32(&pdev->dev, XGENE_NGPIO_PROPERTY, &val32))
+                priv->gc.ngpio = val32;
+
+        dev_info(&pdev->dev, "Support %d gpios, %d irqs start from pin %d\n",
+                        priv->gc.ngpio, priv->nirq, priv->irq_start);
 
         platform_set_drvdata(pdev, priv);
 
-        ret = gpiochip_add_data(&priv->gc, priv);
-        if (ret)
-                dev_err(&pdev->dev, "failed to register X-Gene GPIO Standby driver\n");
+        if (pdev->dev.of_node)
+                fwnode = of_node_to_fwnode(pdev->dev.of_node);
         else
-                dev_info(&pdev->dev, "X-Gene GPIO Standby driver registered\n");
+                fwnode = pdev->dev.fwnode;
+
+        priv->irq_domain = irq_domain_create_hierarchy(parent_domain,
+                                        0, priv->nirq, fwnode,
+                                        &xgene_gpio_sb_domain_ops, priv);
+        if (!priv->irq_domain)
+                return -ENODEV;
+
+        priv->gc.irqdomain = priv->irq_domain;
+
+        ret = devm_gpiochip_add_data(&pdev->dev, &priv->gc, priv);
+        if (ret) {
+                dev_err(&pdev->dev,
+                        "failed to register X-Gene GPIO Standby driver\n");
+                irq_domain_remove(priv->irq_domain);
+                return ret;
+        }
+
+        dev_info(&pdev->dev, "X-Gene GPIO Standby driver registered\n");
 
         if (priv->nirq > 0) {
                 /* Register interrupt handlers for gpio signaled acpi events */
@@ -138,7 +337,8 @@ static int xgene_gpio_sb_remove(struct platform_device *pdev)
                 acpi_gpiochip_free_interrupts(&priv->gc);
         }
 
-        gpiochip_remove(&priv->gc);
+        irq_domain_remove(priv->irq_domain);
+
         return 0;
 }
 
diff --git a/drivers/gpio/gpio-xgene.c b/drivers/gpio/gpio-xgene.c
index 592e9cdf9c53..c0aa387664bf 100644
--- a/drivers/gpio/gpio-xgene.c
+++ b/drivers/gpio/gpio-xgene.c
@@ -193,7 +193,7 @@ static int xgene_gpio_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, gpio);
 
-        err = gpiochip_add_data(&gpio->chip, gpio);
+        err = devm_gpiochip_add_data(&pdev->dev, &gpio->chip, gpio);
         if (err) {
                 dev_err(&pdev->dev,
                         "failed to register gpiochip.\n");
@@ -207,14 +207,6 @@ err:
         return err;
 }
 
-static int xgene_gpio_remove(struct platform_device *pdev)
-{
-        struct xgene_gpio *gpio = platform_get_drvdata(pdev);
-
-        gpiochip_remove(&gpio->chip);
-        return 0;
-}
-
 static const struct of_device_id xgene_gpio_of_match[] = {
         { .compatible = "apm,xgene-gpio", },
         {},
@@ -228,7 +220,6 @@ static struct platform_driver xgene_gpio_driver = {
                 .pm     = XGENE_GPIO_PM_OPS,
         },
         .probe = xgene_gpio_probe,
-        .remove = xgene_gpio_remove,
 };
 
 module_platform_driver(xgene_gpio_driver);
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 540cbc88c7a2..682070d20f00 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -71,29 +71,29 @@ static int acpi_gpiochip_find(struct gpio_chip *gc, void *data)
  * controller uses pin controller and the mapping is not contiguous the
  * offset might be different.
  */
-static int acpi_gpiochip_pin_to_gpio_offset(struct gpio_chip *chip, int pin)
+static int acpi_gpiochip_pin_to_gpio_offset(struct gpio_device *gdev, int pin)
 {
         struct gpio_pin_range *pin_range;
 
         /* If there are no ranges in this chip, use 1:1 mapping */
-        if (list_empty(&chip->pin_ranges))
+        if (list_empty(&gdev->pin_ranges))
                 return pin;
 
-        list_for_each_entry(pin_range, &chip->pin_ranges, node) {
+        list_for_each_entry(pin_range, &gdev->pin_ranges, node) {
                 const struct pinctrl_gpio_range *range = &pin_range->range;
                 int i;
 
                 if (range->pins) {
                         for (i = 0; i < range->npins; i++) {
                                 if (range->pins[i] == pin)
-                                        return range->base + i - chip->base;
+                                        return range->base + i - gdev->base;
                         }
                 } else {
                         if (pin >= range->pin_base &&
                             pin < range->pin_base + range->npins) {
                                 unsigned gpio_base;
 
-                                gpio_base = range->base - chip->base;
+                                gpio_base = range->base - gdev->base;
                                 return gpio_base + pin - range->pin_base;
                         }
                 }
@@ -102,7 +102,7 @@ static int acpi_gpiochip_pin_to_gpio_offset(struct gpio_chip *chip, int pin)
         return -EINVAL;
 }
 #else
-static inline int acpi_gpiochip_pin_to_gpio_offset(struct gpio_chip *chip,
+static inline int acpi_gpiochip_pin_to_gpio_offset(struct gpio_device *gdev,
                                                    int pin)
 {
         return pin;
@@ -134,7 +134,7 @@ static struct gpio_desc *acpi_get_gpiod(char *path, int pin)
         if (!chip)
                 return ERR_PTR(-EPROBE_DEFER);
 
-        offset = acpi_gpiochip_pin_to_gpio_offset(chip, pin);
+        offset = acpi_gpiochip_pin_to_gpio_offset(chip->gpiodev, pin);
         if (offset < 0)
                 return ERR_PTR(offset);
 
@@ -202,7 +202,7 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares,
         if (!handler)
                 return AE_BAD_PARAMETER;
 
-        pin = acpi_gpiochip_pin_to_gpio_offset(chip, pin);
+        pin = acpi_gpiochip_pin_to_gpio_offset(chip->gpiodev, pin);
         if (pin < 0)
                 return AE_BAD_PARAMETER;
 
@@ -673,7 +673,7 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
                 struct gpio_desc *desc;
                 bool found;
 
-                pin = acpi_gpiochip_pin_to_gpio_offset(chip, pin);
+                pin = acpi_gpiochip_pin_to_gpio_offset(chip->gpiodev, pin);
                 if (pin < 0) {
                         status = AE_BAD_PARAMETER;
                         goto out;
diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c
index 405dfcaadc4c..932e510aec50 100644
--- a/drivers/gpio/gpiolib-sysfs.c
+++ b/drivers/gpio/gpiolib-sysfs.c
@@ -180,7 +180,7 @@ static int gpio_sysfs_request_irq(struct device *dev, unsigned char flags)
          *        Remove this redundant call (along with the corresponding
          *        unlock) when those drivers have been fixed.
          */
-        ret = gpiochip_lock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
+        ret = gpiochip_lock_as_irq(desc->gdev->chip, gpio_chip_hwgpio(desc));
         if (ret < 0)
                 goto err_put_kn;
 
@@ -194,7 +194,7 @@ static int gpio_sysfs_request_irq(struct device *dev, unsigned char flags)
         return 0;
 
 err_unlock:
-        gpiochip_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
+        gpiochip_unlock_as_irq(desc->gdev->chip, gpio_chip_hwgpio(desc));
 err_put_kn:
         sysfs_put(data->value_kn);
 
@@ -212,7 +212,7 @@ static void gpio_sysfs_free_irq(struct device *dev)
 
         data->irq_flags = 0;
         free_irq(data->irq, data);
-        gpiochip_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
+        gpiochip_unlock_as_irq(desc->gdev->chip, gpio_chip_hwgpio(desc));
         sysfs_put(data->value_kn);
 }
 
@@ -547,6 +547,7 @@ static struct class gpio_class = {
 int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
 {
         struct gpio_chip        *chip;
+        struct gpio_device      *gdev;
         struct gpiod_data       *data;
         unsigned long           flags;
         int                     status;
@@ -565,12 +566,13 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
                 return -EINVAL;
         }
 
-        chip = desc->chip;
+        gdev = desc->gdev;
+        chip = gdev->chip;
 
         mutex_lock(&sysfs_lock);
 
         /* check if chip is being removed */
-        if (!chip || !chip->cdev) {
+        if (!chip || !gdev->mockdev) {
                 status = -ENODEV;
                 goto err_unlock;
         }
@@ -605,7 +607,7 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
         if (chip->names && chip->names[offset])
                 ioname = chip->names[offset];
 
-        dev = device_create_with_groups(&gpio_class, chip->parent,
+        dev = device_create_with_groups(&gpio_class, &gdev->dev,
                                         MKDEV(0, 0), data, gpio_groups,
                                         ioname ? ioname : "gpio%u",
                                         desc_to_gpio(desc));
@@ -716,9 +718,11 @@ err_unlock:
 }
 EXPORT_SYMBOL_GPL(gpiod_unexport);
 
-int gpiochip_sysfs_register(struct gpio_chip *chip)
+int gpiochip_sysfs_register(struct gpio_device *gdev)
 {
         struct device   *dev;
+        struct device   *parent;
+        struct gpio_chip *chip = gdev->chip;
 
         /*
          * Many systems add gpio chips for SOC support very early,
@@ -729,8 +733,17 @@ int gpiochip_sysfs_register(struct gpio_chip *chip)
         if (!gpio_class.p)
                 return 0;
 
+        /*
+         * For sysfs backward compatibility we need to preserve this
+         * preferred parenting to the gpio_chip parent field, if set.
+         */
+        if (chip->parent)
+                parent = chip->parent;
+        else
+                parent = &gdev->dev;
+
         /* use chip->base for the ID; it's already known to be unique */
-        dev = device_create_with_groups(&gpio_class, chip->parent,
+        dev = device_create_with_groups(&gpio_class, parent,
                                         MKDEV(0, 0),
                                         chip, gpiochip_groups,
                                         "gpiochip%d", chip->base);
@@ -738,30 +751,31 @@ int gpiochip_sysfs_register(struct gpio_chip *chip)
                 return PTR_ERR(dev);
 
         mutex_lock(&sysfs_lock);
-        chip->cdev = dev;
+        gdev->mockdev = dev;
         mutex_unlock(&sysfs_lock);
 
         return 0;
 }
 
-void gpiochip_sysfs_unregister(struct gpio_chip *chip)
+void gpiochip_sysfs_unregister(struct gpio_device *gdev)
 {
         struct gpio_desc *desc;
+        struct gpio_chip *chip = gdev->chip;
         unsigned int i;
 
-        if (!chip->cdev)
+        if (!gdev->mockdev)
                 return;
 
-        device_unregister(chip->cdev);
+        device_unregister(gdev->mockdev);
 
         /* prevent further gpiod exports */
         mutex_lock(&sysfs_lock);
-        chip->cdev = NULL;
+        gdev->mockdev = NULL;
         mutex_unlock(&sysfs_lock);
 
         /* unregister gpiod class devices owned by sysfs */
         for (i = 0; i < chip->ngpio; i++) {
-                desc = &chip->desc[i];
+                desc = &gdev->descs[i];
                 if (test_and_clear_bit(FLAG_SYSFS, &desc->flags))
                         gpiod_free(desc);
         }
@@ -771,7 +785,7 @@ static int __init gpiolib_sysfs_init(void)
 {
         int             status;
         unsigned long   flags;
-        struct gpio_chip *chip;
+        struct gpio_device *gdev;
 
         status = class_register(&gpio_class);
         if (status < 0)
@@ -784,8 +798,8 @@ static int __init gpiolib_sysfs_init(void)
          * registered, and so arch_initcall() can always gpio_export().
          */
         spin_lock_irqsave(&gpio_lock, flags);
-        list_for_each_entry(chip, &gpio_chips, list) {
-                if (chip->cdev)
+        list_for_each_entry(gdev, &gpio_devices, list) {
+                if (gdev->mockdev)
                         continue;
 
                 /*
@@ -798,12 +812,11 @@ static int __init gpiolib_sysfs_init(void)
                  * gpio_lock prevents us from doing this.
                  */
                 spin_unlock_irqrestore(&gpio_lock, flags);
-                status = gpiochip_sysfs_register(chip);
+                status = gpiochip_sysfs_register(gdev);
                 spin_lock_irqsave(&gpio_lock, flags);
         }
         spin_unlock_irqrestore(&gpio_lock, flags);
 
-
         return status;
 }
 postcore_initcall(gpiolib_sysfs_init);
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 5c1ba879f889..72065532c1c7 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -16,6 +16,11 @@
 #include <linux/gpio/driver.h>
 #include <linux/gpio/machine.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/idr.h>
+#include <linux/cdev.h>
+#include <linux/fs.h>
+#include <linux/uaccess.h>
+#include <uapi/linux/gpio.h>
 
 #include "gpiolib.h"
 
@@ -42,6 +47,14 @@
 #define extra_checks    0
 #endif
 
+/* Device and char device-related information */
+static DEFINE_IDA(gpio_ida);
+static dev_t gpio_devt;
+#define GPIO_DEV_MAX 256 /* 256 GPIO chip devices supported */
+static struct bus_type gpio_bus_type = {
+        .name = "gpio",
+};
+
 /* gpio_lock prevents conflicts during gpio_desc[] table updates.
  * While any GPIO is requested, its gpio_chip is not removable;
  * each GPIO's "requested" flag serves as a lock and refcount.
@@ -50,8 +63,7 @@ DEFINE_SPINLOCK(gpio_lock);
 
 static DEFINE_MUTEX(gpio_lookup_lock);
 static LIST_HEAD(gpio_lookup_list);
-LIST_HEAD(gpio_chips);
-
+LIST_HEAD(gpio_devices);
 
 static void gpiochip_free_hogs(struct gpio_chip *chip);
 static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip);
@@ -67,15 +79,16 @@ static inline void desc_set_label(struct gpio_desc *d, const char *label)
  */
 struct gpio_desc *gpio_to_desc(unsigned gpio)
 {
-        struct gpio_chip *chip;
+        struct gpio_device *gdev;
         unsigned long flags;
 
         spin_lock_irqsave(&gpio_lock, flags);
 
-        list_for_each_entry(chip, &gpio_chips, list) {
-                if (chip->base <= gpio && chip->base + chip->ngpio > gpio) {
+        list_for_each_entry(gdev, &gpio_devices, list) {
+                if (gdev->base <= gpio &&
+                    gdev->base + gdev->ngpio > gpio) {
                         spin_unlock_irqrestore(&gpio_lock, flags);
-                        return &chip->desc[gpio - chip->base];
+                        return &gdev->descs[gpio - gdev->base];
                 }
         }
 
@@ -94,10 +107,12 @@ EXPORT_SYMBOL_GPL(gpio_to_desc);
 struct gpio_desc *gpiochip_get_desc(struct gpio_chip *chip,
                                     u16 hwnum)
 {
-        if (hwnum >= chip->ngpio)
+        struct gpio_device *gdev = chip->gpiodev;
+
+        if (hwnum >= gdev->ngpio)
                 return ERR_PTR(-EINVAL);
 
-        return &chip->desc[hwnum];
+        return &gdev->descs[hwnum];
 }
 
 /**
@@ -107,7 +122,7 @@ struct gpio_desc *gpiochip_get_desc(struct gpio_chip *chip,
  */
 int desc_to_gpio(const struct gpio_desc *desc)
 {
-        return desc->chip->base + (desc - &desc->chip->desc[0]);
+        return desc->gdev->base + (desc - &desc->gdev->descs[0]);
 }
 EXPORT_SYMBOL_GPL(desc_to_gpio);
 
@@ -118,23 +133,25 @@ EXPORT_SYMBOL_GPL(desc_to_gpio);
  */
 struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc)
 {
-        return desc ? desc->chip : NULL;
+        if (!desc || !desc->gdev || !desc->gdev->chip)
+                return NULL;
+        return desc->gdev->chip;
 }
 EXPORT_SYMBOL_GPL(gpiod_to_chip);
 
 /* dynamic allocation of GPIOs, e.g. on a hotplugged device */
 static int gpiochip_find_base(int ngpio)
 {
-        struct gpio_chip *chip;
+        struct gpio_device *gdev;
         int base = ARCH_NR_GPIOS - ngpio;
 
-        list_for_each_entry_reverse(chip, &gpio_chips, list) {
+        list_for_each_entry_reverse(gdev, &gpio_devices, list) {
                 /* found a free space? */
-                if (chip->base + chip->ngpio <= base)
+                if (gdev->base + gdev->ngpio <= base)
                         break;
                 else
                         /* nope, check the space right before the chip */
-                        base = chip->base - ngpio;
+                        base = gdev->base - ngpio;
         }
 
         if (gpio_is_valid(base)) {
@@ -187,57 +204,45 @@ EXPORT_SYMBOL_GPL(gpiod_get_direction);
  * Return -EBUSY if the new chip overlaps with some other chip's integer
  * space.
  */
-static int gpiochip_add_to_list(struct gpio_chip *chip)
+static int gpiodev_add_to_list(struct gpio_device *gdev)
 {
-        struct gpio_chip *iterator;
-        struct gpio_chip *previous = NULL;
+        struct gpio_device *prev, *next;
 
-        if (list_empty(&gpio_chips)) {
-                list_add_tail(&chip->list, &gpio_chips);
+        if (list_empty(&gpio_devices)) {
+                /* initial entry in list */
+                list_add_tail(&gdev->list, &gpio_devices);
                 return 0;
         }
 
-        list_for_each_entry(iterator, &gpio_chips, list) {
-                if (iterator->base >= chip->base + chip->ngpio) {
-                        /*
-                         * Iterator is the first GPIO chip so there is no
-                         * previous one
-                         */
-                        if (!previous) {
-                                goto found;
-                        } else {
-                                /*
-                                 * We found a valid range(means
-                                 * [base, base + ngpio - 1]) between previous
-                                 * and iterator chip.
-                                 */
-                                if (previous->base + previous->ngpio
-                                                <= chip->base)
-                                        goto found;
-                        }
-                }
-                previous = iterator;
+        next = list_entry(gpio_devices.next, struct gpio_device, list);
+        if (gdev->base + gdev->ngpio <= next->base) {
+                /* add before first entry */
+                list_add(&gdev->list, &gpio_devices);
+                return 0;
         }
 
-        /*
-         * We are beyond the last chip in the list and iterator now
-         * points to the head.
-         * Let iterator point to the last chip in the list.
-         */
-
-        iterator = list_last_entry(&gpio_chips, struct gpio_chip, list);
-        if (iterator->base + iterator->ngpio <= chip->base) {
-                list_add(&chip->list, &iterator->list);
+        prev = list_entry(gpio_devices.prev, struct gpio_device, list);
+        if (prev->base + prev->ngpio <= gdev->base) {
+                /* add behind last entry */
+                list_add_tail(&gdev->list, &gpio_devices);
                 return 0;
         }
 
-        dev_err(chip->parent,
-               "GPIO integer space overlap, cannot add chip\n");
-        return -EBUSY;
+        list_for_each_entry_safe(prev, next, &gpio_devices, list) {
+                /* at the end of the list */
+                if (&next->list == &gpio_devices)
+                        break;
 
-found:
-        list_add_tail(&chip->list, &iterator->list);
-        return 0;
+                /* add between prev and next */
+                if (prev->base + prev->ngpio <= gdev->base
+                                && gdev->base + gdev->ngpio <= next->base) {
+                        list_add(&gdev->list, &prev->list);
+                        return 0;
+                }
+        }
+
+        dev_err(&gdev->dev, "GPIO integer space overlap, cannot add chip\n");
+        return -EBUSY;
 }
 
 /**
@@ -245,23 +250,23 @@ found:
  */
 static struct gpio_desc *gpio_name_to_desc(const char * const name)
 {
-        struct gpio_chip *chip;
+        struct gpio_device *gdev;
         unsigned long flags;
 
         spin_lock_irqsave(&gpio_lock, flags);
 
-        list_for_each_entry(chip, &gpio_chips, list) {
+        list_for_each_entry(gdev, &gpio_devices, list) {
                 int i;
 
-                for (i = 0; i != chip->ngpio; ++i) {
-                        struct gpio_desc *gpio = &chip->desc[i];
+                for (i = 0; i != gdev->ngpio; ++i) {
+                        struct gpio_desc *desc = &gdev->descs[i];
 
-                        if (!gpio->name || !name)
+                        if (!desc->name || !name)
                                 continue;
 
-                        if (!strcmp(gpio->name, name)) {
+                        if (!strcmp(desc->name, name)) {
                                 spin_unlock_irqrestore(&gpio_lock, flags);
-                                return gpio;
+                                return desc;
                         }
                 }
         }
@@ -279,6 +284,7 @@ static struct gpio_desc *gpio_name_to_desc(const char * const name)
  */
 static int gpiochip_set_desc_names(struct gpio_chip *gc)
 {
+        struct gpio_device *gdev = gc->gpiodev;
         int i;
 
         if (!gc->names)
@@ -290,18 +296,153 @@ static int gpiochip_set_desc_names(struct gpio_chip *gc)
 
                 gpio = gpio_name_to_desc(gc->names[i]);
                 if (gpio)
-                        dev_warn(gc->parent, "Detected name collision for "
-                                 "GPIO name '%s'\n",
+                        dev_warn(&gdev->dev,
+                                 "Detected name collision for GPIO name '%s'\n",
                                  gc->names[i]);
         }
 
         /* Then add all names to the GPIO descriptors */
         for (i = 0; i != gc->ngpio; ++i)
-                gc->desc[i].name = gc->names[i];
+                gdev->descs[i].name = gc->names[i];
+
+        return 0;
+}
+
+/**
+ * gpio_ioctl() - ioctl handler for the GPIO chardev
+ */
+static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+        struct gpio_device *gdev = filp->private_data;
+        struct gpio_chip *chip = gdev->chip;
+        int __user *ip = (int __user *)arg;
+
+        /* We fail any subsequent ioctl():s when the chip is gone */
+        if (!chip)
+                return -ENODEV;
+
+        /* Fill in the struct and pass to userspace */
+        if (cmd == GPIO_GET_CHIPINFO_IOCTL) {
+                struct gpiochip_info chipinfo;
+
+                strncpy(chipinfo.name, dev_name(&gdev->dev),
+                        sizeof(chipinfo.name));
+                chipinfo.name[sizeof(chipinfo.name)-1] = '\0';
+                strncpy(chipinfo.label, gdev->label,
+                        sizeof(chipinfo.label));
+                chipinfo.label[sizeof(chipinfo.label)-1] = '\0';
+                chipinfo.lines = gdev->ngpio;
+                if (copy_to_user(ip, &chipinfo, sizeof(chipinfo)))
+                        return -EFAULT;
+                return 0;
+        } else if (cmd == GPIO_GET_LINEINFO_IOCTL) {
+                struct gpioline_info lineinfo;
+                struct gpio_desc *desc;
+
+                if (copy_from_user(&lineinfo, ip, sizeof(lineinfo)))
+                        return -EFAULT;
+                if (lineinfo.line_offset > gdev->ngpio)
+                        return -EINVAL;
+
+                desc = &gdev->descs[lineinfo.line_offset];
+                if (desc->name) {
+                        strncpy(lineinfo.name, desc->name,
+                                sizeof(lineinfo.name));
+                        lineinfo.name[sizeof(lineinfo.name)-1] = '\0';
+                } else {
+                        lineinfo.name[0] = '\0';
+                }
+                if (desc->label) {
+                        strncpy(lineinfo.consumer, desc->label,
+                                sizeof(lineinfo.consumer));
+                        lineinfo.consumer[sizeof(lineinfo.consumer)-1] = '\0';
+                } else {
+                        lineinfo.consumer[0] = '\0';
+                }
+
+                /*
+                 * Userspace only need to know that the kernel is using
+                 * this GPIO so it can't use it.
+                 */
+                lineinfo.flags = 0;
+                if (test_bit(FLAG_REQUESTED, &desc->flags) ||
+                    test_bit(FLAG_IS_HOGGED, &desc->flags) ||
+                    test_bit(FLAG_USED_AS_IRQ, &desc->flags) ||
+                    test_bit(FLAG_EXPORT, &desc->flags) ||
+                    test_bit(FLAG_SYSFS, &desc->flags))
+                        lineinfo.flags |= GPIOLINE_FLAG_KERNEL;
+                if (test_bit(FLAG_IS_OUT, &desc->flags))
+                        lineinfo.flags |= GPIOLINE_FLAG_IS_OUT;
+                if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
+                        lineinfo.flags |= GPIOLINE_FLAG_ACTIVE_LOW;
+                if (test_bit(FLAG_OPEN_DRAIN, &desc->flags))
+                        lineinfo.flags |= GPIOLINE_FLAG_OPEN_DRAIN;
+                if (test_bit(FLAG_OPEN_SOURCE, &desc->flags))
+                        lineinfo.flags |= GPIOLINE_FLAG_OPEN_SOURCE;
+
+                if (copy_to_user(ip, &lineinfo, sizeof(lineinfo)))
+                        return -EFAULT;
+                return 0;
+        }
+        return -EINVAL;
+}
+
+/**
+ * gpio_chrdev_open() - open the chardev for ioctl operations
+ * @inode: inode for this chardev
+ * @filp: file struct for storing private data
+ * Returns 0 on success
+ */
+static int gpio_chrdev_open(struct inode *inode, struct file *filp)
+{
+        struct gpio_device *gdev = container_of(inode->i_cdev,
+                                              struct gpio_device, chrdev);
+
+        /* Fail on open if the backing gpiochip is gone */
+        if (!gdev || !gdev->chip)
+                return -ENODEV;
+        get_device(&gdev->dev);
+        filp->private_data = gdev;
+        return 0;
+}
 
+/**
+ * gpio_chrdev_release() - close chardev after ioctl operations
+ * @inode: inode for this chardev
+ * @filp: file struct for storing private data
+ * Returns 0 on success
+ */
+static int gpio_chrdev_release(struct inode *inode, struct file *filp)
+{
+        struct gpio_device *gdev = container_of(inode->i_cdev,
+                                              struct gpio_device, chrdev);
+
+        if (!gdev)
+                return -ENODEV;
+        put_device(&gdev->dev);
         return 0;
 }
 
+
+static const struct file_operations gpio_fileops = {
+        .release = gpio_chrdev_release,
+        .open = gpio_chrdev_open,
+        .owner = THIS_MODULE,
+        .llseek = noop_llseek,
+        .unlocked_ioctl = gpio_ioctl,
+        .compat_ioctl = gpio_ioctl,
+};
+
+static void gpiodevice_release(struct device *dev)
+{
+        struct gpio_device *gdev = dev_get_drvdata(dev);
+
+        cdev_del(&gdev->chrdev);
+        list_del(&gdev->list);
+        ida_simple_remove(&gpio_ida, gdev->id);
+        kfree(gdev);
+}
+
 /**
  * gpiochip_add_data() - register a gpio_chip
  * @chip: the chip to register, with chip->base initialized
@@ -323,43 +464,107 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data)
 {
         unsigned long   flags;
         int             status = 0;
-        unsigned        id;
+        unsigned        i;
         int             base = chip->base;
-        struct gpio_desc *descs;
+        struct gpio_device *gdev;
 
-        descs = kcalloc(chip->ngpio, sizeof(descs[0]), GFP_KERNEL);
-        if (!descs)
+        /*
+         * First: allocate and populate the internal stat container, and
+         * set up the struct device.
+         */
+        gdev = kzalloc(sizeof(*gdev), GFP_KERNEL);
+        if (!gdev)
                 return -ENOMEM;
+        gdev->dev.bus = &gpio_bus_type;
+        gdev->chip = chip;
+        chip->gpiodev = gdev;
+        if (chip->parent) {
+                gdev->dev.parent = chip->parent;
+                gdev->dev.of_node = chip->parent->of_node;
+        } else {
+#ifdef CONFIG_OF_GPIO
+        /* If the gpiochip has an assigned OF node this takes precedence */
+                if (chip->of_node)
+                        gdev->dev.of_node = chip->of_node;
+#endif
+        }
+        gdev->id = ida_simple_get(&gpio_ida, 0, 0, GFP_KERNEL);
+        if (gdev->id < 0) {
+                status = gdev->id;
+                goto err_free_gdev;
+        }
+        dev_set_name(&gdev->dev, "gpiochip%d", gdev->id);
+        device_initialize(&gdev->dev);
+        dev_set_drvdata(&gdev->dev, gdev);
+        if (chip->parent && chip->parent->driver)
+                gdev->owner = chip->parent->driver->owner;
+        else if (chip->owner)
+                /* TODO: remove chip->owner */
+                gdev->owner = chip->owner;
+        else
+                gdev->owner = THIS_MODULE;
 
-        chip->data = data;
+        gdev->descs = devm_kcalloc(&gdev->dev, chip->ngpio,
+                                   sizeof(gdev->descs[0]), GFP_KERNEL);
+        if (!gdev->descs) {
+                status = -ENOMEM;
+                goto err_free_gdev;
+        }
 
         if (chip->ngpio == 0) {
                 chip_err(chip, "tried to insert a GPIO chip with zero lines\n");
-                return -EINVAL;
+                status = -EINVAL;
+                goto err_free_gdev;
         }
 
+        if (chip->label)
+                gdev->label = devm_kstrdup(&gdev->dev, chip->label, GFP_KERNEL);
+        else
+                gdev->label = devm_kstrdup(&gdev->dev, "unknown", GFP_KERNEL);
+        if (!gdev->label) {
+                status = -ENOMEM;
+                goto err_free_gdev;
+        }
+
+        gdev->ngpio = chip->ngpio;
+        gdev->data = data;
+
         spin_lock_irqsave(&gpio_lock, flags);
 
+        /*
+         * TODO: this allocates a Linux GPIO number base in the global
+         * GPIO numberspace for this chip. In the long run we want to
+         * get *rid* of this numberspace and use only descriptors, but
+         * it may be a pipe dream. It will not happen before we get rid
+         * of the sysfs interface anyways.
+         */
         if (base < 0) {
                 base = gpiochip_find_base(chip->ngpio);
                 if (base < 0) {
                         status = base;
                         spin_unlock_irqrestore(&gpio_lock, flags);
-                        goto err_free_descs;
+                        goto err_free_gdev;
                 }
+                /*
+                 * TODO: it should not be necessary to reflect the assigned
+                 * base outside of the GPIO subsystem. Go over drivers and
+                 * see if anyone makes use of this, else drop this and assign
+                 * a poison instead.
+                 */
                 chip->base = base;
         }
+        gdev->base = base;
 
-        status = gpiochip_add_to_list(chip);
+        status = gpiodev_add_to_list(gdev);
         if (status) {
                 spin_unlock_irqrestore(&gpio_lock, flags);
-                goto err_free_descs;
+                goto err_free_gdev;
         }
 
-        for (id = 0; id < chip->ngpio; id++) {
-                struct gpio_desc *desc = &descs[id];
+        for (i = 0; i < chip->ngpio; i++) {
+                struct gpio_desc *desc = &gdev->descs[i];
 
-                desc->chip = chip;
+                desc->gdev = gdev;
 
                 /* REVISIT: most hardware initializes GPIOs as inputs (often
                  * with pullups enabled) so power usage is minimized. Linux
@@ -370,17 +575,12 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data)
                 desc->flags = !chip->direction_input ? (1 << FLAG_IS_OUT) : 0;
         }
 
-        chip->desc = descs;
-
         spin_unlock_irqrestore(&gpio_lock, flags);
 
 #ifdef CONFIG_PINCTRL
-        INIT_LIST_HEAD(&chip->pin_ranges);
+        INIT_LIST_HEAD(&gdev->pin_ranges);
 #endif
 
-        if (!chip->owner && chip->parent && chip->parent->driver)
-                chip->owner = chip->parent->driver->owner;
-
         status = gpiochip_set_desc_names(chip);
         if (status)
                 goto err_remove_from_list;
@@ -391,37 +591,73 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data)
 
         acpi_gpiochip_add(chip);
 
-        status = gpiochip_sysfs_register(chip);
+        /*
+         * By first adding the chardev, and then adding the device,
+         * we get a device node entry in sysfs under
+         * /sys/bus/gpio/devices/gpiochipN/dev that can be used for
+         * coldplug of device nodes and other udev business.
+         */
+        cdev_init(&gdev->chrdev, &gpio_fileops);
+        gdev->chrdev.owner = THIS_MODULE;
+        gdev->chrdev.kobj.parent = &gdev->dev.kobj;
+        gdev->dev.devt = MKDEV(MAJOR(gpio_devt), gdev->id);
+        status = cdev_add(&gdev->chrdev, gdev->dev.devt, 1);
+        if (status < 0)
+                chip_warn(chip, "failed to add char device %d:%d\n",
+                          MAJOR(gpio_devt), gdev->id);
+        else
+                chip_dbg(chip, "added GPIO chardev (%d:%d)\n",
+                         MAJOR(gpio_devt), gdev->id);
+        status = device_add(&gdev->dev);
         if (status)
-                goto err_remove_chip;
+                goto err_remove_chardev;
+
+        status = gpiochip_sysfs_register(gdev);
+        if (status)
+                goto err_remove_device;
 
-        pr_debug("%s: registered GPIOs %d to %d on device: %s\n", __func__,
-                chip->base, chip->base + chip->ngpio - 1,
-                chip->label ? : "generic");
+        /* From this point, the .release() function cleans up gpio_device */
+        gdev->dev.release = gpiodevice_release;
+        get_device(&gdev->dev);
+        pr_debug("%s: registered GPIOs %d to %d on device: %s (%s)\n",
+                 __func__, gdev->base, gdev->base + gdev->ngpio - 1,
+                 dev_name(&gdev->dev), chip->label ? : "generic");
 
         return 0;
 
+err_remove_device:
+        device_del(&gdev->dev);
+err_remove_chardev:
+        cdev_del(&gdev->chrdev);
 err_remove_chip:
         acpi_gpiochip_remove(chip);
         gpiochip_free_hogs(chip);
         of_gpiochip_remove(chip);
 err_remove_from_list:
         spin_lock_irqsave(&gpio_lock, flags);
-        list_del(&chip->list);
+        list_del(&gdev->list);
         spin_unlock_irqrestore(&gpio_lock, flags);
-        chip->desc = NULL;
-err_free_descs:
-        kfree(descs);
-
+err_free_gdev:
+        ida_simple_remove(&gpio_ida, gdev->id);
         /* failures here can mean systems won't boot... */
         pr_err("%s: GPIOs %d..%d (%s) failed to register\n", __func__,
-                chip->base, chip->base + chip->ngpio - 1,
-                chip->label ? : "generic");
+               gdev->base, gdev->base + gdev->ngpio - 1,
+               chip->label ? : "generic");
+        kfree(gdev);
         return status;
 }
 EXPORT_SYMBOL_GPL(gpiochip_add_data);
 
 /**
+ * gpiochip_get_data() - get per-subdriver data for the chip
+ */
+void *gpiochip_get_data(struct gpio_chip *chip)
+{
+        return chip->gpiodev->data;
+}
+EXPORT_SYMBOL_GPL(gpiochip_get_data);
+
+/**
  * gpiochip_remove() - unregister a gpio_chip
  * @chip: the chip to unregister
  *
@@ -429,39 +665,123 @@ EXPORT_SYMBOL_GPL(gpiochip_add_data);
  */
 void gpiochip_remove(struct gpio_chip *chip)
 {
+        struct gpio_device *gdev = chip->gpiodev;
         struct gpio_desc *desc;
         unsigned long   flags;
-        unsigned        id;
+        unsigned        i;
         bool            requested = false;
 
-        gpiochip_sysfs_unregister(chip);
-
+        /* FIXME: should the legacy sysfs handling be moved to gpio_device? */
+        gpiochip_sysfs_unregister(gdev);
+        /* Numb the device, cancelling all outstanding operations */
+        gdev->chip = NULL;
         gpiochip_irqchip_remove(chip);
-
         acpi_gpiochip_remove(chip);
         gpiochip_remove_pin_ranges(chip);
         gpiochip_free_hogs(chip);
         of_gpiochip_remove(chip);
+        /*
+         * We accept no more calls into the driver from this point, so
+         * NULL the driver data pointer
+         */
+        gdev->data = NULL;
 
         spin_lock_irqsave(&gpio_lock, flags);
-        for (id = 0; id < chip->ngpio; id++) {
-                desc = &chip->desc[id];
-                desc->chip = NULL;
+        for (i = 0; i < gdev->ngpio; i++) {
+                desc = &gdev->descs[i];
                 if (test_bit(FLAG_REQUESTED, &desc->flags))
                         requested = true;
         }
-        list_del(&chip->list);
         spin_unlock_irqrestore(&gpio_lock, flags);
 
         if (requested)
-                dev_crit(chip->parent,
+                dev_crit(&gdev->dev,
                          "REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED\n");
 
-        kfree(chip->desc);
-        chip->desc = NULL;
+        /*
+         * The gpiochip side puts its use of the device to rest here:
+         * if there are no userspace clients, the chardev and device will
+         * be removed, else it will be dangling until the last user is
+         * gone.
+         */
+        put_device(&gdev->dev);
 }
 EXPORT_SYMBOL_GPL(gpiochip_remove);
 
+static void devm_gpio_chip_release(struct device *dev, void *res)
+{
+        struct gpio_chip *chip = *(struct gpio_chip **)res;
+
+        gpiochip_remove(chip);
+}
+
+static int devm_gpio_chip_match(struct device *dev, void *res, void *data)
+
+{
+        struct gpio_chip **r = res;
+
+        if (!r || !*r) {
+                WARN_ON(!r || !*r);
+                return 0;
+        }
+
+        return *r == data;
+}
+
+/**
+ * devm_gpiochip_add_data() - Resource manager piochip_add_data()
+ * @dev: the device pointer on which irq_chip belongs to.
+ * @chip: the chip to register, with chip->base initialized
+ * Context: potentially before irqs will work
+ *
+ * Returns a negative errno if the chip can't be registered, such as
+ * because the chip->base is invalid or already associated with a
+ * different chip.  Otherwise it returns zero as a success code.
+ *
+ * The gpio chip automatically be released when the device is unbound.
+ */
+int devm_gpiochip_add_data(struct device *dev, struct gpio_chip *chip,
+                           void *data)
+{
+        struct gpio_chip **ptr;
+        int ret;
+
+        ptr = devres_alloc(devm_gpio_chip_release, sizeof(*ptr),
+                             GFP_KERNEL);
+        if (!ptr)
+                return -ENOMEM;
+
+        ret = gpiochip_add_data(chip, data);
+        if (ret < 0) {
+                devres_free(ptr);
+                return ret;
+        }
+
+        *ptr = chip;
+        devres_add(dev, ptr);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(devm_gpiochip_add_data);
+
+/**
+ * devm_gpiochip_remove() - Resource manager of gpiochip_remove()
+ * @dev: device for which which resource was allocated
+ * @chip: the chip to remove
+ *
+ * A gpio_chip with any GPIOs still requested may not be removed.
+ */
+void devm_gpiochip_remove(struct device *dev, struct gpio_chip *chip)
+{
+        int ret;
+
+        ret = devres_release(dev, devm_gpio_chip_release,
+                             devm_gpio_chip_match, chip);
+        if (!ret)
+                WARN_ON(ret);
+}
+EXPORT_SYMBOL_GPL(devm_gpiochip_remove);
+
 /**
  * gpiochip_find() - iterator for locating a specific gpio_chip
  * @data: data to pass to match function
@@ -477,17 +797,21 @@ struct gpio_chip *gpiochip_find(void *data,
                                 int (*match)(struct gpio_chip *chip,
                                              void *data))
 {
+        struct gpio_device *gdev;
         struct gpio_chip *chip;
         unsigned long flags;
 
         spin_lock_irqsave(&gpio_lock, flags);
-        list_for_each_entry(chip, &gpio_chips, list)
-                if (match(chip, data))
+        list_for_each_entry(gdev, &gpio_devices, list)
+                if (match(gdev->chip, data))
                         break;
 
         /* No match? */
-        if (&chip->list == &gpio_chips)
+        if (&gdev->list == &gpio_devices)
                 chip = NULL;
+        else
+                chip = gdev->chip;
+
         spin_unlock_irqrestore(&gpio_lock, flags);
 
         return chip;
@@ -617,14 +941,14 @@ static int gpiochip_irq_reqres(struct irq_data *d)
 {
         struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
 
-        if (!try_module_get(chip->owner))
+        if (!try_module_get(chip->gpiodev->owner))
                 return -ENODEV;
 
         if (gpiochip_lock_as_irq(chip, d->hwirq)) {
                 chip_err(chip,
                         "unable to lock HW IRQ %lu for IRQ\n",
                         d->hwirq);
-                module_put(chip->owner);
+                module_put(chip->gpiodev->owner);
                 return -EINVAL;
         }
         return 0;
@@ -635,7 +959,7 @@ static void gpiochip_irq_relres(struct irq_data *d)
         struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
 
         gpiochip_unlock_as_irq(chip, d->hwirq);
-        module_put(chip->owner);
+        module_put(chip->gpiodev->owner);
 }
 
 static int gpiochip_to_irq(struct gpio_chip *chip, unsigned offset)
@@ -785,7 +1109,7 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip) {}
  */
 int gpiochip_generic_request(struct gpio_chip *chip, unsigned offset)
 {
-        return pinctrl_request_gpio(chip->base + offset);
+        return pinctrl_request_gpio(chip->gpiodev->base + offset);
 }
 EXPORT_SYMBOL_GPL(gpiochip_generic_request);
 
@@ -796,7 +1120,7 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_request);
  */
 void gpiochip_generic_free(struct gpio_chip *chip, unsigned offset)
 {
-        pinctrl_free_gpio(chip->base + offset);
+        pinctrl_free_gpio(chip->gpiodev->base + offset);
 }
 EXPORT_SYMBOL_GPL(gpiochip_generic_free);
 
@@ -814,6 +1138,7 @@ int gpiochip_add_pingroup_range(struct gpio_chip *chip,
                         unsigned int gpio_offset, const char *pin_group)
 {
         struct gpio_pin_range *pin_range;
+        struct gpio_device *gdev = chip->gpiodev;
         int ret;
 
         pin_range = kzalloc(sizeof(*pin_range), GFP_KERNEL);
@@ -826,7 +1151,7 @@ int gpiochip_add_pingroup_range(struct gpio_chip *chip,
         pin_range->range.id = gpio_offset;
         pin_range->range.gc = chip;
         pin_range->range.name = chip->label;
-        pin_range->range.base = chip->base + gpio_offset;
+        pin_range->range.base = gdev->base + gpio_offset;
         pin_range->pctldev = pctldev;
 
         ret = pinctrl_get_group_pins(pctldev, pin_group,
@@ -843,7 +1168,7 @@ int gpiochip_add_pingroup_range(struct gpio_chip *chip,
                  gpio_offset, gpio_offset + pin_range->range.npins - 1,
                  pinctrl_dev_get_devname(pctldev), pin_group);
 
-        list_add_tail(&pin_range->node, &chip->pin_ranges);
+        list_add_tail(&pin_range->node, &gdev->pin_ranges);
 
         return 0;
 }
@@ -863,6 +1188,7 @@ int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
                            unsigned int npins)
 {
         struct gpio_pin_range *pin_range;
+        struct gpio_device *gdev = chip->gpiodev;
         int ret;
 
         pin_range = kzalloc(sizeof(*pin_range), GFP_KERNEL);
@@ -875,7 +1201,7 @@ int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
         pin_range->range.id = gpio_offset;
         pin_range->range.gc = chip;
         pin_range->range.name = chip->label;
-        pin_range->range.base = chip->base + gpio_offset;
+        pin_range->range.base = gdev->base + gpio_offset;
         pin_range->range.pin_base = pin_offset;
         pin_range->range.npins = npins;
         pin_range->pctldev = pinctrl_find_and_add_gpio_range(pinctl_name,
@@ -891,7 +1217,7 @@ int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
                  pinctl_name,
                  pin_offset, pin_offset + npins - 1);
 
-        list_add_tail(&pin_range->node, &chip->pin_ranges);
+        list_add_tail(&pin_range->node, &gdev->pin_ranges);
 
         return 0;
 }
@@ -904,8 +1230,9 @@ EXPORT_SYMBOL_GPL(gpiochip_add_pin_range);
 void gpiochip_remove_pin_ranges(struct gpio_chip *chip)
 {
         struct gpio_pin_range *pin_range, *tmp;
+        struct gpio_device *gdev = chip->gpiodev;
 
-        list_for_each_entry_safe(pin_range, tmp, &chip->pin_ranges, node) {
+        list_for_each_entry_safe(pin_range, tmp, &gdev->pin_ranges, node) {
                 list_del(&pin_range->node);
                 pinctrl_remove_gpio_range(pin_range->pctldev,
                                 &pin_range->range);
@@ -922,7 +1249,7 @@ EXPORT_SYMBOL_GPL(gpiochip_remove_pin_ranges);
  */
 static int __gpiod_request(struct gpio_desc *desc, const char *label)
 {
-        struct gpio_chip        *chip = desc->chip;
+        struct gpio_chip        *chip = desc->gdev->chip;
         int                     status;
         unsigned long           flags;
 
@@ -971,27 +1298,50 @@ done:
         return status;
 }
 
+/*
+ * This descriptor validation needs to be inserted verbatim into each
+ * function taking a descriptor, so we need to use a preprocessor
+ * macro to avoid endless duplication.
+ */
+#define VALIDATE_DESC(desc) do { \
+        if (!desc || !desc->gdev) { \
+                pr_warn("%s: invalid GPIO\n", __func__); \
+                return -EINVAL; \
+        } \
+        if ( !desc->gdev->chip ) { \
+                dev_warn(&desc->gdev->dev, \
+                         "%s: backing chip is gone\n", __func__); \
+                return 0; \
+        } } while (0)
+
+#define VALIDATE_DESC_VOID(desc) do { \
+        if (!desc || !desc->gdev) { \
+                pr_warn("%s: invalid GPIO\n", __func__); \
+                return; \
+        } \
+        if (!desc->gdev->chip) { \
+                dev_warn(&desc->gdev->dev, \
+                         "%s: backing chip is gone\n", __func__); \
+                return; \
+        } } while (0)
+
+
 int gpiod_request(struct gpio_desc *desc, const char *label)
 {
         int status = -EPROBE_DEFER;
-        struct gpio_chip *chip;
+        struct gpio_device *gdev;
 
-        if (!desc) {
-                pr_warn("%s: invalid GPIO\n", __func__);
-                return -EINVAL;
-        }
+        VALIDATE_DESC(desc);
+        gdev = desc->gdev;
 
-        chip = desc->chip;
-        if (!chip)
-                goto done;
-
-        if (try_module_get(chip->owner)) {
+        if (try_module_get(gdev->owner)) {
                 status = __gpiod_request(desc, label);
                 if (status < 0)
-                        module_put(chip->owner);
+                        module_put(gdev->owner);
+                else
+                        get_device(&gdev->dev);
         }
 
-done:
         if (status)
                 gpiod_dbg(desc, "%s: status %d\n", __func__, status);
 
@@ -1010,7 +1360,7 @@ static bool __gpiod_free(struct gpio_desc *desc)
 
         spin_lock_irqsave(&gpio_lock, flags);
 
-        chip = desc->chip;
+        chip = desc->gdev->chip;
         if (chip && test_bit(FLAG_REQUESTED, &desc->flags)) {
                 if (chip->free) {
                         spin_unlock_irqrestore(&gpio_lock, flags);
@@ -1033,10 +1383,12 @@ static bool __gpiod_free(struct gpio_desc *desc)
 
 void gpiod_free(struct gpio_desc *desc)
 {
-        if (desc && __gpiod_free(desc))
-                module_put(desc->chip->owner);
-        else
+        if (desc && desc->gdev && __gpiod_free(desc)) {
+                module_put(desc->gdev->owner);
+                put_device(&desc->gdev->dev);
+        } else {
                 WARN_ON(extra_checks);
+        }
 }
 
 /**
@@ -1059,7 +1411,7 @@ const char *gpiochip_is_requested(struct gpio_chip *chip, unsigned offset)
         if (offset >= chip->ngpio)
                 return NULL;
 
-        desc = &chip->desc[offset];
+        desc = &chip->gpiodev->descs[offset];
 
         if (test_bit(FLAG_REQUESTED, &desc->flags) == 0)
                 return NULL;
@@ -1111,7 +1463,8 @@ void gpiochip_free_own_desc(struct gpio_desc *desc)
 }
 EXPORT_SYMBOL_GPL(gpiochip_free_own_desc);
 
-/* Drivers MUST set GPIO direction before making get/set calls.  In
+/*
+ * Drivers MUST set GPIO direction before making get/set calls.  In
  * some cases this is done in early boot, before IRQs are enabled.
  *
  * As a rule these aren't called more than once (except for drivers
@@ -1134,12 +1487,9 @@ int gpiod_direction_input(struct gpio_desc *desc)
         struct gpio_chip        *chip;
         int                     status = -EINVAL;
 
-        if (!desc || !desc->chip) {
-                pr_warn("%s: invalid GPIO\n", __func__);
-                return -EINVAL;
-        }
+        VALIDATE_DESC(desc);
+        chip = desc->gdev->chip;
 
-        chip = desc->chip;
         if (!chip->get || !chip->direction_input) {
                 gpiod_warn(desc,
                         "%s: missing get() or direction_input() operations\n",
@@ -1178,7 +1528,7 @@ static int _gpiod_direction_output_raw(struct gpio_desc *desc, int value)
         if (!value && test_bit(FLAG_OPEN_SOURCE,  &desc->flags))
                 return gpiod_direction_input(desc);
 
-        chip = desc->chip;
+        chip = desc->gdev->chip;
         if (!chip->set || !chip->direction_output) {
                 gpiod_warn(desc,
                        "%s: missing set() or direction_output() operations\n",
@@ -1207,10 +1557,7 @@ static int _gpiod_direction_output_raw(struct gpio_desc *desc, int value)
  */
 int gpiod_direction_output_raw(struct gpio_desc *desc, int value)
 {
-        if (!desc || !desc->chip) {
-                pr_warn("%s: invalid GPIO\n", __func__);
-                return -EINVAL;
-        }
+        VALIDATE_DESC(desc);
         return _gpiod_direction_output_raw(desc, value);
 }
 EXPORT_SYMBOL_GPL(gpiod_direction_output_raw);
@@ -1229,10 +1576,7 @@ EXPORT_SYMBOL_GPL(gpiod_direction_output_raw);
  */
 int gpiod_direction_output(struct gpio_desc *desc, int value)
 {
-        if (!desc || !desc->chip) {
-                pr_warn("%s: invalid GPIO\n", __func__);
-                return -EINVAL;
-        }
+        VALIDATE_DESC(desc);
         if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
                 value = !value;
         return _gpiod_direction_output_raw(desc, value);
@@ -1251,12 +1595,8 @@ int gpiod_set_debounce(struct gpio_desc *desc, unsigned debounce)
 {
         struct gpio_chip        *chip;
 
-        if (!desc || !desc->chip) {
-                pr_warn("%s: invalid GPIO\n", __func__);
-                return -EINVAL;
-        }
-
-        chip = desc->chip;
+        VALIDATE_DESC(desc);
+        chip = desc->gdev->chip;
         if (!chip->set || !chip->set_debounce) {
                 gpiod_dbg(desc,
                           "%s: missing set() or set_debounce() operations\n",
@@ -1276,6 +1616,7 @@ EXPORT_SYMBOL_GPL(gpiod_set_debounce);
  */
 int gpiod_is_active_low(const struct gpio_desc *desc)
 {
+        VALIDATE_DESC(desc);
         return test_bit(FLAG_ACTIVE_LOW, &desc->flags);
 }
 EXPORT_SYMBOL_GPL(gpiod_is_active_low);
@@ -1308,7 +1649,7 @@ static int _gpiod_get_raw_value(const struct gpio_desc *desc)
         int offset;
         int value;
 
-        chip = desc->chip;
+        chip = desc->gdev->chip;
         offset = gpio_chip_hwgpio(desc);
         value = chip->get ? chip->get(chip, offset) : -EIO;
         value = value < 0 ? value : !!value;
@@ -1328,10 +1669,9 @@ static int _gpiod_get_raw_value(const struct gpio_desc *desc)
  */
 int gpiod_get_raw_value(const struct gpio_desc *desc)
 {
-        if (!desc)
-                return 0;
+        VALIDATE_DESC(desc);
         /* Should be using gpio_get_value_cansleep() */
-        WARN_ON(desc->chip->can_sleep);
+        WARN_ON(desc->gdev->chip->can_sleep);
         return _gpiod_get_raw_value(desc);
 }
 EXPORT_SYMBOL_GPL(gpiod_get_raw_value);
@@ -1349,10 +1689,10 @@ EXPORT_SYMBOL_GPL(gpiod_get_raw_value);
 int gpiod_get_value(const struct gpio_desc *desc)
 {
         int value;
-        if (!desc)
-                return 0;
+
+        VALIDATE_DESC(desc);
         /* Should be using gpio_get_value_cansleep() */
-        WARN_ON(desc->chip->can_sleep);
+        WARN_ON(desc->gdev->chip->can_sleep);
 
         value = _gpiod_get_raw_value(desc);
         if (value < 0)
@@ -1373,7 +1713,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_value);
 static void _gpio_set_open_drain_value(struct gpio_desc *desc, bool value)
 {
         int err = 0;
-        struct gpio_chip *chip = desc->chip;
+        struct gpio_chip *chip = desc->gdev->chip;
         int offset = gpio_chip_hwgpio(desc);
 
         if (value) {
@@ -1400,7 +1740,7 @@ static void _gpio_set_open_drain_value(struct gpio_desc *desc, bool value)
 static void _gpio_set_open_source_value(struct gpio_desc *desc, bool value)
 {
         int err = 0;
-        struct gpio_chip *chip = desc->chip;
+        struct gpio_chip *chip = desc->gdev->chip;
         int offset = gpio_chip_hwgpio(desc);
 
         if (value) {
@@ -1423,7 +1763,7 @@ static void _gpiod_set_raw_value(struct gpio_desc *desc, bool value)
 {
         struct gpio_chip        *chip;
 
-        chip = desc->chip;
+        chip = desc->gdev->chip;
         trace_gpio_value(desc_to_gpio(desc), 0, value);
         if (test_bit(FLAG_OPEN_DRAIN, &desc->flags))
                 _gpio_set_open_drain_value(desc, value);
@@ -1471,7 +1811,7 @@ static void gpiod_set_array_value_priv(bool raw, bool can_sleep,
         int i = 0;
 
         while (i < array_size) {
-                struct gpio_chip *chip = desc_array[i]->chip;
+                struct gpio_chip *chip = desc_array[i]->gdev->chip;
                 unsigned long mask[BITS_TO_LONGS(chip->ngpio)];
                 unsigned long bits[BITS_TO_LONGS(chip->ngpio)];
                 int count = 0;
@@ -1505,7 +1845,8 @@ static void gpiod_set_array_value_priv(bool raw, bool can_sleep,
                                 count++;
                         }
                         i++;
-                } while ((i < array_size) && (desc_array[i]->chip == chip));
+                } while ((i < array_size) &&
+                         (desc_array[i]->gdev->chip == chip));
                 /* push collected bits to outputs */
                 if (count != 0)
                         gpio_chip_set_multiple(chip, mask, bits);
@@ -1525,10 +1866,9 @@ static void gpiod_set_array_value_priv(bool raw, bool can_sleep,
  */
 void gpiod_set_raw_value(struct gpio_desc *desc, int value)
 {
-        if (!desc)
-                return;
-        /* Should be using gpio_set_value_cansleep() */
-        WARN_ON(desc->chip->can_sleep);
+        VALIDATE_DESC_VOID(desc);
+        /* Should be using gpiod_set_value_cansleep() */
+        WARN_ON(desc->gdev->chip->can_sleep);
         _gpiod_set_raw_value(desc, value);
 }
 EXPORT_SYMBOL_GPL(gpiod_set_raw_value);
@@ -1546,10 +1886,9 @@ EXPORT_SYMBOL_GPL(gpiod_set_raw_value);
  */
 void gpiod_set_value(struct gpio_desc *desc, int value)
 {
-        if (!desc)
-                return;
-        /* Should be using gpio_set_value_cansleep() */
-        WARN_ON(desc->chip->can_sleep);
+        VALIDATE_DESC_VOID(desc);
+        /* Should be using gpiod_set_value_cansleep() */
+        WARN_ON(desc->gdev->chip->can_sleep);
         if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
                 value = !value;
         _gpiod_set_raw_value(desc, value);
@@ -1607,9 +1946,8 @@ EXPORT_SYMBOL_GPL(gpiod_set_array_value);
  */
 int gpiod_cansleep(const struct gpio_desc *desc)
 {
-        if (!desc)
-                return 0;
-        return desc->chip->can_sleep;
+        VALIDATE_DESC(desc);
+        return desc->gdev->chip->can_sleep;
 }
 EXPORT_SYMBOL_GPL(gpiod_cansleep);
 
@@ -1625,9 +1963,8 @@ int gpiod_to_irq(const struct gpio_desc *desc)
         struct gpio_chip        *chip;
         int                     offset;
 
-        if (!desc)
-                return -EINVAL;
-        chip = desc->chip;
+        VALIDATE_DESC(desc);
+        chip = desc->gdev->chip;
         offset = gpio_chip_hwgpio(desc);
         return chip->to_irq ? chip->to_irq(chip, offset) : -ENXIO;
 }
@@ -1646,14 +1983,14 @@ int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
         if (offset >= chip->ngpio)
                 return -EINVAL;
 
-        if (test_bit(FLAG_IS_OUT, &chip->desc[offset].flags)) {
+        if (test_bit(FLAG_IS_OUT, &chip->gpiodev->descs[offset].flags)) {
                 chip_err(chip,
                           "%s: tried to flag a GPIO set as output for IRQ\n",
                           __func__);
                 return -EIO;
         }
 
-        set_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
+        set_bit(FLAG_USED_AS_IRQ, &chip->gpiodev->descs[offset].flags);
         return 0;
 }
 EXPORT_SYMBOL_GPL(gpiochip_lock_as_irq);
@@ -1671,10 +2008,37 @@ void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset)
         if (offset >= chip->ngpio)
                 return;
 
-        clear_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
+        clear_bit(FLAG_USED_AS_IRQ, &chip->gpiodev->descs[offset].flags);
 }
 EXPORT_SYMBOL_GPL(gpiochip_unlock_as_irq);
 
+bool gpiochip_line_is_irq(struct gpio_chip *chip, unsigned int offset)
+{
+        if (offset >= chip->ngpio)
+                return false;
+
+        return test_bit(FLAG_USED_AS_IRQ, &chip->gpiodev->descs[offset].flags);
+}
+EXPORT_SYMBOL_GPL(gpiochip_line_is_irq);
+
+bool gpiochip_line_is_open_drain(struct gpio_chip *chip, unsigned int offset)
+{
+        if (offset >= chip->ngpio)
+                return false;
+
+        return test_bit(FLAG_OPEN_DRAIN, &chip->gpiodev->descs[offset].flags);
+}
+EXPORT_SYMBOL_GPL(gpiochip_line_is_open_drain);
+
+bool gpiochip_line_is_open_source(struct gpio_chip *chip, unsigned int offset)
+{
+        if (offset >= chip->ngpio)
+                return false;
+
+        return test_bit(FLAG_OPEN_SOURCE, &chip->gpiodev->descs[offset].flags);
+}
+EXPORT_SYMBOL_GPL(gpiochip_line_is_open_source);
+
 /**
  * gpiod_get_raw_value_cansleep() - return a gpio's raw value
  * @desc: gpio whose value will be returned
@@ -1687,8 +2051,7 @@ EXPORT_SYMBOL_GPL(gpiochip_unlock_as_irq);
 int gpiod_get_raw_value_cansleep(const struct gpio_desc *desc)
 {
         might_sleep_if(extra_checks);
-        if (!desc)
-                return 0;
+        VALIDATE_DESC(desc);
         return _gpiod_get_raw_value(desc);
 }
 EXPORT_SYMBOL_GPL(gpiod_get_raw_value_cansleep);
@@ -1707,9 +2070,7 @@ int gpiod_get_value_cansleep(const struct gpio_desc *desc)
         int value;
 
         might_sleep_if(extra_checks);
-        if (!desc)
-                return 0;
-
+        VALIDATE_DESC(desc);
         value = _gpiod_get_raw_value(desc);
         if (value < 0)
                 return value;
@@ -1734,8 +2095,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_value_cansleep);
 void gpiod_set_raw_value_cansleep(struct gpio_desc *desc, int value)
 {
         might_sleep_if(extra_checks);
-        if (!desc)
-                return;
+        VALIDATE_DESC_VOID(desc);
         _gpiod_set_raw_value(desc, value);
 }
 EXPORT_SYMBOL_GPL(gpiod_set_raw_value_cansleep);
@@ -1753,9 +2113,7 @@ EXPORT_SYMBOL_GPL(gpiod_set_raw_value_cansleep);
 void gpiod_set_value_cansleep(struct gpio_desc *desc, int value)
 {
         might_sleep_if(extra_checks);
-        if (!desc)
-                return;
-
+        VALIDATE_DESC_VOID(desc);
         if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
                 value = !value;
         _gpiod_set_raw_value(desc, value);
@@ -2358,8 +2716,8 @@ static void gpiochip_free_hogs(struct gpio_chip *chip)
         int id;
 
         for (id = 0; id < chip->ngpio; id++) {
-                if (test_bit(FLAG_IS_HOGGED, &chip->desc[id].flags))
-                        gpiochip_free_own_desc(&chip->desc[id]);
+                if (test_bit(FLAG_IS_HOGGED, &chip->gpiodev->descs[id].flags))
+                        gpiochip_free_own_desc(&chip->gpiodev->descs[id]);
         }
 }
 
@@ -2456,17 +2814,38 @@ void gpiod_put_array(struct gpio_descs *descs)
 }
 EXPORT_SYMBOL_GPL(gpiod_put_array);
 
+static int __init gpiolib_dev_init(void)
+{
+        int ret;
+
+        /* Register GPIO sysfs bus */
+        ret  = bus_register(&gpio_bus_type);
+        if (ret < 0) {
+                pr_err("gpiolib: could not register GPIO bus type\n");
+                return ret;
+        }
+
+        ret = alloc_chrdev_region(&gpio_devt, 0, GPIO_DEV_MAX, "gpiochip");
+        if (ret < 0) {
+                pr_err("gpiolib: failed to allocate char dev region\n");
+                bus_unregister(&gpio_bus_type);
+        }
+        return ret;
+}
+core_initcall(gpiolib_dev_init);
+
 #ifdef CONFIG_DEBUG_FS
 
-static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip)
+static void gpiolib_dbg_show(struct seq_file *s, struct gpio_device *gdev)
 {
         unsigned                i;
-        unsigned                gpio = chip->base;
-        struct gpio_desc        *gdesc = &chip->desc[0];
+        struct gpio_chip        *chip = gdev->chip;
+        unsigned                gpio = gdev->base;
+        struct gpio_desc        *gdesc = &gdev->descs[0];
         int                     is_out;
         int                     is_irq;
 
-        for (i = 0; i < chip->ngpio; i++, gpio++, gdesc++) {
+        for (i = 0; i < gdev->ngpio; i++, gpio++, gdesc++) {
                 if (!test_bit(FLAG_REQUESTED, &gdesc->flags)) {
                         if (gdesc->name) {
                                 seq_printf(s, " gpio-%-3d (%-20.20s)\n",
@@ -2492,16 +2871,16 @@ static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip)
 static void *gpiolib_seq_start(struct seq_file *s, loff_t *pos)
 {
         unsigned long flags;
-        struct gpio_chip *chip = NULL;
+        struct gpio_device *gdev = NULL;
         loff_t index = *pos;
 
         s->private = "";
 
         spin_lock_irqsave(&gpio_lock, flags);
-        list_for_each_entry(chip, &gpio_chips, list)
+        list_for_each_entry(gdev, &gpio_devices, list)
                 if (index-- == 0) {
                         spin_unlock_irqrestore(&gpio_lock, flags);
-                        return chip;
+                        return gdev;
                 }
         spin_unlock_irqrestore(&gpio_lock, flags);
 
@@ -2511,14 +2890,14 @@ static void *gpiolib_seq_start(struct seq_file *s, loff_t *pos)
 static void *gpiolib_seq_next(struct seq_file *s, void *v, loff_t *pos)
 {
         unsigned long flags;
-        struct gpio_chip *chip = v;
+        struct gpio_device *gdev = v;
         void *ret = NULL;
 
         spin_lock_irqsave(&gpio_lock, flags);
-        if (list_is_last(&chip->list, &gpio_chips))
+        if (list_is_last(&gdev->list, &gpio_devices))
                 ret = NULL;
         else
-                ret = list_entry(chip->list.next, struct gpio_chip, list);
+                ret = list_entry(gdev->list.next, struct gpio_device, list);
         spin_unlock_irqrestore(&gpio_lock, flags);
 
         s->private = "\n";
@@ -2533,15 +2912,24 @@ static void gpiolib_seq_stop(struct seq_file *s, void *v)
 
 static int gpiolib_seq_show(struct seq_file *s, void *v)
 {
-        struct gpio_chip *chip = v;
-        struct device *dev;
+        struct gpio_device *gdev = v;
+        struct gpio_chip *chip = gdev->chip;
+        struct device *parent;
+
+        if (!chip) {
+                seq_printf(s, "%s%s: (dangling chip)", (char *)s->private,
+                           dev_name(&gdev->dev));
+                return 0;
+        }
 
-        seq_printf(s, "%sGPIOs %d-%d", (char *)s->private,
-                        chip->base, chip->base + chip->ngpio - 1);
-        dev = chip->parent;
-        if (dev)
-                seq_printf(s, ", %s/%s", dev->bus ? dev->bus->name : "no-bus",
-                        dev_name(dev));
+        seq_printf(s, "%s%s: GPIOs %d-%d", (char *)s->private,
+                   dev_name(&gdev->dev),
+                   gdev->base, gdev->base + gdev->ngpio - 1);
+        parent = chip->parent;
+        if (parent)
+                seq_printf(s, ", parent: %s/%s",
+                           parent->bus ? parent->bus->name : "no-bus",
+                           dev_name(parent));
         if (chip->label)
                 seq_printf(s, ", %s", chip->label);
         if (chip->can_sleep)
@@ -2551,7 +2939,7 @@ static int gpiolib_seq_show(struct seq_file *s, void *v)
         if (chip->dbg_show)
                 chip->dbg_show(s, chip);
         else
-                gpiolib_dbg_show(s, chip);
+                gpiolib_dbg_show(s, gdev);
 
         return 0;
 }
diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h
index 99ed3b00ffe9..e30e5fdb1214 100644
--- a/drivers/gpio/gpiolib.h
+++ b/drivers/gpio/gpiolib.h
@@ -12,14 +12,67 @@
 #ifndef GPIOLIB_H
 #define GPIOLIB_H
 
+#include <linux/gpio/driver.h>
 #include <linux/err.h>
 #include <linux/device.h>
+#include <linux/module.h>
+#include <linux/cdev.h>
 
 enum of_gpio_flags;
 enum gpiod_flags;
 struct acpi_device;
 
 /**
+ * struct gpio_device - internal state container for GPIO devices
+ * @id: numerical ID number for the GPIO chip
+ * @dev: the GPIO device struct
+ * @chrdev: character device for the GPIO device
+ * @mockdev: class device used by the deprecated sysfs interface (may be
+ * NULL)
+ * @owner: helps prevent removal of modules exporting active GPIOs
+ * @chip: pointer to the corresponding gpiochip, holding static
+ * data for this device
+ * @descs: array of ngpio descriptors.
+ * @ngpio: the number of GPIO lines on this GPIO device, equal to the size
+ * of the @descs array.
+ * @base: GPIO base in the DEPRECATED global Linux GPIO numberspace, assigned
+ * at device creation time.
+ * @label: a descriptive name for the GPIO device, such as the part number
+ * or name of the IP component in a System on Chip.
+ * @data: per-instance data assigned by the driver
+ * @list: links gpio_device:s together for traversal
+ *
+ * This state container holds most of the runtime variable data
+ * for a GPIO device and can hold references and live on after the
+ * GPIO chip has been removed, if it is still being used from
+ * userspace.
+ */
+struct gpio_device {
+        int                     id;
+        struct device           dev;
+        struct cdev             chrdev;
+        struct device           *mockdev;
+        struct module           *owner;
+        struct gpio_chip        *chip;
+        struct gpio_desc        *descs;
+        int                     base;
+        u16                     ngpio;
+        char                    *label;
+        void                    *data;
+        struct list_head        list;
+
+#ifdef CONFIG_PINCTRL
+        /*
+         * If CONFIG_PINCTRL is enabled, then gpio controllers can optionally
+         * describe the actual pin range which they serve in an SoC. This
+         * information would be used by pinctrl subsystem to configure
+         * corresponding pins for gpio usage.
+         */
+        struct list_head pin_ranges;
+#endif
+};
+
+/**
  * struct acpi_gpio_info - ACPI GPIO specific information
  * @gpioint: if %true this GPIO is of type GpioInt otherwise type is GpioIo
  * @active_low: in case of @gpioint, the pin is active low
@@ -90,10 +143,10 @@ struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np,
 struct gpio_desc *gpiochip_get_desc(struct gpio_chip *chip, u16 hwnum);
 
 extern struct spinlock gpio_lock;
-extern struct list_head gpio_chips;
+extern struct list_head gpio_devices;
 
 struct gpio_desc {
-        struct gpio_chip        *chip;
+        struct gpio_device      *gdev;
         unsigned long           flags;
 /* flag symbols are bit numbers */
 #define FLAG_REQUESTED  0
@@ -122,7 +175,7 @@ int gpiod_hog(struct gpio_desc *desc, const char *name,
  */
 static int __maybe_unused gpio_chip_hwgpio(const struct gpio_desc *desc)
 {
-        return desc - &desc->chip->desc[0];
+        return desc - &desc->gdev->descs[0];
 }
 
 /* With descriptor prefix */
@@ -149,31 +202,31 @@ static int __maybe_unused gpio_chip_hwgpio(const struct gpio_desc *desc)
 /* With chip prefix */
 
 #define chip_emerg(chip, fmt, ...)                                      \
-        pr_emerg("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)
+        dev_emerg(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)
 #define chip_crit(chip, fmt, ...)                                       \
-        pr_crit("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)
+        dev_crit(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)
 #define chip_err(chip, fmt, ...)                                        \
-        pr_err("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)
+        dev_err(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)
 #define chip_warn(chip, fmt, ...)                                       \
-        pr_warn("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)
+        dev_warn(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)
 #define chip_info(chip, fmt, ...)                                       \
-        pr_info("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)
+        dev_info(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)
 #define chip_dbg(chip, fmt, ...)                                        \
-        pr_debug("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)
+        dev_dbg(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)
 
 #ifdef CONFIG_GPIO_SYSFS
 
-int gpiochip_sysfs_register(struct gpio_chip *chip);
-void gpiochip_sysfs_unregister(struct gpio_chip *chip);
+int gpiochip_sysfs_register(struct gpio_device *gdev);
+void gpiochip_sysfs_unregister(struct gpio_device *gdev);
 
 #else
 
-static inline int gpiochip_sysfs_register(struct gpio_chip *chip)
+static inline int gpiochip_sysfs_register(struct gpio_device *gdev)
 {
         return 0;
 }
 
-static inline void gpiochip_sysfs_unregister(struct gpio_chip *chip)
+static inline void gpiochip_sysfs_unregister(struct gpio_device *gdev)
 {
 }
 
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 9ca66de0c1c1..1bc97c2761e4 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1181,27 +1181,25 @@ config MFD_TPS65910
           Power Management chips.
 
 config MFD_TPS65912
-        bool "TI TPS65912 Power Management chip"
-        depends on GPIOLIB
+        tristate
         select MFD_CORE
-        help
-          If you say yes here you get support for the TPS65912 series of
-          PM chips.
+        select REGMAP
+        select REGMAP_IRQ
 
 config MFD_TPS65912_I2C
-        bool "TI TPS65912 Power Management chip with I2C"
-        select MFD_CORE
+        tristate "TI TPS65912 Power Management chip with I2C"
         select MFD_TPS65912
-        depends on I2C=y && GPIOLIB
+        select REGMAP_I2C
+        depends on I2C
         help
           If you say yes here you get support for the TPS65912 series of
           PM chips with I2C interface.
 
 config MFD_TPS65912_SPI
-        bool "TI TPS65912 Power Management chip with SPI"
-        select MFD_CORE
+        tristate "TI TPS65912 Power Management chip with SPI"
         select MFD_TPS65912
-        depends on SPI_MASTER && GPIOLIB
+        select REGMAP_SPI
+        depends on SPI_MASTER
         help
           If you say yes here you get support for the TPS65912 series of
           PM chips with SPI interface.
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 0f230a6103f8..1811202cee19 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -73,8 +73,7 @@ obj-$(CONFIG_TPS6507X)		+= tps6507x.o
 obj-$(CONFIG_MFD_TPS65217)      += tps65217.o
 obj-$(CONFIG_MFD_TPS65218)      += tps65218.o
 obj-$(CONFIG_MFD_TPS65910)      += tps65910.o
-tps65912-objs                   := tps65912-core.o tps65912-irq.o
-obj-$(CONFIG_MFD_TPS65912)      += tps65912.o
+obj-$(CONFIG_MFD_TPS65912)      += tps65912-core.o
 obj-$(CONFIG_MFD_TPS65912_I2C)  += tps65912-i2c.o
 obj-$(CONFIG_MFD_TPS65912_SPI)  += tps65912-spi.o
 obj-$(CONFIG_MFD_TPS80031)      += tps80031.o
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 3ac36f5ccd3e..a4a8f1ec3fb6 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -42,10 +42,10 @@
 #include <linux/bcd.h>
 #include <linux/slab.h>
 #include <linux/mfd/menelaus.h>
+#include <linux/gpio.h>
 
 #include <asm/mach/irq.h>
 
-#include <asm/gpio.h>
 
 #define DRIVER_NAME                     "menelaus"
 
diff --git a/drivers/mfd/tps65912-core.c b/drivers/mfd/tps65912-core.c
index 1f82d60b1d0f..a88cfa80dbc4 100644
--- a/drivers/mfd/tps65912-core.c
+++ b/drivers/mfd/tps65912-core.c
@@ -1,175 +1,111 @@
 /*
- * tps65912-core.c  --  TI TPS65912x
+ * Core functions for TI TPS65912x PMICs
  *
- * Copyright 2011 Texas Instruments Inc.
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *      Andrew F. Davis <afd@ti.com>
  *
- * Author: Margarita Olaya Cabrera <magi@slimlogic.co.uk>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
- *  This program is free software; you can redistribute it and/or modify it
- *  under  the terms of the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the License, or (at your
- *  option) any later version.
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.
  *
- *  This driver is based on wm8350 implementation.
+ * Based on the TPS65218 driver and the previous TPS65912 driver by
+ * Margarita Olaya Cabrera <magi@slimlogic.co.uk>
  */
 
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
+#include <linux/interrupt.h>
 #include <linux/mfd/core.h>
+#include <linux/module.h>
+
 #include <linux/mfd/tps65912.h>
 
-static const struct mfd_cell tps65912s[] = {
-        {
-                .name = "tps65912-pmic",
-        },
+static const struct mfd_cell tps65912_cells[] = {
+        { .name = "tps65912-regulator", },
+        { .name = "tps65912-gpio", },
 };
 
-int tps65912_set_bits(struct tps65912 *tps65912, u8 reg, u8 mask)
-{
-        u8 data;
-        int err;
-
-        mutex_lock(&tps65912->io_mutex);
-
-        err = tps65912->read(tps65912, reg, 1, &data);
-        if (err) {
-                dev_err(tps65912->dev, "Read from reg 0x%x failed\n", reg);
-                goto out;
-        }
-
-        data |= mask;
-        err = tps65912->write(tps65912, reg, 1, &data);
-        if (err)
-                dev_err(tps65912->dev, "Write to reg 0x%x failed\n", reg);
+static const struct regmap_irq tps65912_irqs[] = {
+        /* INT_STS IRQs */
+        REGMAP_IRQ_REG(TPS65912_IRQ_PWRHOLD_F, 0, TPS65912_INT_STS_PWRHOLD_F),
+        REGMAP_IRQ_REG(TPS65912_IRQ_VMON, 0, TPS65912_INT_STS_VMON),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PWRON, 0, TPS65912_INT_STS_PWRON),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PWRON_LP, 0, TPS65912_INT_STS_PWRON_LP),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PWRHOLD_R, 0, TPS65912_INT_STS_PWRHOLD_R),
+        REGMAP_IRQ_REG(TPS65912_IRQ_HOTDIE, 0, TPS65912_INT_STS_HOTDIE),
+        REGMAP_IRQ_REG(TPS65912_IRQ_GPIO1_R, 0, TPS65912_INT_STS_GPIO1_R),
+        REGMAP_IRQ_REG(TPS65912_IRQ_GPIO1_F, 0, TPS65912_INT_STS_GPIO1_F),
+        /* INT_STS2 IRQs */
+        REGMAP_IRQ_REG(TPS65912_IRQ_GPIO2_R, 1, TPS65912_INT_STS2_GPIO2_R),
+        REGMAP_IRQ_REG(TPS65912_IRQ_GPIO2_F, 1, TPS65912_INT_STS2_GPIO2_F),
+        REGMAP_IRQ_REG(TPS65912_IRQ_GPIO3_R, 1, TPS65912_INT_STS2_GPIO3_R),
+        REGMAP_IRQ_REG(TPS65912_IRQ_GPIO3_F, 1, TPS65912_INT_STS2_GPIO3_F),
+        REGMAP_IRQ_REG(TPS65912_IRQ_GPIO4_R, 1, TPS65912_INT_STS2_GPIO4_R),
+        REGMAP_IRQ_REG(TPS65912_IRQ_GPIO4_F, 1, TPS65912_INT_STS2_GPIO4_F),
+        REGMAP_IRQ_REG(TPS65912_IRQ_GPIO5_R, 1, TPS65912_INT_STS2_GPIO5_R),
+        REGMAP_IRQ_REG(TPS65912_IRQ_GPIO5_F, 1, TPS65912_INT_STS2_GPIO5_F),
+        /* INT_STS3 IRQs */
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_DCDC1, 2, TPS65912_INT_STS3_PGOOD_DCDC1),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_DCDC2, 2, TPS65912_INT_STS3_PGOOD_DCDC2),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_DCDC3, 2, TPS65912_INT_STS3_PGOOD_DCDC3),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_DCDC4, 2, TPS65912_INT_STS3_PGOOD_DCDC4),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_LDO1, 2, TPS65912_INT_STS3_PGOOD_LDO1),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_LDO2, 2, TPS65912_INT_STS3_PGOOD_LDO2),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_LDO3, 2, TPS65912_INT_STS3_PGOOD_LDO3),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_LDO4, 2, TPS65912_INT_STS3_PGOOD_LDO4),
+        /* INT_STS4 IRQs */
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_LDO5, 3, TPS65912_INT_STS4_PGOOD_LDO5),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_LDO6, 3, TPS65912_INT_STS4_PGOOD_LDO6),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_LDO7, 3, TPS65912_INT_STS4_PGOOD_LDO7),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_LDO8, 3, TPS65912_INT_STS4_PGOOD_LDO8),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_LDO9, 3, TPS65912_INT_STS4_PGOOD_LDO9),
+        REGMAP_IRQ_REG(TPS65912_IRQ_PGOOD_LDO10, 3, TPS65912_INT_STS4_PGOOD_LDO10),
+};
 
-out:
-        mutex_unlock(&tps65912->io_mutex);
-        return err;
-}
-EXPORT_SYMBOL_GPL(tps65912_set_bits);
+static struct regmap_irq_chip tps65912_irq_chip = {
+        .name = "tps65912",
+        .irqs = tps65912_irqs,
+        .num_irqs = ARRAY_SIZE(tps65912_irqs),
+        .num_regs = 4,
+        .irq_reg_stride = 2,
+        .mask_base = TPS65912_INT_MSK,
+        .status_base = TPS65912_INT_STS,
+        .ack_base = TPS65912_INT_STS,
+        .init_ack_masked = true,
+};
 
-int tps65912_clear_bits(struct tps65912 *tps65912, u8 reg, u8 mask)
+int tps65912_device_init(struct tps65912 *tps)
 {
-        u8 data;
-        int err;
-
-        mutex_lock(&tps65912->io_mutex);
-        err = tps65912->read(tps65912, reg, 1, &data);
-        if (err) {
-                dev_err(tps65912->dev, "Read from reg 0x%x failed\n", reg);
-                goto out;
+        int ret;
+
+        ret = regmap_add_irq_chip(tps->regmap, tps->irq, IRQF_ONESHOT, 0,
+                                  &tps65912_irq_chip, &tps->irq_data);
+        if (ret)
+                return ret;
+
+        ret = mfd_add_devices(tps->dev, PLATFORM_DEVID_AUTO, tps65912_cells,
+                              ARRAY_SIZE(tps65912_cells), NULL, 0,
+                              regmap_irq_get_domain(tps->irq_data));
+        if (ret) {
+                regmap_del_irq_chip(tps->irq, tps->irq_data);
+                return ret;
         }
 
-        data &= ~mask;
-        err = tps65912->write(tps65912, reg, 1, &data);
-        if (err)
-                dev_err(tps65912->dev, "Write to reg 0x%x failed\n", reg);
-
-out:
-        mutex_unlock(&tps65912->io_mutex);
-        return err;
+        return 0;
 }
-EXPORT_SYMBOL_GPL(tps65912_clear_bits);
+EXPORT_SYMBOL_GPL(tps65912_device_init);
 
-static inline int tps65912_read(struct tps65912 *tps65912, u8 reg)
+int tps65912_device_exit(struct tps65912 *tps)
 {
-        u8 val;
-        int err;
-
-        err = tps65912->read(tps65912, reg, 1, &val);
-        if (err < 0)
-                return err;
-
-        return val;
-}
-
-static inline int tps65912_write(struct tps65912 *tps65912, u8 reg, u8 val)
-{
-        return tps65912->write(tps65912, reg, 1, &val);
-}
-
-int tps65912_reg_read(struct tps65912 *tps65912, u8 reg)
-{
-        int data;
-
-        mutex_lock(&tps65912->io_mutex);
+        regmap_del_irq_chip(tps->irq, tps->irq_data);
 
-        data = tps65912_read(tps65912, reg);
-        if (data < 0)
-                dev_err(tps65912->dev, "Read from reg 0x%x failed\n", reg);
-
-        mutex_unlock(&tps65912->io_mutex);
-        return data;
-}
-EXPORT_SYMBOL_GPL(tps65912_reg_read);
-
-int tps65912_reg_write(struct tps65912 *tps65912, u8 reg, u8 val)
-{
-        int err;
-
-        mutex_lock(&tps65912->io_mutex);
-
-        err = tps65912_write(tps65912, reg, val);
-        if (err < 0)
-                dev_err(tps65912->dev, "Write for reg 0x%x failed\n", reg);
-
-        mutex_unlock(&tps65912->io_mutex);
-        return err;
-}
-EXPORT_SYMBOL_GPL(tps65912_reg_write);
-
-int tps65912_device_init(struct tps65912 *tps65912)
-{
-        struct tps65912_board *pmic_plat_data = dev_get_platdata(tps65912->dev);
-        struct tps65912_platform_data *init_data;
-        int ret, dcdc_avs, value;
-
-        init_data = kzalloc(sizeof(struct tps65912_platform_data), GFP_KERNEL);
-        if (init_data == NULL)
-                return -ENOMEM;
-
-        mutex_init(&tps65912->io_mutex);
-        dev_set_drvdata(tps65912->dev, tps65912);
-
-        dcdc_avs = (pmic_plat_data->is_dcdc1_avs << 0 |
-                        pmic_plat_data->is_dcdc2_avs  << 1 |
-                                pmic_plat_data->is_dcdc3_avs << 2 |
-                                        pmic_plat_data->is_dcdc4_avs << 3);
-        if (dcdc_avs) {
-                tps65912->read(tps65912, TPS65912_I2C_SPI_CFG, 1, &value);
-                dcdc_avs |= value;
-                tps65912->write(tps65912, TPS65912_I2C_SPI_CFG, 1, &dcdc_avs);
-        }
-
-        ret = mfd_add_devices(tps65912->dev, -1,
-                              tps65912s, ARRAY_SIZE(tps65912s),
-                              NULL, 0, NULL);
-        if (ret < 0)
-                goto err;
-
-        init_data->irq = pmic_plat_data->irq;
-        init_data->irq_base = pmic_plat_data->irq_base;
-        ret = tps65912_irq_init(tps65912, init_data->irq, init_data);
-        if (ret < 0)
-                goto err;
-
-        kfree(init_data);
-        return ret;
-
-err:
-        kfree(init_data);
-        mfd_remove_devices(tps65912->dev);
-        return ret;
-}
-
-void tps65912_device_exit(struct tps65912 *tps65912)
-{
-        mfd_remove_devices(tps65912->dev);
-        tps65912_irq_exit(tps65912);
+        return 0;
 }
+EXPORT_SYMBOL_GPL(tps65912_device_exit);
 
-MODULE_AUTHOR("Margarita Olaya  <magi@slimlogic.co.uk>");
-MODULE_DESCRIPTION("TPS65912x chip family multi-function driver");
-MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65912x MFD Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mfd/tps65912-i2c.c b/drivers/mfd/tps65912-i2c.c
index 7e55640b3ed5..45871403f995 100644
--- a/drivers/mfd/tps65912-i2c.c
+++ b/drivers/mfd/tps65912-i2c.c
@@ -1,139 +1,79 @@
 /*
- * tps65912-i2c.c  --  I2C access for TI TPS65912x PMIC
+ * I2C access driver for TI TPS65912x PMICs
  *
- * Copyright 2011 Texas Instruments Inc.
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *      Andrew F. Davis <afd@ti.com>
  *
- * Author: Margarita Olaya Cabrera <magi@slimlogic.co.uk>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
- *  This program is free software; you can redistribute it and/or modify it
- *  under  the terms of the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the License, or (at your
- *  option) any later version.
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.
  *
- *  This driver is based on wm8350 implementation.
+ * Based on the TPS65218 driver and the previous TPS65912 driver by
+ * Margarita Olaya Cabrera <magi@slimlogic.co.uk>
  */
 
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
 #include <linux/i2c.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/tps65912.h>
-
-static int tps65912_i2c_read(struct tps65912 *tps65912, u8 reg,
-                                  int bytes, void *dest)
-{
-        struct i2c_client *i2c = tps65912->control_data;
-        struct i2c_msg xfer[2];
-        int ret;
-
-        /* Write register */
-        xfer[0].addr = i2c->addr;
-        xfer[0].flags = 0;
-        xfer[0].len = 1;
-        xfer[0].buf = &reg;
-
-        /* Read data */
-        xfer[1].addr = i2c->addr;
-        xfer[1].flags = I2C_M_RD;
-        xfer[1].len = bytes;
-        xfer[1].buf = dest;
-
-        ret = i2c_transfer(i2c->adapter, xfer, 2);
-        if (ret == 2)
-                ret = 0;
-        else if (ret >= 0)
-                ret = -EIO;
-        return ret;
-}
-
-static int tps65912_i2c_write(struct tps65912 *tps65912, u8 reg,
-                                   int bytes, void *src)
-{
-        struct i2c_client *i2c = tps65912->control_data;
-        /* we add 1 byte for device register */
-        u8 msg[TPS6591X_MAX_REGISTER + 1];
-        int ret;
-
-        if (bytes > TPS6591X_MAX_REGISTER)
-                return -EINVAL;
-
-        msg[0] = reg;
-        memcpy(&msg[1], src, bytes);
+#include <linux/module.h>
+#include <linux/regmap.h>
 
-        ret = i2c_master_send(i2c, msg, bytes + 1);
-        if (ret < 0)
-                return ret;
-        if (ret != bytes + 1)
-                return -EIO;
+#include <linux/mfd/tps65912.h>
 
-        return 0;
-}
+static const struct of_device_id tps65912_i2c_of_match_table[] = {
+        { .compatible = "ti,tps65912", },
+        { /* sentinel */ }
+};
 
-static int tps65912_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static int tps65912_i2c_probe(struct i2c_client *client,
+                              const struct i2c_device_id *ids)
 {
-        struct tps65912 *tps65912;
+        struct tps65912 *tps;
 
-        tps65912 = devm_kzalloc(&i2c->dev,
-                                sizeof(struct tps65912), GFP_KERNEL);
-        if (tps65912 == NULL)
+        tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
+        if (!tps)
                 return -ENOMEM;
 
-        i2c_set_clientdata(i2c, tps65912);
-        tps65912->dev = &i2c->dev;
-        tps65912->control_data = i2c;
-        tps65912->read = tps65912_i2c_read;
-        tps65912->write = tps65912_i2c_write;
+        i2c_set_clientdata(client, tps);
+        tps->dev = &client->dev;
+        tps->irq = client->irq;
+
+        tps->regmap = devm_regmap_init_i2c(client, &tps65912_regmap_config);
+        if (IS_ERR(tps->regmap)) {
+                dev_err(tps->dev, "Failed to initialize register map\n");
+                return PTR_ERR(tps->regmap);
+        }
 
-        return tps65912_device_init(tps65912);
+        return tps65912_device_init(tps);
 }
 
-static int tps65912_i2c_remove(struct i2c_client *i2c)
+static int tps65912_i2c_remove(struct i2c_client *client)
 {
-        struct tps65912 *tps65912 = i2c_get_clientdata(i2c);
+        struct tps65912 *tps = i2c_get_clientdata(client);
 
-        tps65912_device_exit(tps65912);
-
-        return 0;
+        return tps65912_device_exit(tps);
 }
 
-static const struct i2c_device_id tps65912_i2c_id[] = {
-        {"tps65912", 0 },
-        { }
+static const struct i2c_device_id tps65912_i2c_id_table[] = {
+        { "tps65912", 0 },
+        { /* sentinel */ }
 };
-MODULE_DEVICE_TABLE(i2c, tps65912_i2c_id);
+MODULE_DEVICE_TABLE(i2c, tps65912_i2c_id_table);
 
 static struct i2c_driver tps65912_i2c_driver = {
-        .driver = {
-                   .name = "tps65912",
+        .driver         = {
+                .name   = "tps65912",
+                .of_match_table = tps65912_i2c_of_match_table,
         },
-        .probe = tps65912_i2c_probe,
-        .remove = tps65912_i2c_remove,
-        .id_table = tps65912_i2c_id,
+        .probe          = tps65912_i2c_probe,
+        .remove         = tps65912_i2c_remove,
+        .id_table       = tps65912_i2c_id_table,
 };
+module_i2c_driver(tps65912_i2c_driver);
 
-static int __init tps65912_i2c_init(void)
-{
-        int ret;
-
-        ret = i2c_add_driver(&tps65912_i2c_driver);
-        if (ret != 0)
-                pr_err("Failed to register TPS65912 I2C driver: %d\n", ret);
-
-        return ret;
-}
-/* init early so consumer devices can complete system boot */
-subsys_initcall(tps65912_i2c_init);
-
-static void __exit tps65912_i2c_exit(void)
-{
-        i2c_del_driver(&tps65912_i2c_driver);
-}
-module_exit(tps65912_i2c_exit);
-
-MODULE_AUTHOR("Margarita Olaya  <magi@slimlogic.co.uk>");
-MODULE_DESCRIPTION("TPS6591x chip family multi-function driver");
-MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65912x I2C Interface Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mfd/tps65912-irq.c b/drivers/mfd/tps65912-irq.c
deleted file mode 100644
index db2c29cb709b..000000000000
--- a/drivers/mfd/tps65912-irq.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * tps65912-irq.c  --  TI TPS6591x
- *
- * Copyright 2011 Texas Instruments Inc.
- *
- * Author: Margarita Olaya <magi@slimlogic.co.uk>
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under  the terms of the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the License, or (at your
- *  option) any later version.
- *
- * This driver is based on wm8350 implementation.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/bug.h>
-#include <linux/device.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/gpio.h>
-#include <linux/mfd/tps65912.h>
-
-static inline int irq_to_tps65912_irq(struct tps65912 *tps65912,
-                                                        int irq)
-{
-        return irq - tps65912->irq_base;
-}
-
-/*
- * This is a threaded IRQ handler so can access I2C/SPI.  Since the
- * IRQ handler explicitly clears the IRQ it handles the IRQ line
- * will be reasserted and the physical IRQ will be handled again if
- * another interrupt is asserted while we run - in the normal course
- * of events this is a rare occurrence so we save I2C/SPI reads. We're
- * also assuming that it's rare to get lots of interrupts firing
- * simultaneously so try to minimise I/O.
- */
-static irqreturn_t tps65912_irq(int irq, void *irq_data)
-{
-        struct tps65912 *tps65912 = irq_data;
-        u32 irq_sts;
-        u32 irq_mask;
-        u8 reg;
-        int i;
-
-
-        tps65912->read(tps65912, TPS65912_INT_STS, 1, &reg);
-        irq_sts = reg;
-        tps65912->read(tps65912, TPS65912_INT_STS2, 1, &reg);
-        irq_sts |= reg << 8;
-        tps65912->read(tps65912, TPS65912_INT_STS3, 1, &reg);
-        irq_sts |= reg << 16;
-        tps65912->read(tps65912, TPS65912_INT_STS4, 1, &reg);
-        irq_sts |= reg << 24;
-
-        tps65912->read(tps65912, TPS65912_INT_MSK, 1, &reg);
-        irq_mask = reg;
-        tps65912->read(tps65912, TPS65912_INT_MSK2, 1, &reg);
-        irq_mask |= reg << 8;
-        tps65912->read(tps65912, TPS65912_INT_MSK3, 1, &reg);
-        irq_mask |= reg << 16;
-        tps65912->read(tps65912, TPS65912_INT_MSK4, 1, &reg);
-        irq_mask |= reg << 24;
-
-        irq_sts &= ~irq_mask;
-        if (!irq_sts)
-                return IRQ_NONE;
-
-        for (i = 0; i < tps65912->irq_num; i++) {
-                if (!(irq_sts & (1 << i)))
-                        continue;
-
-                handle_nested_irq(tps65912->irq_base + i);
-        }
-
-        /* Write the STS register back to clear IRQs we handled */
-        reg = irq_sts & 0xFF;
-        irq_sts >>= 8;
-        if (reg)
-                tps65912->write(tps65912, TPS65912_INT_STS, 1, &reg);
-        reg = irq_sts & 0xFF;
-        irq_sts >>= 8;
-        if (reg)
-                tps65912->write(tps65912, TPS65912_INT_STS2, 1, &reg);
-        reg = irq_sts & 0xFF;
-        irq_sts >>= 8;
-        if (reg)
-                tps65912->write(tps65912, TPS65912_INT_STS3, 1, &reg);
-        reg = irq_sts & 0xFF;
-        if (reg)
-                tps65912->write(tps65912, TPS65912_INT_STS4, 1, &reg);
-
-        return IRQ_HANDLED;
-}
-
-static void tps65912_irq_lock(struct irq_data *data)
-{
-        struct tps65912 *tps65912 = irq_data_get_irq_chip_data(data);
-
-        mutex_lock(&tps65912->irq_lock);
-}
-
-static void tps65912_irq_sync_unlock(struct irq_data *data)
-{
-        struct tps65912 *tps65912 = irq_data_get_irq_chip_data(data);
-        u32 reg_mask;
-        u8 reg;
-
-        tps65912->read(tps65912, TPS65912_INT_MSK, 1, &reg);
-        reg_mask = reg;
-        tps65912->read(tps65912, TPS65912_INT_MSK2, 1, &reg);
-        reg_mask |= reg << 8;
-        tps65912->read(tps65912, TPS65912_INT_MSK3, 1, &reg);
-        reg_mask |= reg << 16;
-        tps65912->read(tps65912, TPS65912_INT_MSK4, 1, &reg);
-        reg_mask |= reg << 24;
-
-        if (tps65912->irq_mask != reg_mask) {
-                reg = tps65912->irq_mask & 0xFF;
-                tps65912->write(tps65912, TPS65912_INT_MSK, 1, &reg);
-                reg = tps65912->irq_mask >> 8 & 0xFF;
-                tps65912->write(tps65912, TPS65912_INT_MSK2, 1, &reg);
-                reg = tps65912->irq_mask >> 16 & 0xFF;
-                tps65912->write(tps65912, TPS65912_INT_MSK3, 1, &reg);
-                reg = tps65912->irq_mask >> 24 & 0xFF;
-                tps65912->write(tps65912, TPS65912_INT_MSK4, 1, &reg);
-        }
-
-        mutex_unlock(&tps65912->irq_lock);
-}
-
-static void tps65912_irq_enable(struct irq_data *data)
-{
-        struct tps65912 *tps65912 = irq_data_get_irq_chip_data(data);
-
-        tps65912->irq_mask &= ~(1 << irq_to_tps65912_irq(tps65912, data->irq));
-}
-
-static void tps65912_irq_disable(struct irq_data *data)
-{
-        struct tps65912 *tps65912 = irq_data_get_irq_chip_data(data);
-
-        tps65912->irq_mask |= (1 << irq_to_tps65912_irq(tps65912, data->irq));
-}
-
-static struct irq_chip tps65912_irq_chip = {
-        .name = "tps65912",
-        .irq_bus_lock = tps65912_irq_lock,
-        .irq_bus_sync_unlock = tps65912_irq_sync_unlock,
-        .irq_disable = tps65912_irq_disable,
-        .irq_enable = tps65912_irq_enable,
-};
-
-int tps65912_irq_init(struct tps65912 *tps65912, int irq,
-                            struct tps65912_platform_data *pdata)
-{
-        int ret, cur_irq;
-        int flags = IRQF_ONESHOT;
-        u8 reg;
-
-        if (!irq) {
-                dev_warn(tps65912->dev, "No interrupt support, no core IRQ\n");
-                return 0;
-        }
-
-        if (!pdata || !pdata->irq_base) {
-                dev_warn(tps65912->dev, "No interrupt support, no IRQ base\n");
-                return 0;
-        }
-
-        /* Clear unattended interrupts */
-        tps65912->read(tps65912, TPS65912_INT_STS, 1, &reg);
-        tps65912->write(tps65912, TPS65912_INT_STS, 1, &reg);
-        tps65912->read(tps65912, TPS65912_INT_STS2, 1, &reg);
-        tps65912->write(tps65912, TPS65912_INT_STS2, 1, &reg);
-        tps65912->read(tps65912, TPS65912_INT_STS3, 1, &reg);
-        tps65912->write(tps65912, TPS65912_INT_STS3, 1, &reg);
-        tps65912->read(tps65912, TPS65912_INT_STS4, 1, &reg);
-        tps65912->write(tps65912, TPS65912_INT_STS4, 1, &reg);
-
-        /* Mask top level interrupts */
-        tps65912->irq_mask = 0xFFFFFFFF;
-
-        mutex_init(&tps65912->irq_lock);
-        tps65912->chip_irq = irq;
-        tps65912->irq_base = pdata->irq_base;
-
-        tps65912->irq_num = TPS65912_NUM_IRQ;
-
-        /* Register with genirq */
-        for (cur_irq = tps65912->irq_base;
-             cur_irq < tps65912->irq_num + tps65912->irq_base;
-             cur_irq++) {
-                irq_set_chip_data(cur_irq, tps65912);
-                irq_set_chip_and_handler(cur_irq, &tps65912_irq_chip,
-                                         handle_edge_irq);
-                irq_set_nested_thread(cur_irq, 1);
-                irq_clear_status_flags(cur_irq, IRQ_NOREQUEST | IRQ_NOPROBE);
-        }
-
-        ret = request_threaded_irq(irq, NULL, tps65912_irq, flags,
-                                   "tps65912", tps65912);
-
-        irq_set_irq_type(irq, IRQ_TYPE_LEVEL_LOW);
-        if (ret != 0)
-                dev_err(tps65912->dev, "Failed to request IRQ: %d\n", ret);
-
-        return ret;
-}
-
-int tps65912_irq_exit(struct tps65912 *tps65912)
-{
-        free_irq(tps65912->chip_irq, tps65912);
-        return 0;
-}
diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c
index d59aa55b1495..4aeba9b6942a 100644
--- a/drivers/mfd/tps65912-spi.c
+++ b/drivers/mfd/tps65912-spi.c
@@ -1,140 +1,78 @@
 /*
- * tps65912-spi.c  --  SPI access for TI TPS65912x PMIC
+ * SPI access driver for TI TPS65912x PMICs
  *
- * Copyright 2011 Texas Instruments Inc.
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *      Andrew F. Davis <afd@ti.com>
  *
- * Author: Margarita Olaya Cabrera <magi@slimlogic.co.uk>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
- *  This program is free software; you can redistribute it and/or modify it
- *  under  the terms of the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the License, or (at your
- *  option) any later version.
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.
  *
- *  This driver is based on wm8350 implementation.
+ * Based on the TPS65218 driver and the previous TPS65912 driver by
+ * Margarita Olaya Cabrera <magi@slimlogic.co.uk>
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
+#include <linux/regmap.h>
 #include <linux/spi/spi.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/tps65912.h>
-
-static int tps65912_spi_write(struct tps65912 *tps65912, u8 addr,
-                                                        int bytes, void *src)
-{
-        struct spi_device *spi = tps65912->control_data;
-        u8 *data = (u8 *) src;
-        int ret;
-        /* bit 23 is the read/write bit */
-        unsigned long spi_data = 1 << 23 | addr << 15 | *data;
-        struct spi_transfer xfer;
-        struct spi_message msg;
-        u32 tx_buf;
-
-        tx_buf = spi_data;
-
-        xfer.tx_buf     = &tx_buf;
-        xfer.rx_buf     = NULL;
-        xfer.len        = sizeof(unsigned long);
-        xfer.bits_per_word = 24;
-
-        spi_message_init(&msg);
-        spi_message_add_tail(&xfer, &msg);
-
-        ret = spi_sync(spi, &msg);
-        return ret;
-}
-
-static int tps65912_spi_read(struct tps65912 *tps65912, u8 addr,
-                                                        int bytes, void *dest)
-{
-        struct spi_device *spi = tps65912->control_data;
-        /* bit 23 is the read/write bit */
-        unsigned long spi_data = 0 << 23 | addr << 15;
-        struct spi_transfer xfer;
-        struct spi_message msg;
-        int ret;
-        u8 *data = (u8 *) dest;
-        u32 tx_buf, rx_buf;
-
-        tx_buf = spi_data;
-        rx_buf = 0;
 
-        xfer.tx_buf     = &tx_buf;
-        xfer.rx_buf     = &rx_buf;
-        xfer.len        = sizeof(unsigned long);
-        xfer.bits_per_word = 24;
-
-        spi_message_init(&msg);
-        spi_message_add_tail(&xfer, &msg);
-
-        if (spi == NULL)
-                return 0;
+#include <linux/mfd/tps65912.h>
 
-        ret = spi_sync(spi, &msg);
-        if (ret == 0)
-                *data = (u8) (rx_buf & 0xFF);
-        return ret;
-}
+static const struct of_device_id tps65912_spi_of_match_table[] = {
+        { .compatible = "ti,tps65912", },
+        { /* sentinel */ }
+};
 
 static int tps65912_spi_probe(struct spi_device *spi)
 {
-        struct tps65912 *tps65912;
+        struct tps65912 *tps;
 
-        tps65912 = devm_kzalloc(&spi->dev,
-                                sizeof(struct tps65912), GFP_KERNEL);
-        if (tps65912 == NULL)
+        tps = devm_kzalloc(&spi->dev, sizeof(*tps), GFP_KERNEL);
+        if (!tps)
                 return -ENOMEM;
 
-        tps65912->dev = &spi->dev;
-        tps65912->control_data = spi;
-        tps65912->read = tps65912_spi_read;
-        tps65912->write = tps65912_spi_write;
+        spi_set_drvdata(spi, tps);
+        tps->dev = &spi->dev;
+        tps->irq = spi->irq;
 
-        spi_set_drvdata(spi, tps65912);
+        tps->regmap = devm_regmap_init_spi(spi, &tps65912_regmap_config);
+        if (IS_ERR(tps->regmap)) {
+                dev_err(tps->dev, "Failed to initialize register map\n");
+                return PTR_ERR(tps->regmap);
+        }
 
-        return tps65912_device_init(tps65912);
+        return tps65912_device_init(tps);
 }
 
-static int tps65912_spi_remove(struct spi_device *spi)
+static int tps65912_spi_remove(struct spi_device *client)
 {
-        struct tps65912 *tps65912 = spi_get_drvdata(spi);
+        struct tps65912 *tps = spi_get_drvdata(client);
 
-        tps65912_device_exit(tps65912);
-
-        return 0;
+        return tps65912_device_exit(tps);
 }
 
+static const struct spi_device_id tps65912_spi_id_table[] = {
+        { "tps65912", 0 },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(spi, tps65912_spi_id_table);
+
 static struct spi_driver tps65912_spi_driver = {
-        .driver = {
-                .name = "tps65912",
+        .driver         = {
+                .name   = "tps65912",
+                .of_match_table = tps65912_spi_of_match_table,
         },
-        .probe  = tps65912_spi_probe,
-        .remove = tps65912_spi_remove,
+        .probe          = tps65912_spi_probe,
+        .remove         = tps65912_spi_remove,
+        .id_table       = tps65912_spi_id_table,
 };
+module_spi_driver(tps65912_spi_driver);
 
-static int __init tps65912_spi_init(void)
-{
-        int ret;
-
-        ret = spi_register_driver(&tps65912_spi_driver);
-        if (ret != 0)
-                pr_err("Failed to register TPS65912 SPI driver: %d\n", ret);
-
-        return 0;
-}
-/* init early so consumer devices can complete system boot */
-subsys_initcall(tps65912_spi_init);
-
-static void __exit tps65912_spi_exit(void)
-{
-        spi_unregister_driver(&tps65912_spi_driver);
-}
-module_exit(tps65912_spi_exit);
-
-MODULE_AUTHOR("Margarita Olaya  <magi@slimlogic.co.uk>");
-MODULE_DESCRIPTION("SPI support for TPS65912 chip family mfd");
-MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65912x SPI Interface Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 0aacf125938b..24a1388d3031 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -35,10 +35,10 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/regulator/consumer.h>
+#include <linux/gpio.h>
 
 #include <asm/mach/flash.h>
 #include <linux/platform_data/mtd-onenand-omap2.h>
-#include <asm/gpio.h>
 
 #include <linux/omap-dma.h>
 
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
index bba1dcbb8075..8b0923fd76c6 100644
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -36,10 +36,10 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/gpio.h>
 
 #include <pcmcia/ss.h>
 #include <pcmcia/cisreg.h>
-#include <asm/gpio.h>
 
 #define SZ_1K   0x00000400
 #define SZ_8K   0x00002000
diff --git a/drivers/pcmcia/pxa2xx_vpac270.c b/drivers/pcmcia/pxa2xx_vpac270.c
index a47dcd24a26a..33c5b8823367 100644
--- a/drivers/pcmcia/pxa2xx_vpac270.c
+++ b/drivers/pcmcia/pxa2xx_vpac270.c
@@ -17,7 +17,6 @@
 
 #include <asm/mach-types.h>
 
-#include <asm/gpio.h>
 #include <mach/vpac270.h>
 
 #include "soc_common.h"
diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
index 3b2ac8f771ed..d530ab4b9d85 100644
--- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
@@ -26,7 +26,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/ioport.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
@@ -98,11 +98,6 @@ struct iproc_gpio {
         struct pinctrl_desc pctldesc;
 };
 
-static inline struct iproc_gpio *to_iproc_gpio(struct gpio_chip *gc)
-{
-        return container_of(gc, struct iproc_gpio, gc);
-}
-
 /*
  * Mapping from PINCONF pins to GPIO pins is 1-to-1
  */
@@ -147,7 +142,7 @@ static inline bool iproc_get_bit(struct iproc_gpio *chip, unsigned int reg,
 static void iproc_gpio_irq_handler(struct irq_desc *desc)
 {
         struct gpio_chip *gc = irq_desc_get_handler_data(desc);
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         struct irq_chip *irq_chip = irq_desc_get_chip(desc);
         int i, bit;
 
@@ -180,7 +175,7 @@ static void iproc_gpio_irq_handler(struct irq_desc *desc)
 static void iproc_gpio_irq_ack(struct irq_data *d)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned gpio = d->hwirq;
         unsigned int offset = IPROC_GPIO_REG(gpio,
                         IPROC_GPIO_INT_CLR_OFFSET);
@@ -199,7 +194,7 @@ static void iproc_gpio_irq_ack(struct irq_data *d)
 static void iproc_gpio_irq_set_mask(struct irq_data *d, bool unmask)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned gpio = d->hwirq;
 
         iproc_set_bit(chip, IPROC_GPIO_INT_MSK_OFFSET, gpio, unmask);
@@ -208,7 +203,7 @@ static void iproc_gpio_irq_set_mask(struct irq_data *d, bool unmask)
 static void iproc_gpio_irq_mask(struct irq_data *d)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned long flags;
 
         spin_lock_irqsave(&chip->lock, flags);
@@ -219,7 +214,7 @@ static void iproc_gpio_irq_mask(struct irq_data *d)
 static void iproc_gpio_irq_unmask(struct irq_data *d)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned long flags;
 
         spin_lock_irqsave(&chip->lock, flags);
@@ -230,7 +225,7 @@ static void iproc_gpio_irq_unmask(struct irq_data *d)
 static int iproc_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned gpio = d->hwirq;
         bool level_triggered = false;
         bool dual_edge = false;
@@ -292,7 +287,7 @@ static struct irq_chip iproc_gpio_irq_chip = {
  */
 static int iproc_gpio_request(struct gpio_chip *gc, unsigned offset)
 {
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned gpio = gc->base + offset;
 
         /* not all Iproc GPIO pins can be muxed individually */
@@ -304,7 +299,7 @@ static int iproc_gpio_request(struct gpio_chip *gc, unsigned offset)
 
 static void iproc_gpio_free(struct gpio_chip *gc, unsigned offset)
 {
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned gpio = gc->base + offset;
 
         if (!chip->pinmux_is_supported)
@@ -315,7 +310,7 @@ static void iproc_gpio_free(struct gpio_chip *gc, unsigned offset)
 
 static int iproc_gpio_direction_input(struct gpio_chip *gc, unsigned gpio)
 {
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned long flags;
 
         spin_lock_irqsave(&chip->lock, flags);
@@ -330,7 +325,7 @@ static int iproc_gpio_direction_input(struct gpio_chip *gc, unsigned gpio)
 static int iproc_gpio_direction_output(struct gpio_chip *gc, unsigned gpio,
                                         int val)
 {
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned long flags;
 
         spin_lock_irqsave(&chip->lock, flags);
@@ -345,7 +340,7 @@ static int iproc_gpio_direction_output(struct gpio_chip *gc, unsigned gpio,
 
 static void iproc_gpio_set(struct gpio_chip *gc, unsigned gpio, int val)
 {
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned long flags;
 
         spin_lock_irqsave(&chip->lock, flags);
@@ -357,7 +352,7 @@ static void iproc_gpio_set(struct gpio_chip *gc, unsigned gpio, int val)
 
 static int iproc_gpio_get(struct gpio_chip *gc, unsigned gpio)
 {
-        struct iproc_gpio *chip = to_iproc_gpio(gc);
+        struct iproc_gpio *chip = gpiochip_get_data(gc);
         unsigned int offset = IPROC_GPIO_REG(gpio,
                                               IPROC_GPIO_DATA_IN_OFFSET);
         unsigned int shift = IPROC_GPIO_SHIFT(gpio);
@@ -706,7 +701,7 @@ static int iproc_gpio_probe(struct platform_device *pdev)
         chip->pinmux_is_supported = of_property_read_bool(dev->of_node,
                                                         "gpio-ranges");
 
-        ret = gpiochip_add(gc);
+        ret = gpiochip_add_data(gc, chip);
         if (ret < 0) {
                 dev_err(dev, "unable to add GPIO chip\n");
                 return ret;
diff --git a/drivers/pinctrl/sirf/pinctrl-atlas7.c b/drivers/pinctrl/sirf/pinctrl-atlas7.c
index beb024c31a5d..3d233fc3448a 100644
--- a/drivers/pinctrl/sirf/pinctrl-atlas7.c
+++ b/drivers/pinctrl/sirf/pinctrl-atlas7.c
@@ -338,7 +338,6 @@ struct atlas7_pinctrl_data {
 #define ATLAS7_GPIO_CTL_DATAIN_MASK             BIT(7)
 
 struct atlas7_gpio_bank {
-        struct pinctrl_dev *pctldev;
         int id;
         int irq;
         void __iomem *base;
@@ -6070,7 +6069,6 @@ static int atlas7_gpio_probe(struct platform_device *pdev)
         }
 
         for (idx = 0; idx < nbank; idx++) {
-                struct gpio_pin_range *pin_range;
                 struct atlas7_gpio_bank *bank;
 
                 bank = &a7gc->banks[idx];
@@ -6088,22 +6086,6 @@ static int atlas7_gpio_probe(struct platform_device *pdev)
 
                 gpiochip_set_chained_irqchip(chip, &atlas7_gpio_irq_chip,
                                         bank->irq, atlas7_gpio_handle_irq);
-
-                /* Records gpio_pin_range to a7gc */
-                list_for_each_entry(pin_range, &chip->pin_ranges, node) {
-                        struct pinctrl_gpio_range *range;
-
-                        range = &pin_range->range;
-                        if (range->id == NGPIO_OF_BANK * idx) {
-                                bank->gpio_offset = range->id;
-                                bank->ngpio = range->npins;
-                                bank->gpio_pins = range->pins;
-                                bank->pctldev = pin_range->pctldev;
-                                break;
-                        }
-                }
-
-                BUG_ON(!bank->pctldev);
         }
 
         platform_set_drvdata(pdev, a7gc);
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
index 3a2f5619f87c..12a1dfabb1af 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -457,8 +457,8 @@ static int sunxi_pinctrl_gpio_get(struct gpio_chip *chip, unsigned offset)
         struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);
         u32 reg = sunxi_data_reg(offset);
         u8 index = sunxi_data_offset(offset);
-        u32 set_mux = pctl->desc->irq_read_needs_mux &&
-                        test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
+        bool set_mux = pctl->desc->irq_read_needs_mux &&
+                gpiochip_line_is_irq(chip, offset);
         u32 pin = offset + chip->base;
         u32 val;
 
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 91040ec8e242..c77dc08b1202 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -788,7 +788,7 @@ config REGULATOR_TPS65910
 
 config REGULATOR_TPS65912
         tristate "TI TPS65912 Power regulator"
-        depends on (MFD_TPS65912_I2C || MFD_TPS65912_SPI)
+        depends on MFD_TPS65912
         help
             This driver supports TPS65912 voltage regulator chip.
 
diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
index 9503d5481a52..a4921a70da55 100644
--- a/drivers/regulator/tps65912-regulator.c
+++ b/drivers/regulator/tps65912-regulator.c
@@ -1,541 +1,168 @@
 /*
- * tps65912.c  --  TI tps65912
+ * Regulator driver for TI TPS65912x PMICs
  *
- * Copyright 2011 Texas Instruments Inc.
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *      Andrew F. Davis <afd@ti.com>
  *
- * Author: Margarita Olaya Cabrera <magi@slimlogic.co.uk>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
- *  This program is free software; you can redistribute it and/or modify it
- *  under  the terms of the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the License, or (at your
- *  option) any later version.
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.
  *
- * This driver is based on wm8350 implementation.
+ * Based on the TPS65218 driver and the previous TPS65912 driver by
+ * Margarita Olaya Cabrera <magi@slimlogic.co.uk>
  */
 
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
-#include <linux/regulator/machine.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
-#include <linux/mfd/tps65912.h>
-
-/* DCDC's */
-#define TPS65912_REG_DCDC1      0
-#define TPS65912_REG_DCDC2      1
-#define TPS65912_REG_DCDC3      2
-#define TPS65912_REG_DCDC4      3
-
-/* LDOs */
-#define TPS65912_REG_LDO1       4
-#define TPS65912_REG_LDO2       5
-#define TPS65912_REG_LDO3       6
-#define TPS65912_REG_LDO4       7
-#define TPS65912_REG_LDO5       8
-#define TPS65912_REG_LDO6       9
-#define TPS65912_REG_LDO7       10
-#define TPS65912_REG_LDO8       11
-#define TPS65912_REG_LDO9       12
-#define TPS65912_REG_LDO10      13
-
-/* Number of step-down converters available */
-#define TPS65912_NUM_DCDC       4
-
-/* Number of LDO voltage regulators  available */
-#define TPS65912_NUM_LDO        10
 
-/* Number of total regulators available */
-#define TPS65912_NUM_REGULATOR          (TPS65912_NUM_DCDC + TPS65912_NUM_LDO)
-
-#define TPS65912_REG_ENABLED    0x80
-#define OP_SELREG_MASK          0x40
-#define OP_SELREG_SHIFT         6
-
-struct tps_info {
-        const char *name;
-};
+#include <linux/mfd/tps65912.h>
 
-static struct tps_info tps65912_regs[] = {
-        {
-                .name = "DCDC1",
-        },
-        {
-                .name = "DCDC2",
-        },
-        {
-                .name = "DCDC3",
-        },
-        {
-                .name = "DCDC4",
-        },
-        {
-                .name = "LDO1",
-        },
-        {
-                .name = "LDO2",
-        },
-        {
-                .name = "LDO3",
-        },
-        {
-                .name = "LDO4",
-        },
-        {
-                .name = "LDO5",
-        },
-        {
-                .name = "LDO6",
-        },
-        {
-                .name = "LDO7",
-        },
-        {
-                .name = "LDO8",
-        },
-        {
-                .name = "LDO9",
-        },
-        {
-                .name = "LDO10",
-        },
-};
+enum tps65912_regulators { DCDC1, DCDC2, DCDC3, DCDC4, LDO1, LDO2, LDO3,
+        LDO4, LDO5, LDO6, LDO7, LDO8, LDO9, LDO10 };
+
+#define TPS65912_REGULATOR(_name, _id, _of_match, _ops, _vr, _er, _lr)  \
+        [_id] = {                                                       \
+                .name                   = _name,                        \
+                .of_match               = _of_match,                    \
+                .regulators_node        = "regulators",                 \
+                .id                     = _id,                          \
+                .ops                    = &_ops,                        \
+                .n_voltages             = 64,                           \
+                .type                   = REGULATOR_VOLTAGE,            \
+                .owner                  = THIS_MODULE,                  \
+                .vsel_reg               = _vr,                          \
+                .vsel_mask              = 0x3f,                         \
+                .enable_reg             = _er,                          \
+                .enable_mask            = BIT(7),                       \
+                .volt_table             = NULL,                         \
+                .linear_ranges          = _lr,                          \
+                .n_linear_ranges        = ARRAY_SIZE(_lr),              \
+        }
 
-struct tps65912_reg {
-        struct regulator_desc desc[TPS65912_NUM_REGULATOR];
-        struct tps65912 *mfd;
-        struct regulator_dev *rdev[TPS65912_NUM_REGULATOR];
-        struct tps_info *info[TPS65912_NUM_REGULATOR];
-        /* for read/write access */
-        struct mutex io_lock;
-        int mode;
-        int (*get_ctrl_reg)(int);
-        int dcdc_range[TPS65912_NUM_DCDC];
-        int pwm_mode_reg;
-        int eco_reg;
+static const struct regulator_linear_range tps65912_dcdc_ranges[] = {
+        REGULATOR_LINEAR_RANGE(500000, 0x0, 0x3f, 50000),
 };
 
 static const struct regulator_linear_range tps65912_ldo_ranges[] = {
-        REGULATOR_LINEAR_RANGE(800000, 0, 32, 25000),
-        REGULATOR_LINEAR_RANGE(1650000, 33, 60, 50000),
-        REGULATOR_LINEAR_RANGE(3100000, 61, 63, 100000),
+        REGULATOR_LINEAR_RANGE(800000, 0x0, 0x20, 25000),
+        REGULATOR_LINEAR_RANGE(1650000, 0x21, 0x3c, 50000),
+        REGULATOR_LINEAR_RANGE(3100000, 0x3d, 0x3f, 100000),
 };
 
-static int tps65912_get_range(struct tps65912_reg *pmic, int id)
-{
-        struct tps65912 *mfd = pmic->mfd;
-        int range;
-
-        switch (id) {
-        case TPS65912_REG_DCDC1:
-                range = tps65912_reg_read(mfd, TPS65912_DCDC1_LIMIT);
-                break;
-        case TPS65912_REG_DCDC2:
-                range = tps65912_reg_read(mfd, TPS65912_DCDC2_LIMIT);
-                break;
-        case TPS65912_REG_DCDC3:
-                range = tps65912_reg_read(mfd, TPS65912_DCDC3_LIMIT);
-                break;
-        case TPS65912_REG_DCDC4:
-                range = tps65912_reg_read(mfd, TPS65912_DCDC4_LIMIT);
-                break;
-        default:
-                return 0;
-        }
-
-        if (range >= 0)
-                range = (range & DCDC_LIMIT_RANGE_MASK)
-                        >> DCDC_LIMIT_RANGE_SHIFT;
-
-        pmic->dcdc_range[id] = range;
-        return range;
-}
-
-static unsigned long tps65912_vsel_to_uv_range0(u8 vsel)
-{
-        unsigned long uv;
-
-        uv = ((vsel * 12500) + 500000);
-        return uv;
-}
-
-static unsigned long tps65912_vsel_to_uv_range1(u8 vsel)
-{
-        unsigned long uv;
-
-         uv = ((vsel * 12500) + 700000);
-        return uv;
-}
-
-static unsigned long tps65912_vsel_to_uv_range2(u8 vsel)
-{
-        unsigned long uv;
-
-        uv = ((vsel * 25000) + 500000);
-        return uv;
-}
-
-static unsigned long tps65912_vsel_to_uv_range3(u8 vsel)
-{
-        unsigned long uv;
-
-        if (vsel == 0x3f)
-                uv = 3800000;
-        else
-                uv = ((vsel * 50000) + 500000);
-
-        return uv;
-}
-
-static int tps65912_get_ctrl_register(int id)
-{
-        if (id >= TPS65912_REG_DCDC1 && id <= TPS65912_REG_LDO4)
-                return id * 3 + TPS65912_DCDC1_AVS;
-        else if (id >= TPS65912_REG_LDO5 && id <= TPS65912_REG_LDO10)
-                return id - TPS65912_REG_LDO5 + TPS65912_LDO5;
-        else
-                return -EINVAL;
-}
-
-static int tps65912_get_sel_register(struct tps65912_reg *pmic, int id)
-{
-        struct tps65912 *mfd = pmic->mfd;
-        int opvsel;
-        u8 reg = 0;
-
-        if (id >= TPS65912_REG_DCDC1 && id <= TPS65912_REG_LDO4) {
-                opvsel = tps65912_reg_read(mfd, id * 3 + TPS65912_DCDC1_OP);
-                if (opvsel & OP_SELREG_MASK)
-                        reg = id * 3 + TPS65912_DCDC1_AVS;
-                else
-                        reg = id * 3 + TPS65912_DCDC1_OP;
-        } else if (id >= TPS65912_REG_LDO5 && id <= TPS65912_REG_LDO10) {
-                reg = id - TPS65912_REG_LDO5 + TPS65912_LDO5;
-        } else {
-                return -EINVAL;
-        }
-
-        return reg;
-}
-
-static int tps65912_get_mode_regiters(struct tps65912_reg *pmic, int id)
-{
-        switch (id) {
-        case TPS65912_REG_DCDC1:
-                pmic->pwm_mode_reg = TPS65912_DCDC1_CTRL;
-                pmic->eco_reg = TPS65912_DCDC1_AVS;
-                break;
-        case TPS65912_REG_DCDC2:
-                pmic->pwm_mode_reg = TPS65912_DCDC2_CTRL;
-                pmic->eco_reg = TPS65912_DCDC2_AVS;
-                break;
-        case TPS65912_REG_DCDC3:
-                pmic->pwm_mode_reg = TPS65912_DCDC3_CTRL;
-                pmic->eco_reg = TPS65912_DCDC3_AVS;
-                break;
-        case TPS65912_REG_DCDC4:
-                pmic->pwm_mode_reg = TPS65912_DCDC4_CTRL;
-                pmic->eco_reg = TPS65912_DCDC4_AVS;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static int tps65912_reg_is_enabled(struct regulator_dev *dev)
-{
-        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
-        struct tps65912 *mfd = pmic->mfd;
-        int reg, value, id = rdev_get_id(dev);
-
-        if (id < TPS65912_REG_DCDC1 || id > TPS65912_REG_LDO10)
-                return -EINVAL;
-
-        reg = pmic->get_ctrl_reg(id);
-        if (reg < 0)
-                return reg;
-
-        value = tps65912_reg_read(mfd, reg);
-        if (value < 0)
-                return value;
-
-        return value & TPS65912_REG_ENABLED;
-}
-
-static int tps65912_reg_enable(struct regulator_dev *dev)
-{
-        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
-        struct tps65912 *mfd = pmic->mfd;
-        int id = rdev_get_id(dev);
-        int reg;
-
-        if (id < TPS65912_REG_DCDC1 || id > TPS65912_REG_LDO10)
-                return -EINVAL;
-
-        reg = pmic->get_ctrl_reg(id);
-        if (reg < 0)
-                return reg;
-
-        return tps65912_set_bits(mfd, reg, TPS65912_REG_ENABLED);
-}
-
-static int tps65912_reg_disable(struct regulator_dev *dev)
-{
-        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
-        struct tps65912 *mfd = pmic->mfd;
-        int id = rdev_get_id(dev), reg;
-
-        reg = pmic->get_ctrl_reg(id);
-        if (reg < 0)
-                return reg;
-
-        return tps65912_clear_bits(mfd, reg, TPS65912_REG_ENABLED);
-}
-
-static int tps65912_set_mode(struct regulator_dev *dev, unsigned int mode)
-{
-        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
-        struct tps65912 *mfd = pmic->mfd;
-        int pwm_mode, eco, id = rdev_get_id(dev);
-
-        tps65912_get_mode_regiters(pmic, id);
-
-        pwm_mode = tps65912_reg_read(mfd, pmic->pwm_mode_reg);
-        eco = tps65912_reg_read(mfd, pmic->eco_reg);
-
-        pwm_mode &= DCDCCTRL_DCDC_MODE_MASK;
-        eco &= DCDC_AVS_ECO_MASK;
-
-        switch (mode) {
-        case REGULATOR_MODE_FAST:
-                /* Verify if mode alredy set */
-                if (pwm_mode && !eco)
-                        break;
-                tps65912_set_bits(mfd, pmic->pwm_mode_reg, DCDCCTRL_DCDC_MODE_MASK);
-                tps65912_clear_bits(mfd, pmic->eco_reg, DCDC_AVS_ECO_MASK);
-                break;
-        case REGULATOR_MODE_NORMAL:
-        case REGULATOR_MODE_IDLE:
-                if (!pwm_mode && !eco)
-                        break;
-                tps65912_clear_bits(mfd, pmic->pwm_mode_reg, DCDCCTRL_DCDC_MODE_MASK);
-                tps65912_clear_bits(mfd, pmic->eco_reg, DCDC_AVS_ECO_MASK);
-                break;
-        case REGULATOR_MODE_STANDBY:
-                if (!pwm_mode && eco)
-                        break;
-                tps65912_clear_bits(mfd, pmic->pwm_mode_reg, DCDCCTRL_DCDC_MODE_MASK);
-                tps65912_set_bits(mfd, pmic->eco_reg, DCDC_AVS_ECO_MASK);
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static unsigned int tps65912_get_mode(struct regulator_dev *dev)
-{
-        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
-        struct tps65912 *mfd = pmic->mfd;
-        int pwm_mode, eco, mode = 0, id = rdev_get_id(dev);
-
-        tps65912_get_mode_regiters(pmic, id);
-
-        pwm_mode = tps65912_reg_read(mfd, pmic->pwm_mode_reg);
-        eco = tps65912_reg_read(mfd, pmic->eco_reg);
-
-        pwm_mode &= DCDCCTRL_DCDC_MODE_MASK;
-        eco &= DCDC_AVS_ECO_MASK;
-
-        if (pwm_mode && !eco)
-                mode = REGULATOR_MODE_FAST;
-        else if (!pwm_mode && !eco)
-                mode = REGULATOR_MODE_NORMAL;
-        else if (!pwm_mode && eco)
-                mode = REGULATOR_MODE_STANDBY;
-
-        return mode;
-}
-
-static int tps65912_list_voltage(struct regulator_dev *dev, unsigned selector)
-{
-        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
-        int range, voltage = 0, id = rdev_get_id(dev);
-
-        if (id > TPS65912_REG_DCDC4)
-                return -EINVAL;
-
-        range = pmic->dcdc_range[id];
-
-        switch (range) {
-        case 0:
-                /* 0.5 - 1.2875V in 12.5mV steps */
-                voltage = tps65912_vsel_to_uv_range0(selector);
-                break;
-        case 1:
-                /* 0.7 - 1.4875V in 12.5mV steps */
-                voltage = tps65912_vsel_to_uv_range1(selector);
-                break;
-        case 2:
-                /* 0.5 - 2.075V in 25mV steps */
-                voltage = tps65912_vsel_to_uv_range2(selector);
-                break;
-        case 3:
-                /* 0.5 - 3.8V in 50mV steps */
-                voltage = tps65912_vsel_to_uv_range3(selector);
-                break;
-        }
-        return voltage;
-}
-
-static int tps65912_get_voltage_sel(struct regulator_dev *dev)
-{
-        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
-        struct tps65912 *mfd = pmic->mfd;
-        int id = rdev_get_id(dev);
-        int reg, vsel;
-
-        reg = tps65912_get_sel_register(pmic, id);
-        if (reg < 0)
-                return reg;
-
-        vsel = tps65912_reg_read(mfd, reg);
-        vsel &= 0x3F;
-
-        return vsel;
-}
-
-static int tps65912_set_voltage_sel(struct regulator_dev *dev,
-                                         unsigned selector)
-{
-        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
-        struct tps65912 *mfd = pmic->mfd;
-        int id = rdev_get_id(dev);
-        int value;
-        u8 reg;
-
-        reg = tps65912_get_sel_register(pmic, id);
-        value = tps65912_reg_read(mfd, reg);
-        value &= 0xC0;
-        return tps65912_reg_write(mfd, reg, selector | value);
-}
-
 /* Operations permitted on DCDCx */
 static struct regulator_ops tps65912_ops_dcdc = {
-        .is_enabled = tps65912_reg_is_enabled,
-        .enable = tps65912_reg_enable,
-        .disable = tps65912_reg_disable,
-        .set_mode = tps65912_set_mode,
-        .get_mode = tps65912_get_mode,
-        .get_voltage_sel = tps65912_get_voltage_sel,
-        .set_voltage_sel = tps65912_set_voltage_sel,
-        .list_voltage = tps65912_list_voltage,
+        .is_enabled             = regulator_is_enabled_regmap,
+        .enable                 = regulator_enable_regmap,
+        .disable                = regulator_disable_regmap,
+        .get_voltage_sel        = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel        = regulator_set_voltage_sel_regmap,
+        .list_voltage           = regulator_list_voltage_linear_range,
 };
 
 /* Operations permitted on LDOx */
 static struct regulator_ops tps65912_ops_ldo = {
-        .is_enabled = tps65912_reg_is_enabled,
-        .enable = tps65912_reg_enable,
-        .disable = tps65912_reg_disable,
-        .get_voltage_sel = tps65912_get_voltage_sel,
-        .set_voltage_sel = tps65912_set_voltage_sel,
-        .list_voltage = regulator_list_voltage_linear_range,
-        .map_voltage = regulator_map_voltage_linear_range,
+        .is_enabled             = regulator_is_enabled_regmap,
+        .enable                 = regulator_enable_regmap,
+        .disable                = regulator_disable_regmap,
+        .get_voltage_sel        = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel        = regulator_set_voltage_sel_regmap,
+        .list_voltage           = regulator_list_voltage_linear_range,
+        .map_voltage            = regulator_map_voltage_linear_range,
+};
+
+static const struct regulator_desc regulators[] = {
+        TPS65912_REGULATOR("DCDC1", DCDC1, "dcdc1", tps65912_ops_dcdc,
+                           TPS65912_DCDC1_OP, TPS65912_DCDC1_CTRL,
+                           tps65912_dcdc_ranges),
+        TPS65912_REGULATOR("DCDC2", DCDC2, "dcdc2", tps65912_ops_dcdc,
+                           TPS65912_DCDC2_OP, TPS65912_DCDC2_CTRL,
+                           tps65912_dcdc_ranges),
+        TPS65912_REGULATOR("DCDC3", DCDC3, "dcdc3", tps65912_ops_dcdc,
+                           TPS65912_DCDC3_OP, TPS65912_DCDC3_CTRL,
+                           tps65912_dcdc_ranges),
+        TPS65912_REGULATOR("DCDC4", DCDC4, "dcdc4", tps65912_ops_dcdc,
+                           TPS65912_DCDC4_OP, TPS65912_DCDC4_CTRL,
+                           tps65912_dcdc_ranges),
+        TPS65912_REGULATOR("LDO1", LDO1, "ldo1", tps65912_ops_ldo,
+                           TPS65912_LDO1_OP, TPS65912_LDO1_AVS,
+                           tps65912_ldo_ranges),
+        TPS65912_REGULATOR("LDO2", LDO2, "ldo2", tps65912_ops_ldo,
+                           TPS65912_LDO2_OP, TPS65912_LDO2_AVS,
+                           tps65912_ldo_ranges),
+        TPS65912_REGULATOR("LDO3", LDO3, "ldo3", tps65912_ops_ldo,
+                           TPS65912_LDO3_OP, TPS65912_LDO3_AVS,
+                           tps65912_ldo_ranges),
+        TPS65912_REGULATOR("LDO4", LDO4, "ldo4", tps65912_ops_ldo,
+                           TPS65912_LDO4_OP, TPS65912_LDO4_AVS,
+                           tps65912_ldo_ranges),
+        TPS65912_REGULATOR("LDO5", LDO5, "ldo5", tps65912_ops_ldo,
+                           TPS65912_LDO5, TPS65912_LDO5,
+                           tps65912_ldo_ranges),
+        TPS65912_REGULATOR("LDO6", LDO6, "ldo6", tps65912_ops_ldo,
+                           TPS65912_LDO6, TPS65912_LDO6,
+                           tps65912_ldo_ranges),
+        TPS65912_REGULATOR("LDO7", LDO7, "ldo7", tps65912_ops_ldo,
+                           TPS65912_LDO7, TPS65912_LDO7,
+                           tps65912_ldo_ranges),
+        TPS65912_REGULATOR("LDO8", LDO8, "ldo8", tps65912_ops_ldo,
+                           TPS65912_LDO8, TPS65912_LDO8,
+                           tps65912_ldo_ranges),
+        TPS65912_REGULATOR("LDO9", LDO9, "ldo9", tps65912_ops_ldo,
+                           TPS65912_LDO9, TPS65912_LDO9,
+                           tps65912_ldo_ranges),
+        TPS65912_REGULATOR("LDO10", LDO10, "ldo10", tps65912_ops_ldo,
+                           TPS65912_LDO10, TPS65912_LDO10,
+                           tps65912_ldo_ranges),
 };
 
-static int tps65912_probe(struct platform_device *pdev)
+static int tps65912_regulator_probe(struct platform_device *pdev)
 {
-        struct tps65912 *tps65912 = dev_get_drvdata(pdev->dev.parent);
+        struct tps65912 *tps = dev_get_drvdata(pdev->dev.parent);
         struct regulator_config config = { };
-        struct tps_info *info;
-        struct regulator_init_data *reg_data;
         struct regulator_dev *rdev;
-        struct tps65912_reg *pmic;
-        struct tps65912_board *pmic_plat_data;
         int i;
 
-        pmic_plat_data = dev_get_platdata(tps65912->dev);
-        if (!pmic_plat_data)
-                return -EINVAL;
+        platform_set_drvdata(pdev, tps);
 
-        reg_data = pmic_plat_data->tps65912_pmic_init_data;
+        config.dev = &pdev->dev;
+        config.driver_data = tps;
+        config.dev->of_node = tps->dev->of_node;
+        config.regmap = tps->regmap;
 
-        pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);
-        if (!pmic)
-                return -ENOMEM;
-
-        mutex_init(&pmic->io_lock);
-        pmic->mfd = tps65912;
-        platform_set_drvdata(pdev, pmic);
-
-        pmic->get_ctrl_reg = &tps65912_get_ctrl_register;
-        info = tps65912_regs;
-
-        for (i = 0; i < TPS65912_NUM_REGULATOR; i++, info++, reg_data++) {
-                int range = 0;
-                /* Register the regulators */
-                pmic->info[i] = info;
-
-                pmic->desc[i].name = info->name;
-                pmic->desc[i].id = i;
-                pmic->desc[i].n_voltages = 64;
-                if (i > TPS65912_REG_DCDC4) {
-                        pmic->desc[i].ops = &tps65912_ops_ldo;
-                        pmic->desc[i].linear_ranges = tps65912_ldo_ranges;
-                        pmic->desc[i].n_linear_ranges =
-                                        ARRAY_SIZE(tps65912_ldo_ranges);
-                } else {
-                        pmic->desc[i].ops = &tps65912_ops_dcdc;
-                }
-                pmic->desc[i].type = REGULATOR_VOLTAGE;
-                pmic->desc[i].owner = THIS_MODULE;
-                range = tps65912_get_range(pmic, i);
-
-                config.dev = tps65912->dev;
-                config.init_data = reg_data;
-                config.driver_data = pmic;
-
-                rdev = devm_regulator_register(&pdev->dev, &pmic->desc[i],
+        for (i = 0; i < ARRAY_SIZE(regulators); i++) {
+                rdev = devm_regulator_register(&pdev->dev, &regulators[i],
                                                &config);
                 if (IS_ERR(rdev)) {
-                        dev_err(tps65912->dev,
-                                "failed to register %s regulator\n",
+                        dev_err(tps->dev, "failed to register %s regulator\n",
                                 pdev->name);
                         return PTR_ERR(rdev);
                 }
-
-                /* Save regulator for cleanup */
-                pmic->rdev[i] = rdev;
         }
+
         return 0;
 }
 
-static struct platform_driver tps65912_driver = {
+static const struct platform_device_id tps65912_regulator_id_table[] = {
+        { "tps65912-regulator", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, tps65912_regulator_id_table);
+
+static struct platform_driver tps65912_regulator_driver = {
         .driver = {
-                .name = "tps65912-pmic",
+                .name = "tps65912-regulator",
         },
-        .probe = tps65912_probe,
+        .probe = tps65912_regulator_probe,
+        .id_table = tps65912_regulator_id_table,
 };
+module_platform_driver(tps65912_regulator_driver);
 
-static int __init tps65912_init(void)
-{
-        return platform_driver_register(&tps65912_driver);
-}
-subsys_initcall(tps65912_init);
-
-static void __exit tps65912_cleanup(void)
-{
-        platform_driver_unregister(&tps65912_driver);
-}
-module_exit(tps65912_cleanup);
-
-MODULE_AUTHOR("Margarita Olaya Cabrera <magi@slimlogic.co.uk>");
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
 MODULE_DESCRIPTION("TPS65912 voltage regulator driver");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:tps65912-pmic");
diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c
index aa5c11acf212..65845712571c 100644
--- a/drivers/soc/fsl/qe/gpio.c
+++ b/drivers/soc/fsl/qe/gpio.c
@@ -63,7 +63,7 @@ static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio)
         struct qe_pio_regs __iomem *regs = mm_gc->regs;
         u32 pin_mask = 1 << (QE_PIO_PINS - 1 - gpio);
 
-        return in_be32(&regs->cpdata) & pin_mask;
+        return !!(in_be32(&regs->cpdata) & pin_mask);
 }
 
 static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 8755b2c2aada..dbde1149c218 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -25,8 +25,6 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 
-#include <asm/gpio.h>
-
 #include "atmel_usba_udc.h"
 
 #ifdef CONFIG_USB_GADGET_DEBUG_FS
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index f789d2954c5d..d177372bb357 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -24,8 +24,6 @@
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
 
-#include <asm/gpio.h>
-
 #include "ohci.h"
 
 #define valid_port(index)       ((index) >= 0 && (index) < AT91_MAX_USBH_PORTS)
diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index 56c60e67316a..669ecc755fa9 100644
--- a/drivers/video/fbdev/atmel_lcdfb.c
+++ b/drivers/video/fbdev/atmel_lcdfb.c
@@ -26,8 +26,6 @@
 #include <linux/regulator/consumer.h>
 #include <video/videomode.h>
 
-#include <asm/gpio.h>
-
 #include <video/atmel_lcdc.h>
 
 struct atmel_lcdfb_config {
diff --git a/drivers/video/fbdev/omap/lcd_h3.c b/drivers/video/fbdev/omap/lcd_h3.c
index a0729d0200d0..21512b027ff7 100644
--- a/drivers/video/fbdev/omap/lcd_h3.c
+++ b/drivers/video/fbdev/omap/lcd_h3.c
@@ -22,8 +22,8 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/i2c/tps65010.h>
+#include <linux/gpio.h>
 
-#include <asm/gpio.h>
 #include "omapfb.h"
 
 #define MODULE_NAME     "omapfb-lcd_h3"
diff --git a/drivers/video/fbdev/omap/lcd_osk.c b/drivers/video/fbdev/omap/lcd_osk.c
index c3ddebf934b2..b56886c7055e 100644
--- a/drivers/video/fbdev/omap/lcd_osk.c
+++ b/drivers/video/fbdev/omap/lcd_osk.c
@@ -22,8 +22,7 @@
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
-
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 #include <mach/hardware.h>
 #include <mach/mux.h>
diff --git a/drivers/video/fbdev/omap/lcd_palmtt.c b/drivers/video/fbdev/omap/lcd_palmtt.c
index 3d0ea04ec248..1a936d5c7b6f 100644
--- a/drivers/video/fbdev/omap/lcd_palmtt.c
+++ b/drivers/video/fbdev/omap/lcd_palmtt.c
@@ -28,8 +28,8 @@ GPIO13 - screen blanking
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/io.h>
+#include <linux/gpio.h>
 
-#include <asm/gpio.h>
 #include "omapfb.h"
 
 static int palmtt_panel_init(struct lcd_panel *panel,
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 40ec1433f05d..8ca627dcea11 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -26,8 +26,12 @@
  */
 
 #ifndef ARCH_NR_GPIOS
+#if defined(CONFIG_ARCH_NR_GPIO) && CONFIG_ARCH_NR_GPIO > 0
+#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO
+#else
 #define ARCH_NR_GPIOS           512
 #endif
+#endif
 
 /*
  * "valid" GPIO numbers are nonnegative and may be passed to
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index 82fda487453f..bee976f82788 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_GPIO_DRIVER_H
 #define __LINUX_GPIO_DRIVER_H
 
+#include <linux/device.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/irq.h>
@@ -10,22 +11,21 @@
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/kconfig.h>
 
-struct device;
 struct gpio_desc;
 struct of_phandle_args;
 struct device_node;
 struct seq_file;
+struct gpio_device;
 
 #ifdef CONFIG_GPIOLIB
 
 /**
  * struct gpio_chip - abstract a GPIO controller
- * @label: for diagnostics
+ * @label: a functional name for the GPIO device, such as a part
+ *      number or the name of the SoC IP-block implementing it.
+ * @gpiodev: the internal state holder, opaque struct
  * @parent: optional parent device providing the GPIOs
- * @cdev: class device used by sysfs interface (may be NULL)
  * @owner: helps prevent removal of modules exporting active GPIOs
- * @data: per-instance data assigned by the driver
- * @list: links gpio_chips together for traversal
  * @request: optional hook for chip-specific activation, such as
  *      enabling module power and clock; may sleep
  * @free: optional hook for chip-specific deactivation, such as
@@ -52,7 +52,6 @@ struct seq_file;
  *      get rid of the static GPIO number space in the long run.
  * @ngpio: the number of GPIOs handled by this controller; the last GPIO
  *      handled is (base + ngpio - 1).
- * @desc: array of ngpio descriptors. Private.
  * @names: if set, must be an array of strings to use as alternative
  *      names for the GPIOs in this chip. Any entry in the array
  *      may be NULL if there is no alias for the GPIO, however the
@@ -107,11 +106,9 @@ struct seq_file;
  */
 struct gpio_chip {
         const char              *label;
+        struct gpio_device      *gpiodev;
         struct device           *parent;
-        struct device           *cdev;
         struct module           *owner;
-        void                    *data;
-        struct list_head        list;
 
         int                     (*request)(struct gpio_chip *chip,
                                                 unsigned offset);
@@ -141,7 +138,6 @@ struct gpio_chip {
                                                 struct gpio_chip *chip);
         int                     base;
         u16                     ngpio;
-        struct gpio_desc        *desc;
         const char              *const *names;
         bool                    can_sleep;
         bool                    irq_not_threaded;
@@ -184,15 +180,6 @@ struct gpio_chip {
         int (*of_xlate)(struct gpio_chip *gc,
                         const struct of_phandle_args *gpiospec, u32 *flags);
 #endif
-#ifdef CONFIG_PINCTRL
-        /*
-         * If CONFIG_PINCTRL is enabled, then gpio controllers can optionally
-         * describe the actual pin range which they serve in an SoC. This
-         * information would be used by pinctrl subsystem to configure
-         * corresponding pins for gpio usage.
-         */
-        struct list_head pin_ranges;
-#endif
 };
 
 extern const char *gpiochip_is_requested(struct gpio_chip *chip,
@@ -205,18 +192,24 @@ static inline int gpiochip_add(struct gpio_chip *chip)
         return gpiochip_add_data(chip, NULL);
 }
 extern void gpiochip_remove(struct gpio_chip *chip);
+extern int devm_gpiochip_add_data(struct device *dev, struct gpio_chip *chip,
+                                  void *data);
+extern void devm_gpiochip_remove(struct device *dev, struct gpio_chip *chip);
+
 extern struct gpio_chip *gpiochip_find(void *data,
                               int (*match)(struct gpio_chip *chip, void *data));
 
 /* lock/unlock as IRQ */
 int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
 void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);
+bool gpiochip_line_is_irq(struct gpio_chip *chip, unsigned int offset);
+
+/* Line status inquiry for drivers */
+bool gpiochip_line_is_open_drain(struct gpio_chip *chip, unsigned int offset);
+bool gpiochip_line_is_open_source(struct gpio_chip *chip, unsigned int offset);
 
 /* get driver data */
-static inline void *gpiochip_get_data(struct gpio_chip *chip)
-{
-        return chip->data;
-}
+void *gpiochip_get_data(struct gpio_chip *chip);
 
 struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc);
 
diff --git a/include/linux/mfd/tps65912.h b/include/linux/mfd/tps65912.h
index 6d309032dc0d..1a603701550e 100644
--- a/include/linux/mfd/tps65912.h
+++ b/include/linux/mfd/tps65912.h
@@ -1,28 +1,27 @@
 /*
- * tps65912.h  --  TI TPS6591x
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *      Andrew F. Davis <afd@ti.com>
  *
- * Copyright 2011 Texas Instruments Inc.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
- * Author: Margarita Olaya <magi@slimlogic.co.uk>
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under  the terms of the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the License, or (at your
- *  option) any later version.
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.
  *
+ * Based on the TPS65218 driver and the previous TPS65912 driver by
+ * Margarita Olaya Cabrera <magi@slimlogic.co.uk>
  */
 
 #ifndef __LINUX_MFD_TPS65912_H
 #define __LINUX_MFD_TPS65912_H
 
-/* TPS regulator type list */
-#define REGULATOR_LDO           0
-#define REGULATOR_DCDC          1
-
-/*
- * List of registers for TPS65912
- */
+#include <linux/device.h>
+#include <linux/regmap.h>
 
+/* List of registers for TPS65912 */
 #define TPS65912_DCDC1_CTRL             0x00
 #define TPS65912_DCDC2_CTRL             0x01
 #define TPS65912_DCDC3_CTRL             0x02
@@ -126,41 +125,45 @@
 #define TPS65912_VERNUM                 0x64
 #define TPS6591X_MAX_REGISTER           0x64
 
-/* IRQ Definitions */
-#define TPS65912_IRQ_PWRHOLD_F          0
-#define TPS65912_IRQ_VMON               1
-#define TPS65912_IRQ_PWRON              2
-#define TPS65912_IRQ_PWRON_LP           3
-#define TPS65912_IRQ_PWRHOLD_R          4
-#define TPS65912_IRQ_HOTDIE             5
-#define TPS65912_IRQ_GPIO1_R            6
-#define TPS65912_IRQ_GPIO1_F            7
-#define TPS65912_IRQ_GPIO2_R            8
-#define TPS65912_IRQ_GPIO2_F            9
-#define TPS65912_IRQ_GPIO3_R            10
-#define TPS65912_IRQ_GPIO3_F            11
-#define TPS65912_IRQ_GPIO4_R            12
-#define TPS65912_IRQ_GPIO4_F            13
-#define TPS65912_IRQ_GPIO5_R            14
-#define TPS65912_IRQ_GPIO5_F            15
-#define TPS65912_IRQ_PGOOD_DCDC1        16
-#define TPS65912_IRQ_PGOOD_DCDC2        17
-#define TPS65912_IRQ_PGOOD_DCDC3        18
-#define TPS65912_IRQ_PGOOD_DCDC4        19
-#define TPS65912_IRQ_PGOOD_LDO1         20
-#define TPS65912_IRQ_PGOOD_LDO2         21
-#define TPS65912_IRQ_PGOOD_LDO3         22
-#define TPS65912_IRQ_PGOOD_LDO4         23
-#define TPS65912_IRQ_PGOOD_LDO5         24
-#define TPS65912_IRQ_PGOOD_LDO6         25
-#define TPS65912_IRQ_PGOOD_LDO7         26
-#define TPS65912_IRQ_PGOOD_LD08         27
-#define TPS65912_IRQ_PGOOD_LDO9         28
-#define TPS65912_IRQ_PGOOD_LDO10        29
+/* INT_STS Register field definitions */
+#define TPS65912_INT_STS_PWRHOLD_F      BIT(0)
+#define TPS65912_INT_STS_VMON           BIT(1)
+#define TPS65912_INT_STS_PWRON          BIT(2)
+#define TPS65912_INT_STS_PWRON_LP       BIT(3)
+#define TPS65912_INT_STS_PWRHOLD_R      BIT(4)
+#define TPS65912_INT_STS_HOTDIE         BIT(5)
+#define TPS65912_INT_STS_GPIO1_R        BIT(6)
+#define TPS65912_INT_STS_GPIO1_F        BIT(7)
+
+/* INT_STS Register field definitions */
+#define TPS65912_INT_STS2_GPIO2_R       BIT(0)
+#define TPS65912_INT_STS2_GPIO2_F       BIT(1)
+#define TPS65912_INT_STS2_GPIO3_R       BIT(2)
+#define TPS65912_INT_STS2_GPIO3_F       BIT(3)
+#define TPS65912_INT_STS2_GPIO4_R       BIT(4)
+#define TPS65912_INT_STS2_GPIO4_F       BIT(5)
+#define TPS65912_INT_STS2_GPIO5_R       BIT(6)
+#define TPS65912_INT_STS2_GPIO5_F       BIT(7)
 
-#define TPS65912_NUM_IRQ                30
+/* INT_STS Register field definitions */
+#define TPS65912_INT_STS3_PGOOD_DCDC1   BIT(0)
+#define TPS65912_INT_STS3_PGOOD_DCDC2   BIT(1)
+#define TPS65912_INT_STS3_PGOOD_DCDC3   BIT(2)
+#define TPS65912_INT_STS3_PGOOD_DCDC4   BIT(3)
+#define TPS65912_INT_STS3_PGOOD_LDO1    BIT(4)
+#define TPS65912_INT_STS3_PGOOD_LDO2    BIT(5)
+#define TPS65912_INT_STS3_PGOOD_LDO3    BIT(6)
+#define TPS65912_INT_STS3_PGOOD_LDO4    BIT(7)
 
-/* GPIO 1 and 2 Register Definitions */
+/* INT_STS Register field definitions */
+#define TPS65912_INT_STS4_PGOOD_LDO5    BIT(0)
+#define TPS65912_INT_STS4_PGOOD_LDO6    BIT(1)
+#define TPS65912_INT_STS4_PGOOD_LDO7    BIT(2)
+#define TPS65912_INT_STS4_PGOOD_LDO8    BIT(3)
+#define TPS65912_INT_STS4_PGOOD_LDO9    BIT(4)
+#define TPS65912_INT_STS4_PGOOD_LDO10   BIT(5)
+
+/* GPIO 1 and 2 Register field definitions */
 #define GPIO_SLEEP_MASK                 0x80
 #define GPIO_SLEEP_SHIFT                7
 #define GPIO_DEB_MASK                   0x10
@@ -172,7 +175,7 @@
 #define GPIO_SET_MASK                   0x01
 #define GPIO_SET_SHIFT                  0
 
-/* GPIO 3 Register Definitions */
+/* GPIO 3 Register field definitions */
 #define GPIO3_SLEEP_MASK                0x80
 #define GPIO3_SLEEP_SHIFT               7
 #define GPIO3_SEL_MASK                  0x40
@@ -190,7 +193,7 @@
 #define GPIO3_SET_MASK                  0x01
 #define GPIO3_SET_SHIFT                 0
 
-/* GPIO 4 Register Definitions */
+/* GPIO 4 Register field definitions */
 #define GPIO4_SLEEP_MASK                0x80
 #define GPIO4_SLEEP_SHIFT               7
 #define GPIO4_SEL_MASK                  0x40
@@ -264,65 +267,75 @@
 #define DCDC_LIMIT_MAX_SEL_MASK         0x3F
 #define DCDC_LIMIT_MAX_SEL_SHIFT        0
 
-/**
- * struct tps65912_board
- * Board platform dat may be used to initialize regulators.
- */
-struct tps65912_board {
-        int is_dcdc1_avs;
-        int is_dcdc2_avs;
-        int is_dcdc3_avs;
-        int is_dcdc4_avs;
-        int irq;
-        int irq_base;
-        int gpio_base;
-        struct regulator_init_data *tps65912_pmic_init_data;
+/* Define the TPS65912 IRQ numbers */
+enum tps65912_irqs {
+        /* INT_STS registers */
+        TPS65912_IRQ_PWRHOLD_F,
+        TPS65912_IRQ_VMON,
+        TPS65912_IRQ_PWRON,
+        TPS65912_IRQ_PWRON_LP,
+        TPS65912_IRQ_PWRHOLD_R,
+        TPS65912_IRQ_HOTDIE,
+        TPS65912_IRQ_GPIO1_R,
+        TPS65912_IRQ_GPIO1_F,
+        /* INT_STS2 registers */
+        TPS65912_IRQ_GPIO2_R,
+        TPS65912_IRQ_GPIO2_F,
+        TPS65912_IRQ_GPIO3_R,
+        TPS65912_IRQ_GPIO3_F,
+        TPS65912_IRQ_GPIO4_R,
+        TPS65912_IRQ_GPIO4_F,
+        TPS65912_IRQ_GPIO5_R,
+        TPS65912_IRQ_GPIO5_F,
+        /* INT_STS3 registers */
+        TPS65912_IRQ_PGOOD_DCDC1,
+        TPS65912_IRQ_PGOOD_DCDC2,
+        TPS65912_IRQ_PGOOD_DCDC3,
+        TPS65912_IRQ_PGOOD_DCDC4,
+        TPS65912_IRQ_PGOOD_LDO1,
+        TPS65912_IRQ_PGOOD_LDO2,
+        TPS65912_IRQ_PGOOD_LDO3,
+        TPS65912_IRQ_PGOOD_LDO4,
+        /* INT_STS4 registers */
+        TPS65912_IRQ_PGOOD_LDO5,
+        TPS65912_IRQ_PGOOD_LDO6,
+        TPS65912_IRQ_PGOOD_LDO7,
+        TPS65912_IRQ_PGOOD_LDO8,
+        TPS65912_IRQ_PGOOD_LDO9,
+        TPS65912_IRQ_PGOOD_LDO10,
 };
 
-/**
- * struct tps65912 - tps65912 sub-driver chip access routines
+/*
+ * struct tps65912 - state holder for the tps65912 driver
+ *
+ * Device data may be used to access the TPS65912 chip
  */
-
 struct tps65912 {
         struct device *dev;
-        /* for read/write acces */
-        struct mutex io_mutex;
-
-        /* For device IO interfaces: I2C or SPI */
-        void *control_data;
-
-        int (*read)(struct tps65912 *tps65912, u8 reg, int size, void *dest);
-        int (*write)(struct tps65912 *tps65912, u8 reg, int size, void *src);
-
-        /* Client devices */
-        struct tps65912_pmic *pmic;
+        struct regmap *regmap;
 
-        /* GPIO Handling */
-        struct gpio_chip gpio;
+        /* IRQ Data */
+        int irq;
+        struct regmap_irq_chip_data *irq_data;
+};
 
-        /* IRQ Handling */
-        struct mutex irq_lock;
-        int chip_irq;
-        int irq_base;
-        int irq_num;
-        u32 irq_mask;
+static const struct regmap_range tps65912_yes_ranges[] = {
+        regmap_reg_range(TPS65912_INT_STS, TPS65912_GPIO5),
 };
 
-struct tps65912_platform_data {
-        int irq;
-        int irq_base;
+static const struct regmap_access_table tps65912_volatile_table = {
+        .yes_ranges = tps65912_yes_ranges,
+        .n_yes_ranges = ARRAY_SIZE(tps65912_yes_ranges),
 };
 
-unsigned int tps_chip(void);
+static const struct regmap_config tps65912_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+        .cache_type = REGCACHE_RBTREE,
+        .volatile_table = &tps65912_volatile_table,
+};
 
-int tps65912_set_bits(struct tps65912 *tps65912, u8 reg, u8 mask);
-int tps65912_clear_bits(struct tps65912 *tps65912, u8 reg, u8 mask);
-int tps65912_reg_read(struct tps65912 *tps65912, u8 reg);
-int tps65912_reg_write(struct tps65912 *tps65912, u8 reg, u8 val);
-int tps65912_device_init(struct tps65912 *tps65912);
-void tps65912_device_exit(struct tps65912 *tps65912);
-int tps65912_irq_init(struct tps65912 *tps65912, int irq,
-                        struct tps65912_platform_data *pdata);
-int tps65912_irq_exit(struct tps65912 *tps65912);
+int tps65912_device_init(struct tps65912 *tps);
+int tps65912_device_exit(struct tps65912 *tps);
 
 #endif /*  __LINUX_MFD_TPS65912_H */
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index ebd10e624598..5c9ae6a9b7f5 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -138,6 +138,7 @@ header-y += genetlink.h
 header-y += gen_stats.h
 header-y += gfs2_ondisk.h
 header-y += gigaset_dev.h
+header-y += gpio.h
 header-y += gsmmux.h
 header-y += hdlcdrv.h
 header-y += hdlc.h
diff --git a/include/uapi/linux/gpio.h b/include/uapi/linux/gpio.h
new file mode 100644
index 000000000000..d0a3cac72250
--- /dev/null
+++ b/include/uapi/linux/gpio.h
@@ -0,0 +1,58 @@
+/*
+ * <linux/gpio.h> - userspace ABI for the GPIO character devices
+ *
+ * Copyright (C) 2015 Linus Walleij
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef _UAPI_GPIO_H_
+#define _UAPI_GPIO_H_
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/**
+ * struct gpiochip_info - Information about a certain GPIO chip
+ * @name: the Linux kernel name of this GPIO chip
+ * @label: a functional name for this GPIO chip, such as a product
+ * number, may be NULL
+ * @lines: number of GPIO lines on this chip
+ */
+struct gpiochip_info {
+        char name[32];
+        char label[32];
+        __u32 lines;
+};
+
+/* Line is in use by the kernel */
+#define GPIOLINE_FLAG_KERNEL            (1UL << 0)
+#define GPIOLINE_FLAG_IS_OUT            (1UL << 1)
+#define GPIOLINE_FLAG_ACTIVE_LOW        (1UL << 2)
+#define GPIOLINE_FLAG_OPEN_DRAIN        (1UL << 3)
+#define GPIOLINE_FLAG_OPEN_SOURCE       (1UL << 4)
+
+/**
+ * struct gpioline_info - Information about a certain GPIO line
+ * @line_offset: the local offset on this GPIO device, fill this in when
+ * requesting the line information from the kernel
+ * @flags: various flags for this line
+ * @name: the name of this GPIO line, such as the output pin of the line on the
+ * chip, a rail or a pin header name on a board, as specified by the gpio
+ * chip, may be NULL
+ * @consumer: a functional name for the consumer of this GPIO line as set by
+ * whatever is using it, will be NULL if there is no current user but may
+ * also be NULL if the consumer doesn't set this up
+ */
+struct gpioline_info {
+        __u32 line_offset;
+        __u32 flags;
+        char name[32];
+        char consumer[32];
+};
+
+#define GPIO_GET_CHIPINFO_IOCTL _IOR(0xB4, 0x01, struct gpiochip_info)
+#define GPIO_GET_LINEINFO_IOCTL _IOWR(0xB4, 0x02, struct gpioline_info)
+
+#endif /* _UAPI_GPIO_H_ */
diff --git a/tools/Makefile b/tools/Makefile
index 6339f6ac3ccb..f41e7c6ea23e 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -13,6 +13,7 @@ help:
         @echo '  cpupower               - a tool for all things x86 CPU power'
         @echo '  firewire               - the userspace part of nosy, an IEEE-1394 traffic sniffer'
         @echo '  freefall               - laptop accelerometer program for disk protection'
+        @echo '  gpio                   - GPIO tools'
         @echo '  hv                     - tools used when in Hyper-V clients'
         @echo '  iio                    - IIO tools'
         @echo '  lguest                 - a minimal 32-bit x86 hypervisor'
@@ -53,7 +54,7 @@ acpi: FORCE
 cpupower: FORCE
         $(call descend,power/$@)
 
-cgroup firewire hv guest spi usb virtio vm net iio: FORCE
+cgroup firewire hv guest spi usb virtio vm net iio gpio: FORCE
         $(call descend,$@)
 
 liblockdep: FORCE
@@ -119,7 +120,7 @@ acpi_clean:
 cpupower_clean:
         $(call descend,power/cpupower,clean)
 
-cgroup_clean hv_clean firewire_clean lguest_clean spi_clean usb_clean virtio_clean vm_clean net_clean iio_clean:
+cgroup_clean hv_clean firewire_clean lguest_clean spi_clean usb_clean virtio_clean vm_clean net_clean iio_clean gpio_clean:
         $(call descend,$(@:_clean=),clean)
 
 liblockdep_clean:
@@ -155,6 +156,7 @@ build_clean:
 clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \
                 perf_clean selftests_clean turbostat_clean spi_clean usb_clean virtio_clean \
                 vm_clean net_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
-                freefall_clean build_clean libbpf_clean libsubcmd_clean liblockdep_clean
+                freefall_clean build_clean libbpf_clean libsubcmd_clean liblockdep_clean \
+                gpio_clean
 
 .PHONY: FORCE
diff --git a/tools/gpio/Makefile b/tools/gpio/Makefile
new file mode 100644
index 000000000000..4d198d5c4203
--- /dev/null
+++ b/tools/gpio/Makefile
@@ -0,0 +1,12 @@
+CC = $(CROSS_COMPILE)gcc
+CFLAGS += -Wall -g -D_GNU_SOURCE
+
+all: lsgpio
+
+lsgpio: lsgpio.o gpio-utils.o
+
+%.o: %.c gpio-utils.h
+
+.PHONY: clean
+clean:
+        rm -f *.o lsgpio
diff --git a/tools/gpio/gpio-utils.c b/tools/gpio/gpio-utils.c
new file mode 100644
index 000000000000..8208718f2c99
--- /dev/null
+++ b/tools/gpio/gpio-utils.c
@@ -0,0 +1,11 @@
+/*
+ * GPIO tools - helpers library for the GPIO tools
+ *
+ * Copyright (C) 2015 Linus Walleij
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#include "gpio-utils.h"
diff --git a/tools/gpio/gpio-utils.h b/tools/gpio/gpio-utils.h
new file mode 100644
index 000000000000..5f57133b8c04
--- /dev/null
+++ b/tools/gpio/gpio-utils.h
@@ -0,0 +1,27 @@
+/*
+ * GPIO tools - utility helpers library for the GPIO tools
+ *
+ * Copyright (C) 2015 Linus Walleij
+ *
+ * Portions copied from iio_utils and lssio:
+ * Copyright (c) 2010 Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
+ * Copyright (c) 2008 Jonathan Cameron
+ * *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef _GPIO_UTILS_H_
+#define _GPIO_UTILS_H_
+
+#include <string.h>
+
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
+static inline int check_prefix(const char *str, const char *prefix)
+{
+        return strlen(str) > strlen(prefix) &&
+                strncmp(str, prefix, strlen(prefix)) == 0;
+}
+
+#endif /* _GPIO_UTILS_H_ */
diff --git a/tools/gpio/lsgpio.c b/tools/gpio/lsgpio.c
new file mode 100644
index 000000000000..1124da375942
--- /dev/null
+++ b/tools/gpio/lsgpio.c
@@ -0,0 +1,195 @@
+/*
+ * lsgpio - example on how to list the GPIO lines on a system
+ *
+ * Copyright (C) 2015 Linus Walleij
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * Usage:
+ *      lsgpio <-n device-name>
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <dirent.h>
+#include <errno.h>
+#include <string.h>
+#include <poll.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <sys/ioctl.h>
+#include <linux/gpio.h>
+
+#include "gpio-utils.h"
+
+struct gpio_flag {
+        char *name;
+        unsigned long mask;
+};
+
+struct gpio_flag flagnames[] = {
+        {
+                .name = "kernel",
+                .mask = GPIOLINE_FLAG_KERNEL,
+        },
+        {
+                .name = "output",
+                .mask = GPIOLINE_FLAG_IS_OUT,
+        },
+        {
+                .name = "active-low",
+                .mask = GPIOLINE_FLAG_ACTIVE_LOW,
+        },
+        {
+                .name = "open-drain",
+                .mask = GPIOLINE_FLAG_OPEN_DRAIN,
+        },
+        {
+                .name = "open-source",
+                .mask = GPIOLINE_FLAG_OPEN_SOURCE,
+        },
+};
+
+void print_flags(unsigned long flags)
+{
+        int i;
+        int printed = 0;
+
+        for (i = 0; i < ARRAY_SIZE(flagnames); i++) {
+                if (flags & flagnames[i].mask) {
+                        if (printed)
+                                fprintf(stdout, " ");
+                        fprintf(stdout, "%s", flagnames[i].name);
+                        printed++;
+                }
+        }
+}
+
+int list_device(const char *device_name)
+{
+        struct gpiochip_info cinfo;
+        char *chrdev_name;
+        int fd;
+        int ret;
+        int i;
+
+        ret = asprintf(&chrdev_name, "/dev/%s", device_name);
+        if (ret < 0)
+                return -ENOMEM;
+
+        fd = open(chrdev_name, 0);
+        if (fd == -1) {
+                ret = -errno;
+                fprintf(stderr, "Failed to open %s\n", chrdev_name);
+                goto exit_close_error;
+        }
+
+        /* Inspect this GPIO chip */
+        ret = ioctl(fd, GPIO_GET_CHIPINFO_IOCTL, &cinfo);
+        if (ret == -1) {
+                ret = -errno;
+                perror("Failed to issue CHIPINFO IOCTL\n");
+                goto exit_close_error;
+        }
+        fprintf(stdout, "GPIO chip: %s, \"%s\", %u GPIO lines\n",
+                cinfo.name, cinfo.label, cinfo.lines);
+
+        /* Loop over the lines and print info */
+        for (i = 0; i < cinfo.lines; i++) {
+                struct gpioline_info linfo;
+
+                memset(&linfo, 0, sizeof(linfo));
+                linfo.line_offset = i;
+
+                ret = ioctl(fd, GPIO_GET_LINEINFO_IOCTL, &linfo);
+                if (ret == -1) {
+                        ret = -errno;
+                        perror("Failed to issue LINEINFO IOCTL\n");
+                        goto exit_close_error;
+                }
+                fprintf(stdout, "\tline %2d:", linfo.line_offset);
+                if (linfo.name[0])
+                        fprintf(stdout, " \"%s\"", linfo.name);
+                else
+                        fprintf(stdout, " unnamed");
+                if (linfo.consumer[0])
+                        fprintf(stdout, " \"%s\"", linfo.consumer);
+                else
+                        fprintf(stdout, " unused");
+                if (linfo.flags) {
+                        fprintf(stdout, " [");
+                        print_flags(linfo.flags);
+                        fprintf(stdout, "]");
+                }
+                fprintf(stdout, "\n");
+
+        }
+
+exit_close_error:
+        if (close(fd) == -1)
+                perror("Failed to close GPIO character device file");
+        free(chrdev_name);
+        return ret;
+}
+
+void print_usage(void)
+{
+        fprintf(stderr, "Usage: lsgpio [options]...\n"
+                "List GPIO chips, lines and states\n"
+                "  -n <name>  List GPIOs on a named device\n"
+                "  -?         This helptext\n"
+        );
+}
+
+int main(int argc, char **argv)
+{
+        const char *device_name;
+        int ret;
+        int c;
+
+        while ((c = getopt(argc, argv, "n:")) != -1) {
+                switch (c) {
+                case 'n':
+                        device_name = optarg;
+                        break;
+                case '?':
+                        print_usage();
+                        return -1;
+                }
+        }
+
+        if (device_name)
+                ret = list_device(device_name);
+        else {
+                const struct dirent *ent;
+                DIR *dp;
+
+                /* List all GPIO devices one at a time */
+                dp = opendir("/dev");
+                if (!dp) {
+                        ret = -errno;
+                        goto error_out;
+                }
+
+                ret = -ENOENT;
+                while (ent = readdir(dp), ent) {
+                        if (check_prefix(ent->d_name, "gpiochip")) {
+                                ret = list_device(ent->d_name);
+                                if (ret)
+                                        break;
+                        }
+                }
+
+                ret = 0;
+                if (closedir(dp) == -1) {
+                        perror("scanning devices: Failed to close directory");
+                        ret = -errno;
+                }
+        }
+error_out:
+        return ret;
+}