powerpc/sgy_cts1000: convert to using gpiod API and facelift

This patch converts the driver to newer gpiod API, and away from
OF-specific legacy gpio API that we want to stop using.

While at it, let's address a few more issues:

- switch to using dev_info()/pr_info() and friends
- cancel work when unbinding the driver

Note that the original code handled halt GPIO polarity incorrectly:
in halt callback, when line polarity is "low" it would set trigger to
"1" and drive halt line high, which is counter to the annotation.
gpiod API will drive such line low. However I do not see any DTSes
in mainline that have a DT node with "sgy,gpio-halt" compatible.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/YzNNznewTyCJiGFz@google.com

diff --git a/arch/powerpc/platforms/85xx/sgy_cts1000.c b/arch/powerpc/platforms/85xx/sgy_cts1000.c
index e14d1b74d4e4c5b2864447e2f32df255b5cc47b7..751395cbf022270f27f77c24e2bec403878ac379 100644 (file)
--- a/arch/powerpc/platforms/85xx/sgy_cts1000.c
+++ b/arch/powerpc/platforms/85xx/sgy_cts1000.c
@@ -7,10 +7,13 @@
  * Copyright 2012 by Servergy, Inc.
  */
 
+#define pr_fmt(fmt) "gpio-halt: " fmt
+
+#include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/device.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
-#include <linux/of_gpio.h>
 #include <linux/of_irq.h>
 #include <linux/workqueue.h>
 #include <linux/reboot.h>
@@ -18,7 +21,8 @@
 
 #include <asm/machdep.h>
 
