Merge tag 'gpio-v5.2-updates-for-linus-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel

gpio: updates for v5.2 (part 1)

- batch of improvements for the vf610 driver which shrink the code and
  make use of resource managed helpers
- support for a new variant of pca953x
- make gpio-mockup buildable on systems without IOMEM
- make gpio-74x164 more flexible by using generic device properties
  plus minor improvements
- new driver for Mellanox BlueField
- fixes for wakeup GPIOs in gpio-omap
- use devm_platform_ioremap_resource() in gpio-mxc
- a couple improvements of kernel docs for ACPI code
- don't WARN() in gpiod_put() on optional GPIOs

10 files changed, 279 insertions, 125 deletions

diff --git a/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt b/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt
index fb144e2b6522..8678df2a5713 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt
@@ -30,6 +30,7 @@ Required properties:
         ti,tca6424
         ti,tca9539
         ti,tca9554
+        onnn,cat9554
         onnn,pca9654
         exar,xra1202
  - gpio-controller: if used as gpio expander.
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index c5420e6c9e4d..50020cacf1b4 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -330,20 +330,6 @@ config GPIO_MM_LANTIQ
           (EBU) found on Lantiq SoCs. The gpios are output only as they are
           created by attaching a 16bit latch to the bus.
 
-config GPIO_MOCKUP
-        tristate "GPIO Testing Driver"
-        depends on GPIOLIB && SYSFS
-        select GPIO_SYSFS
-        select GPIOLIB_IRQCHIP
-        select IRQ_SIM
-        help
-          This enables GPIO Testing driver, which provides a way to test GPIO
-          subsystem through sysfs(or char device) and debugfs. GPIO_SYSFS
-          must be selected for this test.
-          User could use it through the script in
-          tools/testing/selftests/gpio/gpio-mockup.sh. Reference the usage in
-          it.
-
 config GPIO_MPC5200
         def_bool y
         depends on PPC_MPC52xx
@@ -1316,6 +1302,13 @@ config GPIO_MERRIFIELD
         help
           Say Y here to support Intel Merrifield GPIO.
 
+config GPIO_MLXBF
+        tristate "Mellanox BlueField SoC GPIO"
+        depends on (MELLANOX_PLATFORM && ARM64 && ACPI) || (64BIT && COMPILE_TEST)
+        select GPIO_GENERIC
+        help
+          Say Y here if you want GPIO support on Mellanox BlueField SoC.
+
 config GPIO_ML_IOH
         tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"
         depends on X86 || COMPILE_TEST
@@ -1442,4 +1435,16 @@ config GPIO_VIPERBOARD
 
 endmenu
 
+config GPIO_MOCKUP
+        tristate "GPIO Testing Driver"
+        depends on GPIOLIB
+        select IRQ_SIM
+        help
+          This enables GPIO Testing driver, which provides a way to test GPIO
+          subsystem through sysfs(or char device) and debugfs. GPIO_SYSFS
+          must be selected for this test.
+          User could use it through the script in
+          tools/testing/selftests/gpio/gpio-mockup.sh. Reference the usage in
+          it.
+
 endif
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 54d55274b93a..db8d854f9aea 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -85,6 +85,7 @@ obj-$(CONFIG_GPIO_MENZ127)	+= gpio-menz127.o
 obj-$(CONFIG_GPIO_MERRIFIELD)   += gpio-merrifield.o
 obj-$(CONFIG_GPIO_MC33880)      += gpio-mc33880.o
 obj-$(CONFIG_GPIO_MC9S08DZ60)   += gpio-mc9s08dz60.o
+obj-$(CONFIG_GPIO_MLXBF)        += gpio-mlxbf.o
 obj-$(CONFIG_GPIO_ML_IOH)       += gpio-ml-ioh.o
 obj-$(CONFIG_GPIO_MM_LANTIQ)    += gpio-mm-lantiq.o
 obj-$(CONFIG_GPIO_MOCKUP)      += gpio-mockup.o
diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index fb7b620763a2..e81307f9754e 100644
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -1,21 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  74Hx164 - Generic serial-in/parallel-out 8-bits shift register GPIO driver
  *
  *  Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2010 Miguel Gaio <miguel.gaio@efixo.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.
  */
 
-#include <linux/init.h>
-#include <linux/mutex.h>
-#include <linux/spi/spi.h>
-#include <linux/gpio/driver.h>
 #include <linux/gpio/consumer.h>
-#include <linux/slab.h>
+#include <linux/gpio/driver.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/property.h>
+#include <linux/slab.h>
+#include <linux/spi/spi.h>
 
 #define GEN_74X164_NUMBER_GPIOS 8
 
@@ -116,10 +113,9 @@ static int gen_74x164_probe(struct spi_device *spi)
         if (ret < 0)
                 return ret;
 
-        if (of_property_read_u32(spi->dev.of_node, "registers-number",
-                                 &nregs)) {
-                dev_err(&spi->dev,
-                        "Missing registers-number property in the DT.\n");
+        ret = device_property_read_u32(&spi->dev, "registers-number", &nregs);
+        if (ret) {
+                dev_err(&spi->dev, "Missing 'registers-number' property.\n");
                 return -EINVAL;
         }
 
diff --git a/drivers/gpio/gpio-mlxbf.c b/drivers/gpio/gpio-mlxbf.c
new file mode 100644
index 000000000000..894aaf55fc96
--- /dev/null
+++ b/drivers/gpio/gpio-mlxbf.c
@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/acpi.h>
+#include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/gpio/driver.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/pm.h>
+#include <linux/resource.h>
+#include <linux/types.h>
+
+/* Number of pins on BlueField */
+#define MLXBF_GPIO_NR 54
+
+/* Pad Electrical Controls. */
+#define MLXBF_GPIO_PAD_CONTROL_FIRST_WORD 0x0700
+#define MLXBF_GPIO_PAD_CONTROL_1_FIRST_WORD 0x0708
+#define MLXBF_GPIO_PAD_CONTROL_2_FIRST_WORD 0x0710
+#define MLXBF_GPIO_PAD_CONTROL_3_FIRST_WORD 0x0718
+
+#define MLXBF_GPIO_PIN_DIR_I 0x1040
+#define MLXBF_GPIO_PIN_DIR_O 0x1048
+#define MLXBF_GPIO_PIN_STATE 0x1000
+#define MLXBF_GPIO_SCRATCHPAD 0x20
+
+#ifdef CONFIG_PM
+struct mlxbf_gpio_context_save_regs {
+        u64 scratchpad;
+        u64 pad_control[MLXBF_GPIO_NR];
+        u64 pin_dir_i;
+        u64 pin_dir_o;
+};
+#endif
+
+/* Device state structure. */
+struct mlxbf_gpio_state {
+        struct gpio_chip gc;
+
+        /* Memory Address */
+        void __iomem *base;
+
+#ifdef CONFIG_PM
+        struct mlxbf_gpio_context_save_regs csave_regs;
+#endif
+};
+
+static int mlxbf_gpio_probe(struct platform_device *pdev)
+{
+        struct mlxbf_gpio_state *gs;
+        struct device *dev = &pdev->dev;
+        struct gpio_chip *gc;
+        int ret;
+
+        gs = devm_kzalloc(&pdev->dev, sizeof(*gs), GFP_KERNEL);