OpenWrt – Blame information for rev 3
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 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 |
||
5 | |||
6 | Signed-off-by: John Crispin <blogic@openwrt.org> |
||
7 | --- |
||
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(-) |
||
13 | |||
14 | --- a/drivers/gpio/gpiolib-of.c |
||
15 | +++ b/drivers/gpio/gpiolib-of.c |
||
16 | @@ -23,6 +23,8 @@ |
||
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> |
||
22 | |||
23 | #include "gpiolib.h" |
||
24 | |||
3 | office | 25 | @@ -506,3 +508,73 @@ void of_gpiochip_remove(struct gpio_chip |
1 | office | 26 | gpiochip_remove_pin_ranges(chip); |
27 | of_node_put(chip->of_node); |
||
28 | } |
||
29 | + |
||
30 | +#ifdef CONFIG_GPIO_SYSFS |
||
31 | + |
||
32 | +static struct of_device_id gpio_export_ids[] = { |
||
33 | + { .compatible = "gpio-export" }, |
||
34 | + { /* sentinel */ } |
||
35 | +}; |
||
36 | + |
||
3 | office | 37 | +static int __init of_gpio_export_probe(struct platform_device *pdev) |
1 | office | 38 | +{ |
39 | + struct device_node *np = pdev->dev.of_node; |
||
40 | + struct device_node *cnp; |
||
41 | + u32 val; |
||
42 | + int nb = 0; |
||
43 | + |
||
44 | + for_each_child_of_node(np, cnp) { |
||
45 | + const char *name = NULL; |
||
46 | + int gpio; |
||
47 | + bool dmc; |
||
48 | + int max_gpio = 1; |
||
49 | + int i; |
||
50 | + |
||
51 | + of_property_read_string(cnp, "gpio-export,name", &name); |
||
52 | + |
||
53 | + if (!name) |
||
54 | + max_gpio = of_gpio_count(cnp); |
||
55 | + |
||
56 | + for (i = 0; i < max_gpio; i++) { |
||
57 | + unsigned flags = 0; |
||
58 | + enum of_gpio_flags of_flags; |
||
59 | + |
||
60 | + gpio = of_get_gpio_flags(cnp, i, &of_flags); |
||
61 | + |
||
62 | + if (of_flags == OF_GPIO_ACTIVE_LOW) |
||
63 | + flags |= GPIOF_ACTIVE_LOW; |
||
64 | + |
||
65 | + if (!of_property_read_u32(cnp, "gpio-export,output", &val)) |
||
66 | + flags |= val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW; |
||
67 | + else |
||
68 | + flags |= GPIOF_IN; |
||
69 | + |
||
70 | + if (devm_gpio_request_one(&pdev->dev, gpio, flags, name ? name : of_node_full_name(np))) |
||
71 | + continue; |
||
72 | + |
||
73 | + dmc = of_property_read_bool(cnp, "gpio-export,direction_may_change"); |
||
74 | + gpio_export_with_name(gpio, dmc, name); |
||
75 | + nb++; |
||
76 | + } |
||
77 | + } |
||
78 | + |
||
79 | + dev_info(&pdev->dev, "%d gpio(s) exported\n", nb); |
||
80 | + |
||
81 | + return 0; |
||
82 | +} |
||
83 | + |
||
84 | +static struct platform_driver gpio_export_driver = { |
||
85 | + .driver = { |
||
86 | + .name = "gpio-export", |
||
87 | + .owner = THIS_MODULE, |
||
88 | + .of_match_table = of_match_ptr(gpio_export_ids), |
||
89 | + }, |
||
90 | +}; |
||
91 | + |
||
3 | office | 92 | +static int __init of_gpio_export_init(void) |
93 | +{ |
||
94 | + return platform_driver_probe(&gpio_export_driver, of_gpio_export_probe); |
||
95 | +} |
||
96 | +device_initcall(of_gpio_export_init); |
||
1 | office | 97 | + |
98 | +#endif |
||
99 | --- a/include/asm-generic/gpio.h |
||
100 | +++ b/include/asm-generic/gpio.h |
||
101 | @@ -127,6 +127,12 @@ static inline int gpio_export(unsigned g |
||
102 | return gpiod_export(gpio_to_desc(gpio), direction_may_change); |
||
103 | } |
||
104 | |||
105 | +int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name); |
||
106 | +static inline int gpio_export_with_name(unsigned gpio, bool direction_may_change, const char *name) |
||
107 | +{ |
||
108 | + return __gpiod_export(gpio_to_desc(gpio), direction_may_change, name); |
||
109 | +} |
||
110 | + |
||
111 | static inline int gpio_export_link(struct device *dev, const char *name, |
||
112 | unsigned gpio) |
||
113 | { |
||
114 | --- a/include/linux/gpio/consumer.h |
||
115 | +++ b/include/linux/gpio/consumer.h |
||
116 | @@ -451,6 +451,7 @@ struct gpio_desc *devm_fwnode_get_gpiod_ |
||
117 | |||
118 | #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS) |
||
119 | |||
120 | +int _gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name); |
||
121 | int gpiod_export(struct gpio_desc *desc, bool direction_may_change); |
||
122 | int gpiod_export_link(struct device *dev, const char *name, |
||
123 | struct gpio_desc *desc); |
||
124 | @@ -458,6 +459,13 @@ void gpiod_unexport(struct gpio_desc *de |
||
125 | |||
126 | #else /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */ |
||
127 | |||
128 | +static inline int _gpiod_export(struct gpio_desc *desc, |
||
129 | + bool direction_may_change, |
||
130 | + const char *name) |
||
131 | +{ |
||
132 | + return -ENOSYS; |
||
133 | +} |
||
134 | + |
||
135 | static inline int gpiod_export(struct gpio_desc *desc, |
||
136 | bool direction_may_change) |
||
137 | { |
||
138 | --- a/drivers/gpio/gpiolib-sysfs.c |
||
139 | +++ b/drivers/gpio/gpiolib-sysfs.c |
||
140 | @@ -553,7 +553,7 @@ static struct class gpio_class = { |
||
141 | * |
||
142 | * Returns zero on success, else an error. |
||
143 | */ |
||
144 | -int gpiod_export(struct gpio_desc *desc, bool direction_may_change) |
||
145 | +int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name) |
||
146 | { |
||
147 | struct gpio_chip *chip; |
||
148 | struct gpio_device *gdev; |
||
149 | @@ -615,6 +615,8 @@ int gpiod_export(struct gpio_desc *desc, |
||
150 | offset = gpio_chip_hwgpio(desc); |
||
151 | if (chip->names && chip->names[offset]) |
||
152 | ioname = chip->names[offset]; |
||
153 | + if (name) |
||
154 | + ioname = name; |
||
155 | |||
156 | dev = device_create_with_groups(&gpio_class, &gdev->dev, |
||
157 | MKDEV(0, 0), data, gpio_groups, |
||
158 | @@ -636,6 +638,12 @@ err_unlock: |
||
159 | gpiod_dbg(desc, "%s: status %d\n", __func__, status); |
||
160 | return status; |
||
161 | } |
||
162 | +EXPORT_SYMBOL_GPL(__gpiod_export); |
||
163 | + |
||
164 | +int gpiod_export(struct gpio_desc *desc, bool direction_may_change) |
||
165 | +{ |
||
166 | + return __gpiod_export(desc, direction_may_change, NULL); |
||
167 | +} |
||
168 | EXPORT_SYMBOL_GPL(gpiod_export); |
||
169 | |||
170 | static int match_export(struct device *dev, const void *desc) |