-static struct device_node *halt_node;
+static struct gpio_desc *halt_gpio;
+static int halt_irq;
 
 static const struct of_device_id child_match[] = {
        {
@@ -36,23 +40,10 @@ static DECLARE_WORK(gpio_halt_wq, gpio_halt_wfn);
 
 static void __noreturn gpio_halt_cb(void)
 {
-       enum of_gpio_flags flags;
-       int trigger, gpio;
-
-       if (!halt_node)
-               panic("No reset GPIO information was provided in DT\n");
-
-       gpio = of_get_gpio_flags(halt_node, 0, &flags);
-
-       if (!gpio_is_valid(gpio))
-               panic("Provided GPIO is invalid\n");
-
-       trigger = (flags == OF_GPIO_ACTIVE_LOW);
-
-       printk(KERN_INFO "gpio-halt: triggering GPIO.\n");
+       pr_info("triggering GPIO.\n");
 
        /* Probably wont return */
-       gpio_set_value(gpio, trigger);
+       gpiod_set_value(halt_gpio, 1);
 
        panic("Halt failed\n");
 }
@@ -61,95 +52,78 @@ static void __noreturn gpio_halt_cb(void)
  * to handle the shutdown/poweroff. */
 static irqreturn_t gpio_halt_irq(int irq, void *__data)
 {
-       printk(KERN_INFO "gpio-halt: shutdown due to power button IRQ.\n");
+       struct platform_device *pdev = __data;
+
+       dev_info(&pdev->dev, "scheduling shutdown due to power button IRQ\n");
        schedule_work(&gpio_halt_wq);
 
         return IRQ_HANDLED;
 };
 
-static int gpio_halt_probe(struct platform_device *pdev)
+static int __gpio_halt_probe(struct platform_device *pdev,
+                            struct device_node *halt_node)
 {
-       enum of_gpio_flags flags;
-       struct device_node *node = pdev->dev.of_node;
-       struct device_node *child_node;
-       int gpio, err, irq;
-       int trigger;
-
-       if (!node)
-               return -ENODEV;
-
-       /* If there's no matching child, this isn't really an error */
-       child_node = of_find_matching_node(node, child_match);
-       if (!child_node)
-               return 0;
-
-       /* Technically we could just read the first one, but punish
-        * DT writers for invalid form. */
-       if (of_gpio_count(child_node) != 1) {
-               err = -EINVAL;
-               goto err_put;
-       }
-
-       /* Get the gpio number relative to the dynamic base. */
-       gpio = of_get_gpio_flags(child_node, 0, &flags);
-       if (!gpio_is_valid(gpio)) {
-               err = -EINVAL;
-               goto err_put;
-       }
+       int err;
 
-       err = gpio_request(gpio, "gpio-halt");
+       halt_gpio = fwnode_gpiod_get_index(of_fwnode_handle(halt_node),
+                                          NULL, 0, GPIOD_OUT_LOW, "gpio-halt");
+       err = PTR_ERR_OR_ZERO(halt_gpio);
        if (err) {
-               printk(KERN_ERR "gpio-halt: error requesting GPIO %d.\n",
-                      gpio);
-               goto err_put;
+               dev_err(&pdev->dev, "failed to request halt GPIO: %d\n", err);
+               return err;
        }
 
-       trigger = (flags == OF_GPIO_ACTIVE_LOW);
-
-       gpio_direction_output(gpio, !trigger);
-
        /* Now get the IRQ which tells us when the power button is hit */
-       irq = irq_of_parse_and_map(child_node, 0);
-       err = request_irq(irq, gpio_halt_irq, IRQF_TRIGGER_RISING |
-                         IRQF_TRIGGER_FALLING, "gpio-halt", child_node);
+       halt_irq = irq_of_parse_and_map(halt_node, 0);
+       err = request_irq(halt_irq, gpio_halt_irq,
+                         IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+                         "gpio-halt", pdev);
        if (err) {
-               printk(KERN_ERR "gpio-halt: error requesting IRQ %d for "
-                      "GPIO %d.\n", irq, gpio);
-               gpio_free(gpio);
-               goto err_put;
+               dev_err(&pdev->dev, "failed to request IRQ %d: %d\n",
+                       halt_irq, err);
+               gpiod_put(halt_gpio);
+               halt_gpio = NULL;
+               return err;
        }
 
        /* Register our halt function */
        ppc_md.halt = gpio_halt_cb;
        pm_power_off = gpio_halt_cb;
 
-       printk(KERN_INFO "gpio-halt: registered GPIO %d (%d trigger, %d"
-              " irq).\n", gpio, trigger, irq);
+       dev_info(&pdev->dev, "registered halt GPIO, irq: %d\n", halt_irq);
 
-       halt_node = child_node;
        return 0;
-
-err_put:
-       of_node_put(child_node);
-       return err;
 }
 
-static int gpio_halt_remove(struct platform_device *pdev)
+static int gpio_halt_probe(struct platform_device *pdev)
 {
-       if (halt_node) {
-               int gpio = of_get_gpio(halt_node, 0);
-               int irq = irq_of_parse_and_map(halt_node, 0);
+       struct device_node *halt_node;
+       int ret;
+
+       if (!pdev->dev.of_node)
+               return -ENODEV;
+
+       /* If there's no matching child, this isn't really an error */
+       halt_node = of_find_matching_node(pdev->dev.of_node, child_match);
+       if (!halt_node)
+               return -ENODEV;
+
+       ret = __gpio_halt_probe(pdev, halt_node);
+       of_node_put(halt_node);
 
-               free_irq(irq, halt_node);
+       return ret;
+}
 
-               ppc_md.halt = NULL;
-               pm_power_off = NULL;
+static int gpio_halt_remove(struct platform_device *pdev)
+{
+       free_irq(halt_irq, pdev);
+       cancel_work_sync(&gpio_halt_wq);
 
-               gpio_free(gpio);
+       ppc_md.halt = NULL;
+       pm_power_off = NULL;
 
-               of_node_put(halt_node);
-               halt_node = NULL;
-       }
+       gpiod_put(halt_gpio);
+       halt_gpio = NULL;
 
        return 0;
 }