gpio: Added support to Zynq Ultrascale+ MPSoC

Added support to Zynq Ultrascale+ MPSoC on the existing zynq
gpio driver.

Signed-off-by: Anurag Kumar Vulisha <anuragku@xilinx.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/Documentation/devicetree/bindings/gpio/gpio-zynq.txt b/Documentation/devicetree/bindings/gpio/gpio-zynq.txt
index 986371a..db4c6a6 100644 (file)
--- a/Documentation/devicetree/bindings/gpio/gpio-zynq.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-zynq.txt
@@ -6,7 +6,7 @@ Required properties:
                          - First cell is the GPIO line number
                          - Second cell is used to specify optional
                            parameters (unused)
-- compatible           : Should be "xlnx,zynq-gpio-1.0"
+- compatible           : Should be "xlnx,zynq-gpio-1.0" or "xlnx,zynqmp-gpio-1.0"
 - clocks               : Clock specifier (see clock bindings for details)
 - gpio-controller      : Marks the device node as a GPIO controller.
 - interrupts           : Interrupt specifier (see interrupt bindings for

diff --cc drivers/gpio/Kconfig
Simple merge

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