1 From 5668cb19fea423cb6681f1efa8b130a26be2562e Mon Sep 17 00:00:00 2001
2 From: Rafa? Mi?ecki <zajec5@gmail.com>
3 Date: Fri, 3 Jan 2014 09:55:29 +0100
4 Subject: [PATCH] ssb: gpio: add own IRQ domain
6 Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
7 Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
9 drivers/ssb/Kconfig | 1 +
10 drivers/ssb/driver_gpio.c | 304 ++++++++++++++++++++++++++++++++++++++++++---
11 drivers/ssb/main.c | 12 +-
12 include/linux/ssb/ssb.h | 1 +
13 4 files changed, 297 insertions(+), 21 deletions(-)
15 --- a/drivers/ssb/Kconfig
16 +++ b/drivers/ssb/Kconfig
17 @@ -169,6 +169,7 @@ config SSB_DRIVER_GIGE
18 config SSB_DRIVER_GPIO
19 bool "SSB GPIO driver"
20 depends on SSB && GPIOLIB
21 + select IRQ_DOMAIN if SSB_EMBEDDED
23 Driver to provide access to the GPIO pins on the bus.
25 --- a/drivers/ssb/driver_gpio.c
26 +++ b/drivers/ssb/driver_gpio.c
30 #include <linux/gpio.h>
31 +#include <linux/irq.h>
32 +#include <linux/interrupt.h>
33 +#include <linux/irqdomain.h>
34 #include <linux/export.h>
35 #include <linux/ssb/ssb.h>
37 #include "ssb_private.h"
40 +/**************************************************
42 + **************************************************/
44 static struct ssb_bus *ssb_gpio_get_bus(struct gpio_chip *chip)
46 return container_of(chip, struct ssb_bus, gpio);
49 +#if IS_BUILTIN(CONFIG_SSB_EMBEDDED)
50 +static int ssb_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
52 + struct ssb_bus *bus = ssb_gpio_get_bus(chip);
54 + if (bus->bustype == SSB_BUSTYPE_SSB)
55 + return irq_find_mapping(bus->irq_domain, gpio);
61 +/**************************************************
63 + **************************************************/
65 static int ssb_gpio_chipco_get_value(struct gpio_chip *chip, unsigned gpio)
67 struct ssb_bus *bus = ssb_gpio_get_bus(chip);
68 @@ -74,19 +98,129 @@ static void ssb_gpio_chipco_free(struct
69 ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 0);
72 -static int ssb_gpio_chipco_to_irq(struct gpio_chip *chip, unsigned gpio)
73 +#if IS_BUILTIN(CONFIG_SSB_EMBEDDED)
74 +static void ssb_gpio_irq_chipco_mask(struct irq_data *d)
76 - struct ssb_bus *bus = ssb_gpio_get_bus(chip);
77 + struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
78 + int gpio = irqd_to_hwirq(d);
80 - if (bus->bustype == SSB_BUSTYPE_SSB)
81 - return ssb_mips_irq(bus->chipco.dev) + 2;
84 + ssb_chipco_gpio_intmask(&bus->chipco, BIT(gpio), 0);
87 +static void ssb_gpio_irq_chipco_unmask(struct irq_data *d)
89 + struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
90 + int gpio = irqd_to_hwirq(d);
91 + u32 val = ssb_chipco_gpio_in(&bus->chipco, BIT(gpio));
93 + ssb_chipco_gpio_polarity(&bus->chipco, BIT(gpio), val);
94 + ssb_chipco_gpio_intmask(&bus->chipco, BIT(gpio), BIT(gpio));
97 +static struct irq_chip ssb_gpio_irq_chipco_chip = {
98 + .name = "SSB-GPIO-CC",
99 + .irq_mask = ssb_gpio_irq_chipco_mask,
100 + .irq_unmask = ssb_gpio_irq_chipco_unmask,
103 +static irqreturn_t ssb_gpio_irq_chipco_handler(int irq, void *dev_id)
105 + struct ssb_bus *bus = dev_id;
106 + struct ssb_chipcommon *chipco = &bus->chipco;
107 + u32 val = chipco_read32(chipco, SSB_CHIPCO_GPIOIN);
108 + u32 mask = chipco_read32(chipco, SSB_CHIPCO_GPIOIRQ);
109 + u32 pol = chipco_read32(chipco, SSB_CHIPCO_GPIOPOL);
110 + u32 irqs = (val ^ pol) & mask;
116 + for_each_set_bit(gpio, (unsigned long *)&irqs, bus->gpio.ngpio)
117 + generic_handle_irq(ssb_gpio_to_irq(&bus->gpio, gpio));
118 + ssb_chipco_gpio_polarity(chipco, irqs, val & irqs);
120 + return IRQ_HANDLED;
123 +static int ssb_gpio_irq_chipco_domain_init(struct ssb_bus *bus)
125 + struct ssb_chipcommon *chipco = &bus->chipco;
126 + struct gpio_chip *chip = &bus->gpio;
127 + int gpio, hwirq, err;
129 + if (bus->bustype != SSB_BUSTYPE_SSB)
132 + bus->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,
133 + &irq_domain_simple_ops, chipco);
134 + if (!bus->irq_domain) {
136 + goto err_irq_domain;
138 + for (gpio = 0; gpio < chip->ngpio; gpio++) {
139 + int irq = irq_create_mapping(bus->irq_domain, gpio);
141 + irq_set_chip_data(irq, bus);
142 + irq_set_chip_and_handler(irq, &ssb_gpio_irq_chipco_chip,
143 + handle_simple_irq);
146 + hwirq = ssb_mips_irq(bus->chipco.dev) + 2;
147 + err = request_irq(hwirq, ssb_gpio_irq_chipco_handler, IRQF_SHARED,
152 + ssb_chipco_gpio_intmask(&bus->chipco, ~0, 0);
153 + chipco_set32(chipco, SSB_CHIPCO_IRQMASK, SSB_CHIPCO_IRQ_GPIO);
158 + for (gpio = 0; gpio < chip->ngpio; gpio++) {
159 + int irq = irq_find_mapping(bus->irq_domain, gpio);
161 + irq_dispose_mapping(irq);
163 + irq_domain_remove(bus->irq_domain);
168 +static void ssb_gpio_irq_chipco_domain_exit(struct ssb_bus *bus)
170 + struct ssb_chipcommon *chipco = &bus->chipco;
171 + struct gpio_chip *chip = &bus->gpio;
174 + if (bus->bustype != SSB_BUSTYPE_SSB)
177 + chipco_mask32(chipco, SSB_CHIPCO_IRQMASK, ~SSB_CHIPCO_IRQ_GPIO);
178 + free_irq(ssb_mips_irq(bus->chipco.dev) + 2, chipco);
179 + for (gpio = 0; gpio < chip->ngpio; gpio++) {
180 + int irq = irq_find_mapping(bus->irq_domain, gpio);
182 + irq_dispose_mapping(irq);
184 + irq_domain_remove(bus->irq_domain);
187 +static int ssb_gpio_irq_chipco_domain_init(struct ssb_bus *bus)
192 +static void ssb_gpio_irq_chipco_domain_exit(struct ssb_bus *bus)
197 static int ssb_gpio_chipco_init(struct ssb_bus *bus)
199 struct gpio_chip *chip = &bus->gpio;
202 chip->label = "ssb_chipco_gpio";
203 chip->owner = THIS_MODULE;
204 @@ -96,7 +230,8 @@ static int ssb_gpio_chipco_init(struct s
205 chip->set = ssb_gpio_chipco_set_value;
206 chip->direction_input = ssb_gpio_chipco_direction_input;
207 chip->direction_output = ssb_gpio_chipco_direction_output;
208 - chip->to_irq = ssb_gpio_chipco_to_irq;
209 + if (IS_BUILTIN(CONFIG_SSB_EMBEDDED))
210 + chip->to_irq = ssb_gpio_to_irq;
212 /* There is just one SoC in one device and its GPIO addresses should be
213 * deterministic to address them more easily. The other buses could get
214 @@ -106,9 +241,23 @@ static int ssb_gpio_chipco_init(struct s
218 - return gpiochip_add(chip);
219 + err = ssb_gpio_irq_chipco_domain_init(bus);
223 + err = gpiochip_add(chip);
225 + ssb_gpio_irq_chipco_domain_exit(bus);
232 +/**************************************************
234 + **************************************************/
236 #ifdef CONFIG_SSB_DRIVER_EXTIF
238 static int ssb_gpio_extif_get_value(struct gpio_chip *chip, unsigned gpio)
239 @@ -145,19 +294,127 @@ static int ssb_gpio_extif_direction_outp
243 -static int ssb_gpio_extif_to_irq(struct gpio_chip *chip, unsigned gpio)
244 +#if IS_BUILTIN(CONFIG_SSB_EMBEDDED)
245 +static void ssb_gpio_irq_extif_mask(struct irq_data *d)
247 - struct ssb_bus *bus = ssb_gpio_get_bus(chip);
248 + struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
249 + int gpio = irqd_to_hwirq(d);
251 - if (bus->bustype == SSB_BUSTYPE_SSB)
252 - return ssb_mips_irq(bus->extif.dev) + 2;
255 + ssb_extif_gpio_intmask(&bus->extif, BIT(gpio), 0);
258 +static void ssb_gpio_irq_extif_unmask(struct irq_data *d)
260 + struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
261 + int gpio = irqd_to_hwirq(d);
262 + u32 val = ssb_extif_gpio_in(&bus->extif, BIT(gpio));
264 + ssb_extif_gpio_polarity(&bus->extif, BIT(gpio), val);
265 + ssb_extif_gpio_intmask(&bus->extif, BIT(gpio), BIT(gpio));
268 +static struct irq_chip ssb_gpio_irq_extif_chip = {
269 + .name = "SSB-GPIO-EXTIF",
270 + .irq_mask = ssb_gpio_irq_extif_mask,
271 + .irq_unmask = ssb_gpio_irq_extif_unmask,
274 +static irqreturn_t ssb_gpio_irq_extif_handler(int irq, void *dev_id)
276 + struct ssb_bus *bus = dev_id;
277 + struct ssb_extif *extif = &bus->extif;
278 + u32 val = ssb_read32(extif->dev, SSB_EXTIF_GPIO_IN);
279 + u32 mask = ssb_read32(extif->dev, SSB_EXTIF_GPIO_INTMASK);
280 + u32 pol = ssb_read32(extif->dev, SSB_EXTIF_GPIO_INTPOL);
281 + u32 irqs = (val ^ pol) & mask;
287 + for_each_set_bit(gpio, (unsigned long *)&irqs, bus->gpio.ngpio)
288 + generic_handle_irq(ssb_gpio_to_irq(&bus->gpio, gpio));
289 + ssb_extif_gpio_polarity(extif, irqs, val & irqs);
291 + return IRQ_HANDLED;
294 +static int ssb_gpio_irq_extif_domain_init(struct ssb_bus *bus)
296 + struct ssb_extif *extif = &bus->extif;
297 + struct gpio_chip *chip = &bus->gpio;
298 + int gpio, hwirq, err;
300 + if (bus->bustype != SSB_BUSTYPE_SSB)
303 + bus->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,
304 + &irq_domain_simple_ops, extif);
305 + if (!bus->irq_domain) {
307 + goto err_irq_domain;
309 + for (gpio = 0; gpio < chip->ngpio; gpio++) {
310 + int irq = irq_create_mapping(bus->irq_domain, gpio);
312 + irq_set_chip_data(irq, bus);
313 + irq_set_chip_and_handler(irq, &ssb_gpio_irq_extif_chip,
314 + handle_simple_irq);
317 + hwirq = ssb_mips_irq(bus->extif.dev) + 2;
318 + err = request_irq(hwirq, ssb_gpio_irq_extif_handler, IRQF_SHARED,
323 + ssb_extif_gpio_intmask(&bus->extif, ~0, 0);
328 + for (gpio = 0; gpio < chip->ngpio; gpio++) {
329 + int irq = irq_find_mapping(bus->irq_domain, gpio);
331 + irq_dispose_mapping(irq);
333 + irq_domain_remove(bus->irq_domain);
338 +static void ssb_gpio_irq_extif_domain_exit(struct ssb_bus *bus)
340 + struct ssb_extif *extif = &bus->extif;
341 + struct gpio_chip *chip = &bus->gpio;
344 + if (bus->bustype != SSB_BUSTYPE_SSB)
347 + free_irq(ssb_mips_irq(bus->extif.dev) + 2, extif);
348 + for (gpio = 0; gpio < chip->ngpio; gpio++) {
349 + int irq = irq_find_mapping(bus->irq_domain, gpio);
351 + irq_dispose_mapping(irq);
353 + irq_domain_remove(bus->irq_domain);
356 +static int ssb_gpio_irq_extif_domain_init(struct ssb_bus *bus)
361 +static void ssb_gpio_irq_extif_domain_exit(struct ssb_bus *bus)
366 static int ssb_gpio_extif_init(struct ssb_bus *bus)
368 struct gpio_chip *chip = &bus->gpio;
371 chip->label = "ssb_extif_gpio";
372 chip->owner = THIS_MODULE;
373 @@ -165,7 +422,8 @@ static int ssb_gpio_extif_init(struct ss
374 chip->set = ssb_gpio_extif_set_value;
375 chip->direction_input = ssb_gpio_extif_direction_input;
376 chip->direction_output = ssb_gpio_extif_direction_output;
377 - chip->to_irq = ssb_gpio_extif_to_irq;
378 + if (IS_BUILTIN(CONFIG_SSB_EMBEDDED))
379 + chip->to_irq = ssb_gpio_to_irq;
381 /* There is just one SoC in one device and its GPIO addresses should be
382 * deterministic to address them more easily. The other buses could get
383 @@ -175,7 +433,17 @@ static int ssb_gpio_extif_init(struct ss
387 - return gpiochip_add(chip);
388 + err = ssb_gpio_irq_extif_domain_init(bus);
392 + err = gpiochip_add(chip);
394 + ssb_gpio_irq_extif_domain_exit(bus);
402 @@ -185,6 +453,10 @@ static int ssb_gpio_extif_init(struct ss
406 +/**************************************************
408 + **************************************************/
410 int ssb_gpio_init(struct ssb_bus *bus)
412 if (ssb_chipco_available(&bus->chipco))
413 --- a/drivers/ssb/main.c
414 +++ b/drivers/ssb/main.c
415 @@ -590,6 +590,13 @@ static int ssb_attach_queued_buses(void)
416 ssb_pcicore_init(&bus->pcicore);
417 if (bus->bustype == SSB_BUSTYPE_SSB)
418 ssb_watchdog_register(bus);
420 + err = ssb_gpio_init(bus);
421 + if (err == -ENOTSUPP)
422 + ssb_dbg("GPIO driver not activated\n");
424 + ssb_dbg("Error registering GPIO driver: %i\n", err);
426 ssb_bus_may_powerdown(bus);
428 err = ssb_devices_register(bus);
429 @@ -827,11 +834,6 @@ static int ssb_bus_register(struct ssb_b
430 ssb_chipcommon_init(&bus->chipco);
431 ssb_extif_init(&bus->extif);
432 ssb_mipscore_init(&bus->mipscore);
433 - err = ssb_gpio_init(bus);
434 - if (err == -ENOTSUPP)
435 - ssb_dbg("GPIO driver not activated\n");
437 - ssb_dbg("Error registering GPIO driver: %i\n", err);
438 err = ssb_fetch_invariants(bus, get_invariants);
440 ssb_bus_may_powerdown(bus);
441 --- a/include/linux/ssb/ssb.h
442 +++ b/include/linux/ssb/ssb.h
443 @@ -486,6 +486,7 @@ struct ssb_bus {
444 #endif /* EMBEDDED */
445 #ifdef CONFIG_SSB_DRIVER_GPIO
446 struct gpio_chip gpio;
447 + struct irq_domain *irq_domain;
448 #endif /* DRIVER_GPIO */
450 /* Internal-only stuff follows. Do not touch. */