ARM: mvebu: switch to using gpiod API in pm-board code

PATCH In review Dmitry Torokhov 3 participants 6 messages Nov 15, 2022 – Nov 28, 2022

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support

lore

Share & tools

lore

Dmitry Torokhov

author

2022-11-15 23:13 UTC #0 lore raw

PATCH 1/1 ARM: mvebu: switch to using gpiod API in pm-board code

This switches PM code to use the newer gpiod API instead of legacy gpio API that we want to retire.

Signed-off-by Dmitry Torokhov <[email protected]>

---
 arch/arm/mach-mvebu/pm-board.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

arch/arm/mach-mvebu/pm-board.c +9 ~~-19~~

index 7fa1806acd65..beec22e17e89 100644
@@ -8,19 +8,19 @@
  */
 
 #include <linux/delay.h>
-#include <linux/gpio.h>
+#include <linux/err.h>
+#include <linux/gpio/consumer.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/of_gpio.h>
 #include <linux/slab.h>
 #include "common.h"
 
 #define ARMADA_PIC_NR_GPIOS 3
 
 static void __iomem *gpio_ctrl;
-static int pic_gpios[ARMADA_PIC_NR_GPIOS];
+static struct gpio_desc *pic_gpios[ARMADA_PIC_NR_GPIOS];
 static int pic_raw_gpios[ARMADA_PIC_NR_GPIOS];
 
 static void mvebu_armada_pm_enter(void __iomem *sdram_reg, u32 srcmd)

@@ -90,27 +90,17 @@ static int __init mvebu_armada_pm_init(void)
 		char *name;
 		struct of_phandle_args args;
 
-		pic_gpios[i] = of_get_named_gpio(np, "ctrl-gpios", i);
-		if (pic_gpios[i] < 0) {
-			ret = -ENODEV;
-			goto out;
-		}
-
 		name = kasprintf(GFP_KERNEL, "pic-pin%d", i);
 		if (!name) {
 			ret = -ENOMEM;
 			goto out;
 		}
 
