ath9k: remove gpio chip owner field to fix module unloading
[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 548-ath9k_enable_gpio_chip.patch
1 From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
2 Date: Sun, 31 Jan 2016 21:01:31 +0100
3 Subject: [PATCH v4 4/8] mac80211: ath9k: enable access to GPIO
4
5 Enable access to GPIO chip and its pins for Atheros AR92xx
6 wireless devices. For now AR9285 and AR9287 are supported.
7
8 Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
9 Signed-off-by: Felix Fietkau <nbd@nbd.name>
10 ---
11 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
12 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
13 @@ -24,6 +24,7 @@
14 #include <linux/completion.h>
15 #include <linux/time.h>
16 #include <linux/hw_random.h>
17 +#include <linux/gpio/driver.h>
18
19 #include "common.h"
20 #include "debug.h"
21 @@ -962,6 +963,14 @@ struct ath_led {
22 struct led_classdev cdev;
23 };
24
25 +#ifdef CONFIG_GPIOLIB
26 +struct ath9k_gpio_chip {
27 + struct ath_softc *sc;
28 + char label[32];
29 + struct gpio_chip gchip;
30 +};
31 +#endif
32 +
33 struct ath_softc {
34 struct ieee80211_hw *hw;
35 struct device *dev;
36 @@ -1016,6 +1025,9 @@ struct ath_softc {
37 #ifdef CPTCFG_MAC80211_LEDS
38 const char *led_default_trigger;
39 struct list_head leds;
40 +#ifdef CONFIG_GPIOLIB
41 + struct ath9k_gpio_chip *gpiochip;
42 +#endif
43 #endif
44
45 #ifdef CPTCFG_ATH9K_DEBUGFS
46 --- a/drivers/net/wireless/ath/ath9k/gpio.c
47 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
48 @@ -16,13 +16,134 @@
49
50 #include "ath9k.h"
51 #include <linux/ath9k_platform.h>
52 +#include <linux/gpio.h>
53 +
54 +#ifdef CPTCFG_MAC80211_LEDS
55 +
56 +#ifdef CONFIG_GPIOLIB
57 +
58 +/***************/
59 +/* GPIO Chip */
60 +/***************/
61 +
62 +/* gpio_chip handler : set GPIO to input */
63 +static int ath9k_gpio_pin_cfg_input(struct gpio_chip *chip, unsigned offset)
64 +{
65 + struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
66 + gchip);
67 +
68 + ath9k_hw_gpio_request_in(gc->sc->sc_ah, offset, "ath9k-gpio");
69 +
70 + return 0;
71 +}
72 +
73 +/* gpio_chip handler : set GPIO to output */
74 +static int ath9k_gpio_pin_cfg_output(struct gpio_chip *chip, unsigned offset,
75 + int value)
76 +{
77 + struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
78 + gchip);
79 +
80 + ath9k_hw_gpio_request_out(gc->sc->sc_ah, offset, "ath9k-gpio",
81 + AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
82 + ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
83 +
84 + return 0;
85 +}
86 +
87 +/* gpio_chip handler : query GPIO direction (0=out, 1=in) */
88 +static int ath9k_gpio_pin_get_dir(struct gpio_chip *chip, unsigned offset)
89 +{
90 + struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
91 + gchip);
92 + struct ath_hw *ah = gc->sc->sc_ah;
93 +
94 + return !((REG_READ(ah, AR_GPIO_OE_OUT) >> (offset * 2)) & 3);
95 +}
96 +
97 +/* gpio_chip handler : get GPIO pin value */
98 +static int ath9k_gpio_pin_get(struct gpio_chip *chip, unsigned offset)
99 +{
100 + struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
101 + gchip);
102 +
103 + return ath9k_hw_gpio_get(gc->sc->sc_ah, offset);
104 +}
105 +
106 +/* gpio_chip handler : set GPIO pin to value */
107 +static void ath9k_gpio_pin_set(struct gpio_chip *chip, unsigned offset,
108 + int value)
109 +{
110 + struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
111 + gchip);
112 +
113 + ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
114 +}
115 +
116 +/* register GPIO chip */
117 +static void ath9k_register_gpio_chip(struct ath_softc *sc)
118 +{
119 + struct ath9k_gpio_chip *gc;
120 + struct ath_hw *ah = sc->sc_ah;
121 +
122 + gc = kzalloc(sizeof(struct ath9k_gpio_chip), GFP_KERNEL);
123 + if (!gc)
124 + return;
125 +
126 + snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
127 + wiphy_name(sc->hw->wiphy));
128 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)
129 + gc->gchip.parent = sc->dev;
130 +#else
131 + gc->gchip.dev = sc->dev;
132 +#endif
133 + gc->gchip.label = gc->label;
134 + gc->gchip.base = -1; /* determine base automatically */
135 + gc->gchip.ngpio = ah->caps.num_gpio_pins;
136 + gc->gchip.direction_input = ath9k_gpio_pin_cfg_input;
137 + gc->gchip.direction_output = ath9k_gpio_pin_cfg_output;
138 + gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
139 + gc->gchip.get = ath9k_gpio_pin_get;
140 + gc->gchip.set = ath9k_gpio_pin_set;
141 +
142 + if (gpiochip_add(&gc->gchip)) {
143 + kfree(gc);
144 + return;
145 + }
146 +
147 + sc->gpiochip = gc;
148 + gc->sc = sc;
149 +}
150 +
151 +/* remove GPIO chip */
152 +static void ath9k_unregister_gpio_chip(struct ath_softc *sc)
153 +{
154 + struct ath9k_gpio_chip *gc = sc->gpiochip;
155 +
156 + if (!gc)
157 + return;
158 +
159 + gpiochip_remove(&gc->gchip);
160 + kfree(gc);
161 + sc->gpiochip = NULL;
162 +}
163 +
164 +#else /* CONFIG_GPIOLIB */
165 +
166 +static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
167 +{
168 +}
169 +
170 +static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
171 +{
172 +}
173 +
174 +#endif /* CONFIG_GPIOLIB */
175
176 /********************************/
177 /* LED functions */
178 /********************************/
179
180 -#ifdef CPTCFG_MAC80211_LEDS
181 -
182 static void ath_fill_led_pin(struct ath_softc *sc)
183 {
184 struct ath_hw *ah = sc->sc_ah;
185 @@ -80,6 +201,12 @@ static int ath_add_led(struct ath_softc
186 else
187 ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
188
189 +#ifdef CONFIG_GPIOLIB
190 + /* If there is GPIO chip configured, reserve LED pin */
191 + if (sc->gpiochip)
192 + gpio_request(sc->gpiochip->gchip.base + gpio->gpio, gpio->name);
193 +#endif
194 +
195 return 0;
196 }
197
198 @@ -136,12 +263,18 @@ void ath_deinit_leds(struct ath_softc *s
199
200 while (!list_empty(&sc->leds)) {
201 led = list_first_entry(&sc->leds, struct ath_led, list);
202 +#ifdef CONFIG_GPIOLIB
203 + /* If there is GPIO chip configured, free LED pin */
204 + if (sc->gpiochip)
205 + gpio_free(sc->gpiochip->gchip.base + led->gpio->gpio);
206 +#endif
207 list_del(&led->list);
208 ath_led_brightness(&led->cdev, LED_OFF);
209 led_classdev_unregister(&led->cdev);
210 ath9k_hw_gpio_free(sc->sc_ah, led->gpio->gpio);
211 kfree(led);
212 }
213 + ath9k_unregister_gpio_chip(sc);
214 }
215
216 void ath_init_leds(struct ath_softc *sc)
217 @@ -158,6 +291,8 @@ void ath_init_leds(struct ath_softc *sc)
218
219 ath_fill_led_pin(sc);
220
221 + ath9k_register_gpio_chip(sc);
222 +
223 if (pdata && pdata->led_name)
224 strncpy(led_name, pdata->led_name, sizeof(led_name));
225 else
226 @@ -178,6 +313,7 @@ void ath_init_leds(struct ath_softc *sc)
227 for (i = 0; i < pdata->num_leds; i++)
228 ath_create_platform_led(sc, &pdata->leds[i]);
229 }
230 +
231 #endif
232
233 /*******************/