1 From cc809a441d8f2924f785eb863dfa6aef47a25b0b Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Tue, 12 Aug 2014 20:49:27 +0200
4 Subject: [PATCH 30/36] GPIO: add named gpio exports
6 Signed-off-by: John Crispin <blogic@openwrt.org>
8 drivers/gpio/gpiolib-of.c | 68 +++++++++++++++++++++++++++++++++++++++++
9 drivers/gpio/gpiolib.c | 11 +++++--
10 include/asm-generic/gpio.h | 5 +++
11 include/linux/gpio/consumer.h | 8 +++++
12 4 files changed, 90 insertions(+), 2 deletions(-)
14 --- a/drivers/gpio/gpiolib-of.c
15 +++ b/drivers/gpio/gpiolib-of.c
17 #include <linux/pinctrl/pinctrl.h>
18 #include <linux/slab.h>
19 #include <linux/gpio/machine.h>
20 +#include <linux/init.h>
21 +#include <linux/platform_device.h>
25 @@ -507,3 +509,72 @@ void of_gpiochip_remove(struct gpio_chip
26 gpiochip_remove_pin_ranges(chip);
27 of_node_put(chip->of_node);
30 +#ifdef CONFIG_GPIO_SYSFS
32 +static struct of_device_id gpio_export_ids[] = {
33 + { .compatible = "gpio-export" },
37 +static int of_gpio_export_probe(struct platform_device *pdev)
39 + struct device_node *np = pdev->dev.of_node;
40 + struct device_node *cnp;
44 + for_each_child_of_node(np, cnp) {
45 + const char *name = NULL;
51 + of_property_read_string(cnp, "gpio-export,name", &name);
54 + max_gpio = of_gpio_count(cnp);
56 + for (i = 0; i < max_gpio; i++) {
58 + enum of_gpio_flags of_flags;
60 + gpio = of_get_gpio_flags(cnp, i, &of_flags);
61 + if (!gpio_is_valid(gpio))
64 + if (of_flags == OF_GPIO_ACTIVE_LOW)
65 + flags |= GPIOF_ACTIVE_LOW;
67 + if (!of_property_read_u32(cnp, "gpio-export,output", &val))
68 + flags |= val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
72 + if (devm_gpio_request_one(&pdev->dev, gpio, flags, name ? name : of_node_full_name(np)))
75 + dmc = of_property_read_bool(cnp, "gpio-export,direction_may_change");
76 + gpio_export_with_name(gpio, dmc, name);
81 + dev_info(&pdev->dev, "%d gpio(s) exported\n", nb);
86 +static struct platform_driver gpio_export_driver = {
88 + .name = "gpio-export",
89 + .owner = THIS_MODULE,
90 + .of_match_table = of_match_ptr(gpio_export_ids),
92 + .probe = of_gpio_export_probe,
95 +module_platform_driver(gpio_export_driver);
98 --- a/include/asm-generic/gpio.h
99 +++ b/include/asm-generic/gpio.h
100 @@ -127,6 +127,12 @@ static inline int gpio_export(unsigned g
101 return gpiod_export(gpio_to_desc(gpio), direction_may_change);
104 +int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name);
105 +static inline int gpio_export_with_name(unsigned gpio, bool direction_may_change, const char *name)
107 + return __gpiod_export(gpio_to_desc(gpio), direction_may_change, name);
110 static inline int gpio_export_link(struct device *dev, const char *name,
113 --- a/include/linux/gpio/consumer.h
114 +++ b/include/linux/gpio/consumer.h
115 @@ -451,6 +451,7 @@ struct gpio_desc *devm_fwnode_get_gpiod_
117 #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)
119 +int _gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name);
120 int gpiod_export(struct gpio_desc *desc, bool direction_may_change);
121 int gpiod_export_link(struct device *dev, const char *name,
122 struct gpio_desc *desc);
123 @@ -458,6 +459,13 @@ void gpiod_unexport(struct gpio_desc *de
125 #else /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */
127 +static inline int _gpiod_export(struct gpio_desc *desc,
128 + bool direction_may_change,
134 static inline int gpiod_export(struct gpio_desc *desc,
135 bool direction_may_change)
137 --- a/drivers/gpio/gpiolib-sysfs.c
138 +++ b/drivers/gpio/gpiolib-sysfs.c
139 @@ -553,7 +553,7 @@ static struct class gpio_class = {
141 * Returns zero on success, else an error.
143 -int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
144 +int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name)
146 struct gpio_chip *chip;
147 struct gpio_device *gdev;
148 @@ -615,6 +615,8 @@ int gpiod_export(struct gpio_desc *desc,
149 offset = gpio_chip_hwgpio(desc);
150 if (chip->names && chip->names[offset])
151 ioname = chip->names[offset];
155 dev = device_create_with_groups(&gpio_class, &gdev->dev,
156 MKDEV(0, 0), data, gpio_groups,
157 @@ -636,6 +638,12 @@ err_unlock:
158 gpiod_dbg(desc, "%s: status %d\n", __func__, status);
161 +EXPORT_SYMBOL_GPL(__gpiod_export);
163 +int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
165 + return __gpiod_export(desc, direction_may_change, NULL);
167 EXPORT_SYMBOL_GPL(gpiod_export);
169 static int match_export(struct device *dev, const void *desc)