-		ret = gpio_request(pic_gpios[i], name);
-		if (ret < 0) {
-			kfree(name);
-			goto out;
-		}
-
-		ret = gpio_direction_output(pic_gpios[i], 0);
-		if (ret < 0) {
-			gpio_free(pic_gpios[i]);
+		pic_gpios[i] = fwnode_gpiod_get_index(of_fwnode_handle(np),
+						      "ctrl", i, GPIOD_OUT_HIGH,
+						      name);
+		ret = PTR_ERR_OR_ZERO(pic_gpios[i]);
+		if (ret) {
 			kfree(name);
 			goto out;
 		}

@@ -118,7 +108,7 @@ static int __init mvebu_armada_pm_init(void)
 		ret = of_parse_phandle_with_fixed_args(np, "ctrl-gpios", 2,
 						       i, &args);
 		if (ret < 0) {
-			gpio_free(pic_gpios[i]);
+			gpiod_put(pic_gpios[i]);
 			kfree(name);
 			goto out;
 		}

Signature · 5 lines

2.38.1.431.g37b22c650d-goog


-- 
Dmitry

Andrew Lunn

maintainer

2022-11-16 01:11 UTC #1 lore raw

arch/arm/mach-mvebu/pm-board.c static int __init mvebu_armada_pm_init(void) · line 101

Quoted 6 lines

arch/arm/mach-mvebu/pm-board.c +3 -3

-		ret = gpio_direction_output(pic_gpios[i], 0);
-		if (ret < 0) {
-			gpio_free(pic_gpios[i]);
+		pic_gpios[i] = fwnode_gpiod_get_index(of_fwnode_handle(np),
+						      "ctrl", i, GPIOD_OUT_HIGH,
+						      name);

The old code passes value=0 to gpio_direction_output(). For fwnode_gpiod_get_index() you pass GPIOD_OUT_HIGH. Is this correct?

Andrew

Dmitry Torokhov

author

2022-11-16 01:40 UTC #2 lore raw

Quoted 9 lines · Andrew Lunn

arch/arm/mach-mvebu/pm-board.c static int __init mvebu_armada_pm_init(void) · line 101
Quoted 6 lines
arch/arm/mach-mvebu/pm-board.c +3 -3
-		ret = gpio_direction_output(pic_gpios[i], 0);
-		if (ret < 0) {
-			gpio_free(pic_gpios[i]);
+		pic_gpios[i] = fwnode_gpiod_get_index(of_fwnode_handle(np),
+						      "ctrl", i, GPIOD_OUT_HIGH,
+						      name);
The old code passes value=0 to gpio_direction_output(). For fwnode_gpiod_get_index() you pass GPIOD_OUT_HIGH. Is this correct?

Yes, gpiod API works on logical states, whereas old gpio API used signal levels. In arch/arm/boot/dts/armada-xp-gp.dts ctrl-gpios are described as "active low":

	cpus {
		pm_pic {
			ctrl-gpios = <&gpio0 16 GPIO_ACTIVE_LOW>,
				     <&gpio0 17 GPIO_ACTIVE_LOW>,
				     <&gpio0 18 GPIO_ACTIVE_LOW>;
		};
	};

so gpiolib will translate GPIOD_OUT_HIGH to 0 when setting final state of the pin.

There are discussions to rename GPIOD_OUT_HIGH and friends to something like active/inactive for better clarity, but that has not happened yet.

Thanks.

Signature · 1 line

Dmitry

Andrew Lunn

maintainer

2022-11-16 02:03 UTC #3 lore raw

Quoted 23 lines · Dmitry Torokhov

Quoted 9 lines · Andrew Lunn
arch/arm/mach-mvebu/pm-board.c static int __init mvebu_armada_pm_init(void) · line 101
Quoted 6 lines
arch/arm/mach-mvebu/pm-board.c +3 -3
-		ret = gpio_direction_output(pic_gpios[i], 0);
-		if (ret < 0) {
-			gpio_free(pic_gpios[i]);
+		pic_gpios[i] = fwnode_gpiod_get_index(of_fwnode_handle(np),
+						      "ctrl", i, GPIOD_OUT_HIGH,
+						      name);
The old code passes value=0 to gpio_direction_output(). For fwnode_gpiod_get_index() you pass GPIOD_OUT_HIGH. Is this correct?
Yes, gpiod API works on logical states, whereas old gpio API used signal levels. In arch/arm/boot/dts/armada-xp-gp.dts ctrl-gpios are described as "active low":
	cpus {
		pm_pic {
			ctrl-gpios = <&gpio0 16 GPIO_ACTIVE_LOW>,
				     <&gpio0 17 GPIO_ACTIVE_LOW>,
				     <&gpio0 18 GPIO_ACTIVE_LOW>;
		};
	};

Quoted 2 lines

so gpiolib will translate GPIOD_OUT_HIGH to 0 when setting final state of the pin.

Ah, yes. I knew that once, but it has gotten forgotten.

Thanks for the explanation and reminder.

Andrew

Andrew Lunn

maintainer Reviewed-by on v1 1/1

2022-11-16 02:03 UTC #4 lore raw

In reply to Dmitry Torokhov

Quoted 4 lines · Dmitry Torokhov

This switches PM code to use the newer gpiod API instead of legacy gpio API that we want to retire.
Signed-off-by Dmitry Torokhov <[email protected]>

Reviewed-by Andrew Lunn <[email protected]>

Andrew

Gregory CLEMENT

maintainer

2022-11-28 00:13 UTC #5 lore raw

In reply to Dmitry Torokhov

Quoted 4 lines · Dmitry Torokhov

This switches PM code to use the newer gpiod API instead of legacy gpio API that we want to retire.
Signed-off-by Dmitry Torokhov <[email protected]>

Applied on mvebu/dt

Thanks,

Gregory

Quoted 79 lines

---
 arch/arm/mach-mvebu/pm-board.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

arch/arm/mach-mvebu/pm-board.c +9 ~~-19~~

index 7fa1806acd65..beec22e17e89 100644
@@ -8,19 +8,19 @@
  */
 
 #include <linux/delay.h>
-#include <linux/gpio.h>
+#include <linux/err.h>
+#include <linux/gpio/consumer.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/of_gpio.h>
 #include <linux/slab.h>
 #include "common.h"
 
 #define ARMADA_PIC_NR_GPIOS 3
 
 static void __iomem *gpio_ctrl;
-static int pic_gpios[ARMADA_PIC_NR_GPIOS];
+static struct gpio_desc *pic_gpios[ARMADA_PIC_NR_GPIOS];
 static int pic_raw_gpios[ARMADA_PIC_NR_GPIOS];
 
 static void mvebu_armada_pm_enter(void __iomem *sdram_reg, u32 srcmd)

@@ -90,27 +90,17 @@ static int __init mvebu_armada_pm_init(void)
 		char *name;
 		struct of_phandle_args args;
 
-		pic_gpios[i] = of_get_named_gpio(np, "ctrl-gpios", i);
-		if (pic_gpios[i] < 0) {
-			ret = -ENODEV;
-			goto out;
-		}
-
 		name = kasprintf(GFP_KERNEL, "pic-pin%d", i);
 		if (!name) {
 			ret = -ENOMEM;
 			goto out;
 		}
 
-		ret = gpio_request(pic_gpios[i], name);
-		if (ret < 0) {
-			kfree(name);
-			goto out;
-		}
-
-		ret = gpio_direction_output(pic_gpios[i], 0);
-		if (ret < 0) {
-			gpio_free(pic_gpios[i]);
+		pic_gpios[i] = fwnode_gpiod_get_index(of_fwnode_handle(np),
+						      "ctrl", i, GPIOD_OUT_HIGH,
+						      name);
+		ret = PTR_ERR_OR_ZERO(pic_gpios[i]);
+		if (ret) {
 			kfree(name);
 			goto out;
 		}

@@ -118,7 +108,7 @@ static int __init mvebu_armada_pm_init(void)
 		ret = of_parse_phandle_with_fixed_args(np, "ctrl-gpios", 2,
 						       i, &args);
 		if (ret < 0) {
-			gpio_free(pic_gpios[i]);
+			gpiod_put(pic_gpios[i]);
 			kfree(name);
 			goto out;
 		}

Signature · 5 lines

2.38.1.431.g37b22c650d-goog


-- 
Dmitry

Signature · 3 lines

Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com