[PATCH v3] watchdog: mtx-1: Convert to use GPIO descriptor

[PATCH v3] watchdog: mtx-1: Convert to use GPIO descriptor

[Linus Walleij]

This converts the MTX-1 driver to grab a GPIO descriptor
associated with the device instead of using a resource with
a global GPIO number.

The board using this driver appears to be out-of-tree
(OpenWRT), but the users can be easily augmented by adding a
machine descriptor table before registering the device.

Cc: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- Fix to acces .gpiod rather than .gpio
- Drop resource assignment in boardfile: no resources left
  to pass.
ChangeLog v1->v2:
- Add the correct descriptor table to the board file and
  register it. I missed the existing board file in the
  previous iteration.
---
 arch/mips/alchemy/board-mtx1.c | 18 +++++++++---------
 drivers/watchdog/mtx-1_wdt.c   | 19 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/arch/mips/alchemy/board-mtx1.c b/arch/mips/alchemy/board-mtx1.c
index d625e6f99ae7..9d9d4ee31605 100644
--- a/arch/mips/alchemy/board-mtx1.c
+++ b/arch/mips/alchemy/board-mtx1.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/gpio.h>
+#include <linux/gpio/machine.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/mtd/partitions.h>
@@ -130,20 +131,18 @@ static struct platform_device mtx1_button = {
 	}
 };
 
-static struct resource mtx1_wdt_res[] = {
-	[0] = {
-		.start	= 215,
-		.end	= 215,
-		.name	= "mtx1-wdt-gpio",
-		.flags	= IORESOURCE_IRQ,
-	}
+static struct gpiod_lookup_table mtx1_wdt_gpio_table = {
+	.dev_id = "mtx1-wdt.0",
+	.table = {
+		/* Global number 215 is offset 15 on Alchemy GPIO 2 */
+		GPIO_LOOKUP("alchemy-gpio2", 15, NULL, GPIO_ACTIVE_HIGH),
+		{ },
+	},
 };
 
 static struct platform_device mtx1_wdt = {
 	.name = "mtx1-wdt",
 	.id = 0,
-	.num_resources = ARRAY_SIZE(mtx1_wdt_res),
-	.resource = mtx1_wdt_res,
 };
 
 static const struct gpio_led default_leds[] = {
@@ -310,6 +309,7 @@ static int __init mtx1_register_devices(void)
 	}
 	gpio_direction_input(mtx1_gpio_button[0].gpio);
 out:
+	gpiod_add_lookup_table(&mtx1_wdt_gpio_table);
 	return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs));
 }
 arch_initcall(mtx1_register_devices);
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 1fa7d2b32494..e028e0a2eca0 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -39,7 +39,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 
 #include <asm/mach-au1x00/au1000.h>
 
@@ -55,7 +55,7 @@ static struct {
 	int queue;
 	int default_ticks;
 	unsigned long inuse;
-	unsigned gpio;
+	struct gpio_desc *gpiod;
 	unsigned int gstate;
 } mtx1_wdt_device;
 
@@ -67,7 +67,7 @@ static void mtx1_wdt_trigger(struct timer_list *unused)
 
 	/* toggle wdt gpio */
 	mtx1_wdt_device.gstate = !mtx1_wdt_device.gstate;
-	gpio_set_value(mtx1_wdt_device.gpio, mtx1_wdt_device.gstate);
+	gpiod_set_value(mtx1_wdt_device.gpiod, mtx1_wdt_device.gstate);
 
 	if (mtx1_wdt_device.queue && ticks)
 		mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL);
@@ -90,7 +90,7 @@ static void mtx1_wdt_start(void)
 	if (!mtx1_wdt_device.queue) {
 		mtx1_wdt_device.queue = 1;
 		mtx1_wdt_device.gstate = 1;
-		gpio_set_value(mtx1_wdt_device.gpio, 1);
+		gpiod_set_value(mtx1_wdt_device.gpiod, 1);
 		mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL);
 	}
 	mtx1_wdt_device.running++;
