reset: gpio: convert the driver to using the auxiliary bus

As the reset-gpio devices are purely virtual and never instantiated from
real firmware nodes, let's convert the driver to using the - more
fitting - auxiliary bus.

Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 78b7078478d46d484ce031f527a933c81a838b1d..30659115de55255ffb32da537b18bb96d6ecb1d0 100644 (file)
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -89,6 +89,7 @@ config RESET_EYEQ
 config RESET_GPIO
        tristate "GPIO reset controller"
        depends on GPIOLIB
+       select AUXILIARY_BUS
        help
          This enables a generic reset controller for resets attached via
          GPIOs.  Typically for OF platforms this driver expects "reset-gpios"

diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 13236ab69f10ec80e19b982be2bee5e4b0f99388..e129c4c803eaa7e7e7122d96e9eff187f8dd826f 100644 (file)
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -7,6 +7,7 @@
 
 #include <linux/acpi.h>
 #include <linux/atomic.h>
+#include <linux/auxiliary_bus.h>
 #include <linux/cleanup.h>
 #include <linux/device.h>
 #include <linux/err.h>
@@ -18,7 +19,6 @@
 #include <linux/kref.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/platform_device.h>
 #include <linux/reset.h>
 #include <linux/reset-controller.h>
 #include <linux/slab.h>
@@ -882,7 +882,7 @@ static int __reset_add_reset_gpio_lookup(struct gpio_device *gdev, int id,
        if (!lookup)
                return -ENOMEM;
 
-       lookup->dev_id = kasprintf(GFP_KERNEL, "reset-gpio.%d", id);
+       lookup->dev_id = kasprintf(GFP_KERNEL, "reset.gpio.%d", id);
        if (!lookup->dev_id)
                return -ENOMEM;
 
@@ -903,7 +903,7 @@ static int __reset_add_reset_gpio_lookup(struct gpio_device *gdev, int id,
 static int __reset_add_reset_gpio_device(const struct of_phandle_args *args)
 {
        struct reset_gpio_lookup *rgpio_dev;
-       struct platform_device *pdev;
+       struct auxiliary_device *adev;
        int id, ret;
 
        /*
@@ -959,11 +959,9 @@ static int __reset_add_reset_gpio_device(const struct of_phandle_args *args)
         * Hold reference as long as rgpio_dev memory is valid.
         */
        of_node_get(rgpio_dev->of_args.np);
-       pdev = platform_device_register_data(gpio_device_to_device(gdev),
-                                            "reset-gpio", id,
-                                            &rgpio_dev->of_args,
-                                            sizeof(rgpio_dev->of_args));
-       ret = PTR_ERR_OR_ZERO(pdev);
+       adev = auxiliary_device_create(gpio_device_to_device(gdev), "reset",
+                                      "gpio", &rgpio_dev->of_args, id);
+       ret = PTR_ERR_OR_ZERO(adev);
        if (ret)
                goto err_put;
 

diff --git a/drivers/reset/reset-gpio.c b/drivers/reset/reset-gpio.c
index 2290b25b6703536f2245f15cab870bd7092d3453..e5512b3b596b5290af20e5fdd99a38f81e670d2b 100644 (file)
--- a/drivers/reset/reset-gpio.c
+++ b/drivers/reset/reset-gpio.c
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0
 
+#include <linux/auxiliary_bus.h>
 #include <linux/gpio/consumer.h>
 #include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/platform_device.h>
 #include <linux/reset-controller.h>
 
 struct reset_gpio_priv {
@@ -61,9 +61,10 @@ static void reset_gpio_of_node_put(void *data)
        of_node_put(data);
 }
 
-static int reset_gpio_probe(struct platform_device *pdev)
+static int reset_gpio_probe(struct auxiliary_device *adev,
+                           const struct auxiliary_device_id *id)
 {
-       struct device *dev = &pdev->dev;
+       struct device *dev = &adev->dev;
        struct of_phandle_args *platdata = dev_get_platdata(dev);
        struct reset_gpio_priv *priv;
        int ret;
@@ -75,7 +76,7 @@ static int reset_gpio_probe(struct platform_device *pdev)
        if (!priv)
                return -ENOMEM;
 
-       platform_set_drvdata(pdev, &priv->rc);
+       auxiliary_set_drvdata(adev, &priv->rc);
 
        priv->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
        if (IS_ERR(priv->reset))
@@ -99,20 +100,20 @@ static int reset_gpio_probe(struct platform_device *pdev)
        return devm_reset_controller_register(dev, &priv->rc);
 }
 
-static const struct platform_device_id reset_gpio_ids[] = {
-       { .name = "reset-gpio", },
+static const struct auxiliary_device_id reset_gpio_ids[] = {
+       { .name = "reset.gpio" },
        {}
 };
-MODULE_DEVICE_TABLE(platform, reset_gpio_ids);
+MODULE_DEVICE_TABLE(auxiliary, reset_gpio_ids);
 
-static struct platform_driver reset_gpio_driver = {
+static struct auxiliary_driver reset_gpio_driver = {
        .probe          = reset_gpio_probe,
        .id_table       = reset_gpio_ids,
        .driver = {
                .name = "reset-gpio",
        },
 };
-module_platform_driver(reset_gpio_driver);
+module_auxiliary_driver(reset_gpio_driver);
 
 MODULE_AUTHOR("Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>");
 MODULE_DESCRIPTION("Generic GPIO reset driver");