ath79: add MikroTik suffix to the local GPIO latch driver
authorShiji Yang <yangshiji66@qq.com>
Sat, 16 Mar 2024 00:39:16 +0000 (08:39 +0800)
committerHauke Mehrtens <hauke@hauke-m.de>
Thu, 9 May 2024 21:51:14 +0000 (23:51 +0200)
The upcoming 6.6 kernel will introduce a new upstream generic
"gpio-latch" driver. It will conflict with the downstream MikroTik
GPIO latch driver. Let's rename it to avoid any potential issues.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
target/linux/ath79/config-6.1
target/linux/ath79/dts/ar9342_mikrotik_routerboard-911g.dtsi
target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c [new file with mode: 0644]
target/linux/ath79/files/drivers/gpio/gpio-latch.c [deleted file]
target/linux/ath79/mikrotik/config-default
target/linux/ath79/patches-6.1/911-mikrotik-rb91x.patch

index f2a6969aa1e5ddf9605cc7c750e4ccd595376f00..87f520228f93555fb8903a0abd152453a75a5d45 100644 (file)
@@ -81,7 +81,7 @@ CONFIG_GPIO_74X164=y
 CONFIG_GPIO_ATH79=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_GENERIC=y
-# CONFIG_GPIO_LATCH is not set
+# CONFIG_GPIO_LATCH_MIKROTIK is not set
 # CONFIG_GPIO_RB91X_KEY is not set
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
index 5f9d8e42fb8015545197d866cd1c4b8aeea8ace3..0c98a6634ee4b737d884ef77c42ce28397b1c9dd 100644 (file)
@@ -22,7 +22,7 @@
        };
 
        gpio_latch: gpio_latch {
-               compatible = "gpio-latch";
+               compatible = "gpio-latch-mikrotik";
                gpio-controller;
                #gpio-cells = <2>;
                gpios = <&gpio 0 GPIO_ACTIVE_HIGH>,
diff --git a/target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c b/target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c
new file mode 100644 (file)
index 0000000..8f53974
--- /dev/null
@@ -0,0 +1,205 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ *  GPIO latch driver
+ *
+ *  Copyright (C) 2014 Gabor Juhos <juhosg@openwrt.org>
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/gpio/consumer.h>
+#include <linux/gpio/driver.h>
+#include <linux/platform_device.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
+
+#define GPIO_LATCH_DRIVER_NAME  "gpio-latch-mikrotik"
+#define GPIO_LATCH_LINES 9
+
+struct gpio_latch_chip {
+       struct gpio_chip gc;
+       struct mutex mutex;
+       struct mutex latch_mutex;
+       bool latch_enabled;
+       int le_gpio;
+       bool le_active_low;
+       struct gpio_desc *gpios[GPIO_LATCH_LINES];
+};
+
+static inline struct gpio_latch_chip *to_gpio_latch_chip(struct gpio_chip *gc)
+{
+       return container_of(gc, struct gpio_latch_chip, gc);
+}
+
+static void gpio_latch_lock(struct gpio_latch_chip *glc, bool enable)
+{
+       mutex_lock(&glc->mutex);
+
+       if (enable)
+               glc->latch_enabled = true;
+
+       if (glc->latch_enabled)
+               mutex_lock(&glc->latch_mutex);
+}
+
+static void gpio_latch_unlock(struct gpio_latch_chip *glc, bool disable)
+{
+       if (glc->latch_enabled)
+               mutex_unlock(&glc->latch_mutex);
+
+       if (disable)
+               glc->latch_enabled = true;
+
+       mutex_unlock(&glc->mutex);
+}
+
+static int
+gpio_latch_get(struct gpio_chip *gc, unsigned offset)
+{
+       struct gpio_latch_chip *glc = to_gpio_latch_chip(gc);
+       int ret;
+
+       gpio_latch_lock(glc, false);
+       ret = gpiod_get_raw_value_cansleep(glc->gpios[offset]);
+       gpio_latch_unlock(glc, false);
+
+       return ret;
+}
+
+static void
+gpio_latch_set(struct gpio_chip *gc, unsigned offset, int value)
+{
+       struct gpio_latch_chip *glc = to_gpio_latch_chip(gc);
+       bool enable_latch = false;
+       bool disable_latch = false;
+
+       if (offset == glc->le_gpio) {
+               enable_latch = value ^ glc->le_active_low;
+               disable_latch = !enable_latch;
+       }
+
+       gpio_latch_lock(glc, enable_latch);
+       gpiod_set_raw_value_cansleep(glc->gpios[offset], value);
+       gpio_latch_unlock(glc, disable_latch);
+}
+
+static int
+gpio_latch_direction_output(struct gpio_chip *gc, unsigned offset, int value)
+{
+       struct gpio_latch_chip *glc = to_gpio_latch_chip(gc);
+       bool enable_latch = false;
+       bool disable_latch = false;
+       int ret;
+
+       if (offset == glc->le_gpio) {
+               enable_latch = value ^ glc->le_active_low;
+               disable_latch = !enable_latch;
+       }
+
+       gpio_latch_lock(glc, enable_latch);
+       ret = gpiod_direction_output_raw(glc->gpios[offset], value);
+       gpio_latch_unlock(glc, disable_latch);
+
+       return ret;
+}
+
+static int gpio_latch_probe(struct platform_device *pdev)
+{
+       struct gpio_latch_chip *glc;
+       struct gpio_chip *gc;
+       struct device *dev = &pdev->dev;
+       struct fwnode_handle *fwnode = dev->fwnode;
+       int i, n;
+
+       glc = devm_kzalloc(dev, sizeof(*glc), GFP_KERNEL);
+       if (!glc)
+               return -ENOMEM;
+
+       mutex_init(&glc->mutex);
+       mutex_init(&glc->latch_mutex);
+
+       n = gpiod_count(dev, NULL);
+       if (n <= 0) {
+               dev_err(dev, "failed to get gpios: %d\n", n);
+               return n;
+       } else if (n != GPIO_LATCH_LINES) {
+               dev_err(dev, "expected %d gpios\n", GPIO_LATCH_LINES);
+               return -EINVAL;
+       }
+
+       for (i = 0; i < n; i++) {
+               glc->gpios[i] = devm_gpiod_get_index_optional(dev, NULL, i,
+                       GPIOD_OUT_LOW);
+               if (IS_ERR(glc->gpios[i])) {
+                       if (PTR_ERR(glc->gpios[i]) != -EPROBE_DEFER) {
+                               dev_err(dev, "failed to get gpio %d: %ld\n", i,
+                                       PTR_ERR(glc->gpios[i]));
+                       }
+                       return PTR_ERR(glc->gpios[i]);
+               }
+       }
+
+       glc->le_gpio = 8;
+       glc->le_active_low = gpiod_is_active_low(glc->gpios[glc->le_gpio]);
+
+       if (!glc->gpios[glc->le_gpio]) {
+               dev_err(dev, "missing required latch-enable gpio %d\n",
+                       glc->le_gpio);
+               return -EINVAL;
+       }
+
+       gc = &glc->gc;
+       gc->label = GPIO_LATCH_DRIVER_NAME;
+       gc->can_sleep = true;
+       gc->base = -1;
+       gc->ngpio = GPIO_LATCH_LINES;
+       gc->get = gpio_latch_get;
+       gc->set = gpio_latch_set;
+       gc->direction_output = gpio_latch_direction_output;
+       gc->fwnode = fwnode;
+
+       platform_set_drvdata(pdev, glc);
+
+       i = gpiochip_add(&glc->gc);
+       if (i) {
+               dev_err(dev, "gpiochip_add() failed: %d\n", i);
+               return i;
+       }
+
+       return 0;
+}
+
+static int gpio_latch_remove(struct platform_device *pdev)
+{
+       struct gpio_latch_chip *glc = platform_get_drvdata(pdev);
+
+       gpiochip_remove(&glc->gc);
+       return 0;
+}
+
+static const struct of_device_id gpio_latch_match[] = {
+       { .compatible = GPIO_LATCH_DRIVER_NAME },
+       {},
+};
+
+MODULE_DEVICE_TABLE(of, gpio_latch_match);
+
+static struct platform_driver gpio_latch_driver = {
+       .probe = gpio_latch_probe,
+       .remove = gpio_latch_remove,
+       .driver = {
+               .name = GPIO_LATCH_DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = gpio_latch_match,
+       },
+};
+
+module_platform_driver(gpio_latch_driver);
+
+MODULE_DESCRIPTION("GPIO latch driver");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Denis Kalashnikov <denis281089@gmail.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" GPIO_LATCH_DRIVER_NAME);
diff --git a/target/linux/ath79/files/drivers/gpio/gpio-latch.c b/target/linux/ath79/files/drivers/gpio/gpio-latch.c
deleted file mode 100644 (file)
index 5518184..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- *  GPIO latch driver
- *
- *  Copyright (C) 2014 Gabor Juhos <juhosg@openwrt.org>
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/gpio/consumer.h>
-#include <linux/gpio/driver.h>
-#include <linux/platform_device.h>
-#include <linux/of_platform.h>
-#include <linux/of_gpio.h>
-
-#define GPIO_LATCH_DRIVER_NAME  "gpio-latch"
-#define GPIO_LATCH_LINES 9
-
-struct gpio_latch_chip {
-       struct gpio_chip gc;
-       struct mutex mutex;
-       struct mutex latch_mutex;
-       bool latch_enabled;
-       int le_gpio;
-       bool le_active_low;
-       struct gpio_desc *gpios[GPIO_LATCH_LINES];
-};
-
-static inline struct gpio_latch_chip *to_gpio_latch_chip(struct gpio_chip *gc)
-{
-       return container_of(gc, struct gpio_latch_chip, gc);
-}
-
-static void gpio_latch_lock(struct gpio_latch_chip *glc, bool enable)
-{
-       mutex_lock(&glc->mutex);
-
-       if (enable)
-               glc->latch_enabled = true;
-
-       if (glc->latch_enabled)
-               mutex_lock(&glc->latch_mutex);
-}
-
-static void gpio_latch_unlock(struct gpio_latch_chip *glc, bool disable)
-{
-       if (glc->latch_enabled)
-               mutex_unlock(&glc->latch_mutex);
-
-       if (disable)
-               glc->latch_enabled = true;
-
-       mutex_unlock(&glc->mutex);
-}
-
-static int
-gpio_latch_get(struct gpio_chip *gc, unsigned offset)
-{
-       struct gpio_latch_chip *glc = to_gpio_latch_chip(gc);
-       int ret;
-
-       gpio_latch_lock(glc, false);
-       ret = gpiod_get_raw_value_cansleep(glc->gpios[offset]);
-       gpio_latch_unlock(glc, false);
-
-       return ret;
-}
-
-static void
-gpio_latch_set(struct gpio_chip *gc, unsigned offset, int value)
-{
-       struct gpio_latch_chip *glc = to_gpio_latch_chip(gc);
-       bool enable_latch = false;
-       bool disable_latch = false;
-
-       if (offset == glc->le_gpio) {
-               enable_latch = value ^ glc->le_active_low;
-               disable_latch = !enable_latch;
-       }
-
-       gpio_latch_lock(glc, enable_latch);
-       gpiod_set_raw_value_cansleep(glc->gpios[offset], value);
-       gpio_latch_unlock(glc, disable_latch);
-}
-
-static int
-gpio_latch_direction_output(struct gpio_chip *gc, unsigned offset, int value)
-{
-       struct gpio_latch_chip *glc = to_gpio_latch_chip(gc);
-       bool enable_latch = false;
-       bool disable_latch = false;
-       int ret;
-
-       if (offset == glc->le_gpio) {
-               enable_latch = value ^ glc->le_active_low;
-               disable_latch = !enable_latch;
-       }
-
-       gpio_latch_lock(glc, enable_latch);
-       ret = gpiod_direction_output_raw(glc->gpios[offset], value);
-       gpio_latch_unlock(glc, disable_latch);
-
-       return ret;
-}
-
-static int gpio_latch_probe(struct platform_device *pdev)
-{
-       struct gpio_latch_chip *glc;
-       struct gpio_chip *gc;
-       struct device *dev = &pdev->dev;
-       struct fwnode_handle *fwnode = dev->fwnode;
-       int i, n;
-
-       glc = devm_kzalloc(dev, sizeof(*glc), GFP_KERNEL);
-       if (!glc)
-               return -ENOMEM;
-
-       mutex_init(&glc->mutex);
-       mutex_init(&glc->latch_mutex);
-
-       n = gpiod_count(dev, NULL);
-       if (n <= 0) {
-               dev_err(dev, "failed to get gpios: %d\n", n);
-               return n;
-       } else if (n != GPIO_LATCH_LINES) {
-               dev_err(dev, "expected %d gpios\n", GPIO_LATCH_LINES);
-               return -EINVAL;
-       }
-
-       for (i = 0; i < n; i++) {
-               glc->gpios[i] = devm_gpiod_get_index_optional(dev, NULL, i,
-                       GPIOD_OUT_LOW);
-               if (IS_ERR(glc->gpios[i])) {
-                       if (PTR_ERR(glc->gpios[i]) != -EPROBE_DEFER) {
-                               dev_err(dev, "failed to get gpio %d: %ld\n", i,
-                                       PTR_ERR(glc->gpios[i]));
-                       }
-                       return PTR_ERR(glc->gpios[i]);
-               }
-       }
-
-       glc->le_gpio = 8;
-       glc->le_active_low = gpiod_is_active_low(glc->gpios[glc->le_gpio]);
-
-       if (!glc->gpios[glc->le_gpio]) {
-               dev_err(dev, "missing required latch-enable gpio %d\n",
-                       glc->le_gpio);
-               return -EINVAL;
-       }
-
-       gc = &glc->gc;
-       gc->label = GPIO_LATCH_DRIVER_NAME;
-       gc->can_sleep = true;
-       gc->base = -1;
-       gc->ngpio = GPIO_LATCH_LINES;
-       gc->get = gpio_latch_get;
-       gc->set = gpio_latch_set;
-       gc->direction_output = gpio_latch_direction_output;
-       gc->fwnode = fwnode;
-
-       platform_set_drvdata(pdev, glc);
-
-       i = gpiochip_add(&glc->gc);
-       if (i) {
-               dev_err(dev, "gpiochip_add() failed: %d\n", i);
-               return i;
-       }
-
-       return 0;
-}
-
-static int gpio_latch_remove(struct platform_device *pdev)
-{
-       struct gpio_latch_chip *glc = platform_get_drvdata(pdev);
-
-       gpiochip_remove(&glc->gc);
-       return 0;
-}
-
-static const struct of_device_id gpio_latch_match[] = {
-       { .compatible = GPIO_LATCH_DRIVER_NAME },
-       {},
-};
-
-MODULE_DEVICE_TABLE(of, gpio_latch_match);
-
-static struct platform_driver gpio_latch_driver = {
-       .probe = gpio_latch_probe,
-       .remove = gpio_latch_remove,
-       .driver = {
-               .name = GPIO_LATCH_DRIVER_NAME,
-               .owner = THIS_MODULE,
-               .of_match_table = gpio_latch_match,
-       },
-};
-
-module_platform_driver(gpio_latch_driver);
-
-MODULE_DESCRIPTION("GPIO latch driver");
-MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
-MODULE_AUTHOR("Denis Kalashnikov <denis281089@gmail.com>");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:" GPIO_LATCH_DRIVER_NAME);
index a231188c835025784057d31ac3d7c4a1f57a0db0..3fe5cd49799e61c29a377359683f6ed0d74aab9e 100644 (file)
@@ -3,7 +3,7 @@ CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_ZSTD=y
-CONFIG_GPIO_LATCH=y
+CONFIG_GPIO_LATCH_MIKROTIK=y
 CONFIG_GPIO_RB4XX=y
 CONFIG_GPIO_RB91X_KEY=y
 CONFIG_GPIO_WATCHDOG=y
index 768ab6fb49ad8c41753232ddd52a74e2a58e7eec..677428fa65c1e8c0ac6a5c4da1a5b965f6a8c44c 100644 (file)
@@ -33,7 +33,7 @@ Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  
          If unsure, say N.
  
-+config GPIO_LATCH
++config GPIO_LATCH_MIKROTIK
 +      tristate "MikroTik RouterBOARD GPIO latch support"
 +      depends on ATH79
 +      help
@@ -59,7 +59,7 @@ Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  obj-$(CONFIG_GPIO_IXP4XX)             += gpio-ixp4xx.o
  obj-$(CONFIG_GPIO_JANZ_TTL)           += gpio-janz-ttl.o
  obj-$(CONFIG_GPIO_KEMPLD)             += gpio-kempld.o
-+obj-$(CONFIG_GPIO_LATCH)              += gpio-latch.o
++obj-$(CONFIG_GPIO_LATCH_MIKROTIK)     += gpio-latch-mikrotik.o
  obj-$(CONFIG_GPIO_LOGICVC)            += gpio-logicvc.o
  obj-$(CONFIG_GPIO_LOONGSON1)          += gpio-loongson1.o
  obj-$(CONFIG_GPIO_LOONGSON)           += gpio-loongson.o