@@ -105,7 +105,7 @@ static int mtx1_wdt_stop(void)
 	if (mtx1_wdt_device.queue) {
 		mtx1_wdt_device.queue = 0;
 		mtx1_wdt_device.gstate = 0;
-		gpio_set_value(mtx1_wdt_device.gpio, 0);
+		gpiod_set_value(mtx1_wdt_device.gpiod, 0);
 	}
 	ticks = mtx1_wdt_device.default_ticks;
 	spin_unlock_irqrestore(&mtx1_wdt_device.lock, flags);
@@ -198,12 +198,11 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
 {
 	int ret;
 
-	mtx1_wdt_device.gpio = pdev->resource[0].start;
-	ret = devm_gpio_request_one(&pdev->dev, mtx1_wdt_device.gpio,
-				GPIOF_OUT_INIT_HIGH, "mtx1-wdt");
-	if (ret < 0) {
+	mtx1_wdt_device.gpiod = devm_gpiod_get(&pdev->dev,
+					       NULL, GPIOD_OUT_HIGH);
+	if (IS_ERR(mtx1_wdt_device.gpiod)) {
 		dev_err(&pdev->dev, "failed to request gpio");
-		return ret;
+		return PTR_ERR(mtx1_wdt_device.gpiod);
 	}
 
 	spin_lock_init(&mtx1_wdt_device.lock);
-- 
2.19.2

Re: [v3] watchdog: mtx-1: Convert to use GPIO descriptor

[Guenter Roeck]

On Tue, Dec 11, 2018 at 01:04:12PM +0100, Linus Walleij wrote:
> This converts the MTX-1 driver to grab a GPIO descriptor
> associated with the device instead of using a resource with
> a global GPIO number.
> 
> The board using this driver appears to be out-of-tree
> (OpenWRT), but the users can be easily augmented by adding a
> machine descriptor table before registering the device.
> 
Is that still accurate, given the discussion and mips specific changes ?

> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

We'll need an Acked-by: from a mips maintainer to land this.

Guenter

> ---
> ChangeLog v2->v3:
> - Fix to acces .gpiod rather than .gpio
> - Drop resource assignment in boardfile: no resources left
>   to pass.
> ChangeLog v1->v2:
> - Add the correct descriptor table to the board file and
>   register it. I missed the existing board file in the
>   previous iteration.
> ---
>  arch/mips/alchemy/board-mtx1.c | 18 +++++++++---------
>  drivers/watchdog/mtx-1_wdt.c   | 19 +++++++++----------
>  2 files changed, 18 insertions(+), 19 deletions(-)
> 
> diff --git a/arch/mips/alchemy/board-mtx1.c b/arch/mips/alchemy/board-mtx1.c
> index d625e6f99ae7..9d9d4ee31605 100644
> --- a/arch/mips/alchemy/board-mtx1.c
> +++ b/arch/mips/alchemy/board-mtx1.c
> @@ -24,6 +24,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/leds.h>
>  #include <linux/gpio.h>
> +#include <linux/gpio/machine.h>
>  #include <linux/gpio_keys.h>
>  #include <linux/input.h>
>  #include <linux/mtd/partitions.h>
> @@ -130,20 +131,18 @@ static struct platform_device mtx1_button = {
>  	}
>  };
>  
> -static struct resource mtx1_wdt_res[] = {
> -	[0] = {
> -		.start	= 215,
> -		.end	= 215,
> -		.name	= "mtx1-wdt-gpio",
> -		.flags	= IORESOURCE_IRQ,
> -	}
> +static struct gpiod_lookup_table mtx1_wdt_gpio_table = {
> +	.dev_id = "mtx1-wdt.0",
> +	.table = {
> +		/* Global number 215 is offset 15 on Alchemy GPIO 2 */
> +		GPIO_LOOKUP("alchemy-gpio2", 15, NULL, GPIO_ACTIVE_HIGH),
> +		{ },
> +	},
>  };
>  
>  static struct platform_device mtx1_wdt = {
>  	.name = "mtx1-wdt",
>  	.id = 0,
> -	.num_resources = ARRAY_SIZE(mtx1_wdt_res),
> -	.resource = mtx1_wdt_res,
>  };
>  
>  static const struct gpio_led default_leds[] = {
> @@ -310,6 +309,7 @@ static int __init mtx1_register_devices(void)
>  	}
>  	gpio_direction_input(mtx1_gpio_button[0].gpio);
>  out:
> +	gpiod_add_lookup_table(&mtx1_wdt_gpio_table);
>  	return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs));
>  }
>  arch_initcall(mtx1_register_devices);
> diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
> index 1fa7d2b32494..e028e0a2eca0 100644
> --- a/drivers/watchdog/mtx-1_wdt.c
> +++ b/drivers/watchdog/mtx-1_wdt.c
> @@ -39,7 +39,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/io.h>
>  #include <linux/uaccess.h>
> -#include <linux/gpio.h>
> +#include <linux/gpio/consumer.h>
>  
>  #include <asm/mach-au1x00/au1000.h>
>  
> @@ -55,7 +55,7 @@ static struct {
>  	int queue;
>  	int default_ticks;
>  	unsigned long inuse;
> -	unsigned gpio;
> +	struct gpio_desc *gpiod;
>  	unsigned int gstate;
>  } mtx1_wdt_device;
>  
> @@ -67,7 +67,7 @@ static void mtx1_wdt_trigger(struct timer_list *unused)
>  
>  	/* toggle wdt gpio */
>  	mtx1_wdt_device.gstate = !mtx1_wdt_device.gstate;
> -	gpio_set_value(mtx1_wdt_device.gpio, mtx1_wdt_device.gstate);
> +	gpiod_set_value(mtx1_wdt_device.gpiod, mtx1_wdt_device.gstate);
>  
>  	if (mtx1_wdt_device.queue && ticks)
>  		mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL);
> @@ -90,7 +90,7 @@ static void mtx1_wdt_start(void)
>  	if (!mtx1_wdt_device.queue) {
>  		mtx1_wdt_device.queue = 1;
>  		mtx1_wdt_device.gstate = 1;
> -		gpio_set_value(mtx1_wdt_device.gpio, 1);
> +		gpiod_set_value(mtx1_wdt_device.gpiod, 1);
>  		mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL);
>  	}
>  	mtx1_wdt_device.running++;
> @@ -105,7 +105,7 @@ static int mtx1_wdt_stop(void)
>  	if (mtx1_wdt_device.queue) {
>  		mtx1_wdt_device.queue = 0;
>  		mtx1_wdt_device.gstate = 0;
> -		gpio_set_value(mtx1_wdt_device.gpio, 0);
> +		gpiod_set_value(mtx1_wdt_device.gpiod, 0);
>  	}
>  	ticks = mtx1_wdt_device.default_ticks;
>  	spin_unlock_irqrestore(&mtx1_wdt_device.lock, flags);
> @@ -198,12 +198,11 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
>  {
>  	int ret;
>  
> -	mtx1_wdt_device.gpio = pdev->resource[0].start;
> -	ret = devm_gpio_request_one(&pdev->dev, mtx1_wdt_device.gpio,
> -				GPIOF_OUT_INIT_HIGH, "mtx1-wdt");
> -	if (ret < 0) {
> +	mtx1_wdt_device.gpiod = devm_gpiod_get(&pdev->dev,
> +					       NULL, GPIOD_OUT_HIGH);
> +	if (IS_ERR(mtx1_wdt_device.gpiod)) {
>  		dev_err(&pdev->dev, "failed to request gpio");
> -		return ret;
> +		return PTR_ERR(mtx1_wdt_device.gpiod);
>  	}
>  
>  	spin_lock_init(&mtx1_wdt_device.lock);

Re: [PATCH v3] watchdog: mtx-1: Convert to use GPIO descriptor

[Florian Fainelli]

Le 12/11/18 à 4:04 AM, Linus Walleij a écrit :
> This converts the MTX-1 driver to grab a GPIO descriptor
> associated with the device instead of using a resource with
> a global GPIO number.
> 
> The board using this driver appears to be out-of-tree
> (OpenWRT), but the users can be easily augmented by adding a
> machine descriptor table before registering the device.
> 
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [v3] watchdog: mtx-1: Convert to use GPIO descriptor

[Linus Walleij]

On Sat, Dec 15, 2018 at 5:31 PM Guenter Roeck <linux@roeck-us.net> wrote:
> On Tue, Dec 11, 2018 at 01:04:12PM +0100, Linus Walleij wrote:

> > This converts the MTX-1 driver to grab a GPIO descriptor
> > associated with the device instead of using a resource with
> > a global GPIO number.
> >
> > The board using this driver appears to be out-of-tree
> > (OpenWRT), but the users can be easily augmented by adding a
> > machine descriptor table before registering the device.
> >
> Is that still accurate, given the discussion and mips specific changes ?
>
> > Cc: Florian Fainelli <f.fainelli@gmail.com>
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>
> We'll need an Acked-by: from a mips maintainer to land this.

Florian is a MIPS (subarch) maintainer, tell me if you want
to resend this with the collected reviewed-by and also
include the toplevel MIPS maintainers.

Yours,
Linus Walleij

Re: [v3] watchdog: mtx-1: Convert to use GPIO descriptor

[Guenter Roeck]

On 12/21/18 2:22 AM, Linus Walleij wrote:
> On Sat, Dec 15, 2018 at 5:31 PM Guenter Roeck <linux@roeck-us.net> wrote:
>> On Tue, Dec 11, 2018 at 01:04:12PM +0100, Linus Walleij wrote:
> 
>>> This converts the MTX-1 driver to grab a GPIO descriptor
>>> associated with the device instead of using a resource with
>>> a global GPIO number.
>>>
>>> The board using this driver appears to be out-of-tree
>>> (OpenWRT), but the users can be easily augmented by adding a
>>> machine descriptor table before registering the device.
>>>
>> Is that still accurate, given the discussion and mips specific changes ?
>>
>>> Cc: Florian Fainelli <f.fainelli@gmail.com>
>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>>
>> We'll need an Acked-by: from a mips maintainer to land this.
> 
> Florian is a MIPS (subarch) maintainer, tell me if you want
> to resend this with the collected reviewed-by and also
> include the toplevel MIPS maintainers.
> 
Should be ok on that side then. What about my question above ?

Guenter

Re: [v3] watchdog: mtx-1: Convert to use GPIO descriptor

[Linus Walleij]

On Sat, Dec 22, 2018 at 12:24 AM Guenter Roeck <linux@roeck-us.net> wrote:
> On 12/21/18 2:22 AM, Linus Walleij wrote:
> > On Sat, Dec 15, 2018 at 5:31 PM Guenter Roeck <linux@roeck-us.net> wrote:
> >> On Tue, Dec 11, 2018 at 01:04:12PM +0100, Linus Walleij wrote:
> >
> >>> This converts the MTX-1 driver to grab a GPIO descriptor
> >>> associated with the device instead of using a resource with
> >>> a global GPIO number.
> >>>
> >>> The board using this driver appears to be out-of-tree
> >>> (OpenWRT), but the users can be easily augmented by adding a
> >>> machine descriptor table before registering the device.
> >>>
> >> Is that still accurate, given the discussion and mips specific changes ?
> >>
> >>> Cc: Florian Fainelli <f.fainelli@gmail.com>
> >>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> >>
> >> We'll need an Acked-by: from a mips maintainer to land this.
> >
> > Florian is a MIPS (subarch) maintainer, tell me if you want
> > to resend this with the collected reviewed-by and also
> > include the toplevel MIPS maintainers.
> >
> Should be ok on that side then. What about my question above ?

Ah right, I will fix it up and resend with the ACKs.

Yours,
Linus Walleij