hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bcma: switch GPIO portions to use GPIOLIB_IRQCHIP 

This switches the BCMA GPIO driver to use GPIOLIB_IRQCHIP to
handle its interrupts instead of rolling its own copy of the
irqdomain handling etc.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Linus Walleij 2015-08-14 00:21:45 +02:00 committed by Kalle Valo
parent 1165dd900c
commit 74f4e0cc61
3 changed files with 31 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bcma/Kconfig
View File

@ -92,7 +92,7 @@ config BCMA_DRIVER_GMAC_CMN
config BCMA_DRIVER_GPIO config BCMA_DRIVER_GPIO
bool "BCMA GPIO driver" bool "BCMA GPIO driver"
depends on BCMA && GPIOLIB depends on BCMA && GPIOLIB
select IRQ_DOMAIN if BCMA_HOST_SOC select GPIOLIB_IRQCHIP if BCMA_HOST_SOC
help help
Driver to provide access to the GPIO pins of the bcma bus. Driver to provide access to the GPIO pins of the bcma bus.

92
drivers/bcma/driver_gpio.c
View File

@ -8,10 +8,8 @@
* Licensed under the GNU/GPL. See COPYING for details. * Licensed under the GNU/GPL. See COPYING for details.
*/ */
#include <linux/gpio.h> #include <linux/gpio/driver.h>
#include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irqdomain.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/bcma/bcma.h> #include <linux/bcma/bcma.h>
@ -79,19 +77,11 @@ static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio)
} }
#if IS_BUILTIN(CONFIG_BCM47XX) || IS_BUILTIN(CONFIG_ARCH_BCM_5301X) #if IS_BUILTIN(CONFIG_BCM47XX) || IS_BUILTIN(CONFIG_ARCH_BCM_5301X)
static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
{
struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
return irq_find_mapping(cc->irq_domain, gpio);
else
return -EINVAL;
}
static void bcma_gpio_irq_unmask(struct irq_data *d) static void bcma_gpio_irq_unmask(struct irq_data *d)
{ {
struct bcma_drv_cc *cc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct bcma_drv_cc *cc = bcma_gpio_get_cc(gc);
int gpio = irqd_to_hwirq(d); int gpio = irqd_to_hwirq(d);
u32 val = bcma_chipco_gpio_in(cc, BIT(gpio)); u32 val = bcma_chipco_gpio_in(cc, BIT(gpio));
@ -101,7 +91,8 @@ static void bcma_gpio_irq_unmask(struct irq_data *d)
static void bcma_gpio_irq_mask(struct irq_data *d) static void bcma_gpio_irq_mask(struct irq_data *d)
{ {
struct bcma_drv_cc *cc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct bcma_drv_cc *cc = bcma_gpio_get_cc(gc);
int gpio = irqd_to_hwirq(d); int gpio = irqd_to_hwirq(d);
bcma_chipco_gpio_intmask(cc, BIT(gpio), 0); bcma_chipco_gpio_intmask(cc, BIT(gpio), 0);
@ -116,6 +107,7 @@ static struct irq_chip bcma_gpio_irq_chip = {
static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id) static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id)
{ {
struct bcma_drv_cc *cc = dev_id; struct bcma_drv_cc *cc = dev_id;
struct gpio_chip *gc = &cc->gpio;
u32 val = bcma_cc_read32(cc, BCMA_CC_GPIOIN); u32 val = bcma_cc_read32(cc, BCMA_CC_GPIOIN);
u32 mask = bcma_cc_read32(cc, BCMA_CC_GPIOIRQ); u32 mask = bcma_cc_read32(cc, BCMA_CC_GPIOIRQ);
u32 pol = bcma_cc_read32(cc, BCMA_CC_GPIOPOL); u32 pol = bcma_cc_read32(cc, BCMA_CC_GPIOPOL);
@ -125,81 +117,58 @@ static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id)
if (!irqs) if (!irqs)
return IRQ_NONE; return IRQ_NONE;
for_each_set_bit(gpio, &irqs, cc->gpio.ngpio) for_each_set_bit(gpio, &irqs, gc->ngpio)
generic_handle_irq(bcma_gpio_to_irq(&cc->gpio, gpio)); generic_handle_irq(irq_find_mapping(gc->irqdomain, gpio));
bcma_chipco_gpio_polarity(cc, irqs, val & irqs); bcma_chipco_gpio_polarity(cc, irqs, val & irqs);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int bcma_gpio_irq_domain_init(struct bcma_drv_cc *cc) static int bcma_gpio_irq_init(struct bcma_drv_cc *cc)
{ {
struct gpio_chip *chip = &cc->gpio; struct gpio_chip *chip = &cc->gpio;
int gpio, hwirq, err; int hwirq, err;
if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC) if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)
return 0; return 0;
cc->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,
&irq_domain_simple_ops, cc);
if (!cc->irq_domain) {
err = -ENODEV;
goto err_irq_domain;
}
for (gpio = 0; gpio < chip->ngpio; gpio++) {
int irq = irq_create_mapping(cc->irq_domain, gpio);
irq_set_chip_data(irq, cc);
irq_set_chip_and_handler(irq, &bcma_gpio_irq_chip,
handle_simple_irq);
}
hwirq = bcma_core_irq(cc->core, 0); hwirq = bcma_core_irq(cc->core, 0);
err = request_irq(hwirq, bcma_gpio_irq_handler, IRQF_SHARED, "gpio", err = request_irq(hwirq, bcma_gpio_irq_handler, IRQF_SHARED, "gpio",
cc); cc);
if (err) if (err)
goto err_req_irq; return err;
bcma_chipco_gpio_intmask(cc, ~0, 0); bcma_chipco_gpio_intmask(cc, ~0, 0);
bcma_cc_set32(cc, BCMA_CC_IRQMASK, BCMA_CC_IRQ_GPIO); bcma_cc_set32(cc, BCMA_CC_IRQMASK, BCMA_CC_IRQ_GPIO);
return 0; err = gpiochip_irqchip_add(chip,
&bcma_gpio_irq_chip,
err_req_irq: 0,
for (gpio = 0; gpio < chip->ngpio; gpio++) { handle_simple_irq,
int irq = irq_find_mapping(cc->irq_domain, gpio); IRQ_TYPE_NONE);
if (err) {
irq_dispose_mapping(irq); free_irq(hwirq, cc);
return err;
} }
irq_domain_remove(cc->irq_domain);
err_irq_domain: return 0;
return err;
} }
static void bcma_gpio_irq_domain_exit(struct bcma_drv_cc *cc) static void bcma_gpio_irq_exit(struct bcma_drv_cc *cc)
{ {
struct gpio_chip *chip = &cc->gpio;
int gpio;
if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC) if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)
return; return;
bcma_cc_mask32(cc, BCMA_CC_IRQMASK, ~BCMA_CC_IRQ_GPIO); bcma_cc_mask32(cc, BCMA_CC_IRQMASK, ~BCMA_CC_IRQ_GPIO);
free_irq(bcma_core_irq(cc->core, 0), cc); free_irq(bcma_core_irq(cc->core, 0), cc);
for (gpio = 0; gpio < chip->ngpio; gpio++) {
int irq = irq_find_mapping(cc->irq_domain, gpio);
irq_dispose_mapping(irq);
}
irq_domain_remove(cc->irq_domain);
} }
#else #else
static int bcma_gpio_irq_domain_init(struct bcma_drv_cc *cc) static int bcma_gpio_irq_init(struct bcma_drv_cc *cc)
{ {
return 0; return 0;
} }
static void bcma_gpio_irq_domain_exit(struct bcma_drv_cc *cc) static void bcma_gpio_irq_exit(struct bcma_drv_cc *cc)
{ {
} }
#endif #endif
@ -218,9 +187,8 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
chip->set = bcma_gpio_set_value; chip->set = bcma_gpio_set_value;
chip->direction_input = bcma_gpio_direction_input; chip->direction_input = bcma_gpio_direction_input;
chip->direction_output = bcma_gpio_direction_output; chip->direction_output = bcma_gpio_direction_output;
#if IS_BUILTIN(CONFIG_BCM47XX) || IS_BUILTIN(CONFIG_ARCH_BCM_5301X) chip->owner = THIS_MODULE;
chip->to_irq = bcma_gpio_to_irq; chip->dev = bcma_bus_get_host_dev(bus);
#endif
#if IS_BUILTIN(CONFIG_OF) #if IS_BUILTIN(CONFIG_OF)
if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC) if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
chip->of_node = cc->core->dev.of_node; chip->of_node = cc->core->dev.of_node;
@ -248,13 +216,13 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
else else
chip->base = -1; chip->base = -1;
err = bcma_gpio_irq_domain_init(cc); err = gpiochip_add(chip);
if (err) if (err)
return err; return err;
err = gpiochip_add(chip); err = bcma_gpio_irq_init(cc);
if (err) { if (err) {
bcma_gpio_irq_domain_exit(cc); gpiochip_remove(chip);
return err; return err;
} }
@ -263,7 +231,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
int bcma_gpio_unregister(struct bcma_drv_cc *cc) int bcma_gpio_unregister(struct bcma_drv_cc *cc)
{ {
bcma_gpio_irq_domain_exit(cc); bcma_gpio_irq_exit(cc);
gpiochip_remove(&cc->gpio); gpiochip_remove(&cc->gpio);
return 0; return 0;
} }

1
include/linux/bcma/bcma_driver_chipcommon.h
View File

@ -640,7 +640,6 @@ struct bcma_drv_cc {
spinlock_t gpio_lock; spinlock_t gpio_lock;
#ifdef CONFIG_BCMA_DRIVER_GPIO #ifdef CONFIG_BCMA_DRIVER_GPIO
struct gpio_chip gpio; struct gpio_chip gpio;
struct irq_domain *irq_domain;
#endif #endif
}; };