redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

gpio: davinci: Do not assume continuous IRQ numbering 

Currently the driver assumes that the interrupts are continuous
and does platform_get_irq only once and assumes the rest are continuous,
instead call platform_get_irq for all the interrupts and store them
in an array for later use.

Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
hifive-unleashed-5.1
Keerthy 2018-06-13 09:10:37 +05:30 committed by Linus Walleij
parent c1d013a70f
commit eb3744a2dd
2 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/gpio/gpio-davinci.c
View File

@ -55,7 +55,7 @@ static inline struct davinci_gpio_regs __iomem *irq2regs(struct irq_data *d)
return g; return g;
} }
static int davinci_gpio_irq_setup(struct platform_device *pdev, int bank_irq); static int davinci_gpio_irq_setup(struct platform_device *pdev);
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
@ -167,8 +167,8 @@ of_err:
static int davinci_gpio_probe(struct platform_device *pdev) static int davinci_gpio_probe(struct platform_device *pdev)
{ {
static int ctrl_num, bank_base; static int ctrl_num, bank_base;
int gpio, bank, bank_irq, ret = 0; int gpio, bank, i, ret = 0;
unsigned ngpio, nbank; unsigned int ngpio, nbank, nirq;
struct davinci_gpio_controller *chips; struct davinci_gpio_controller *chips;
struct davinci_gpio_platform_data *pdata; struct davinci_gpio_platform_data *pdata;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -197,6 +197,16 @@ static int davinci_gpio_probe(struct platform_device *pdev)
if (WARN_ON(ARCH_NR_GPIOS < ngpio)) if (WARN_ON(ARCH_NR_GPIOS < ngpio))
ngpio = ARCH_NR_GPIOS; ngpio = ARCH_NR_GPIOS;
/*
* If there are unbanked interrupts then the number of
* interrupts is equal to number of gpios else all are banked so
* number of interrupts is equal to number of banks(each with 16 gpios)
*/
if (pdata->gpio_unbanked)
nirq = pdata->gpio_unbanked;
else
nirq = DIV_ROUND_UP(ngpio, 16);
nbank = DIV_ROUND_UP(ngpio, 32); nbank = DIV_ROUND_UP(ngpio, 32);
chips = devm_kcalloc(dev, chips = devm_kcalloc(dev,
nbank, sizeof(struct davinci_gpio_controller), nbank, sizeof(struct davinci_gpio_controller),
@ -209,10 +219,13 @@ static int davinci_gpio_probe(struct platform_device *pdev)
if (IS_ERR(gpio_base)) if (IS_ERR(gpio_base))
return PTR_ERR(gpio_base); return PTR_ERR(gpio_base);
bank_irq = platform_get_irq(pdev, 0); for (i = 0; i < nirq; i++) {
if (bank_irq < 0) { chips->irqs[i] = platform_get_irq(pdev, i);
dev_dbg(dev, "IRQ not populated\n"); if (chips->irqs[i] < 0) {
return bank_irq; dev_info(dev, "IRQ not populated, err = %d\n",
chips->irqs[i]);
return chips->irqs[i];
}
} }
snprintf(label, MAX_LABEL_SIZE, "davinci_gpio.%d", ctrl_num++); snprintf(label, MAX_LABEL_SIZE, "davinci_gpio.%d", ctrl_num++);
@ -249,7 +262,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
goto err; goto err;
platform_set_drvdata(pdev, chips); platform_set_drvdata(pdev, chips);
ret = davinci_gpio_irq_setup(pdev, bank_irq); ret = davinci_gpio_irq_setup(pdev);
if (ret) if (ret)
goto err; goto err;
@ -383,7 +396,7 @@ static int gpio_to_irq_unbanked(struct gpio_chip *chip, unsigned offset)
* can provide direct-mapped IRQs to AINTC (up to 32 GPIOs). * can provide direct-mapped IRQs to AINTC (up to 32 GPIOs).
*/ */
if (offset < d->gpio_unbanked) if (offset < d->gpio_unbanked)
return d->base_irq + offset; return d->irqs[offset];
else else
return -ENODEV; return -ENODEV;
} }
@ -392,11 +405,18 @@ static int gpio_irq_type_unbanked(struct irq_data *data, unsigned trigger)
{ {
struct davinci_gpio_controller *d; struct davinci_gpio_controller *d;
struct davinci_gpio_regs __iomem *g; struct davinci_gpio_regs __iomem *g;
u32 mask; u32 mask, i;
d = (struct davinci_gpio_controller *)irq_data_get_irq_handler_data(data); d = (struct davinci_gpio_controller *)irq_data_get_irq_handler_data(data);
g = (struct davinci_gpio_regs __iomem *)d->regs[0]; g = (struct davinci_gpio_regs __iomem *)d->regs[0];
mask = __gpio_mask(data->irq - d->base_irq); for (i = 0; i < MAX_INT_PER_BANK; i++)
if (data->irq == d->irqs[i])
break;
if (i == MAX_INT_PER_BANK)
return -EINVAL;
mask = __gpio_mask(i);
if (trigger & ~(IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING)) if (trigger & ~(IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))
return -EINVAL; return -EINVAL;
@ -458,7 +478,7 @@ static const struct of_device_id davinci_gpio_ids[];
* (dm6446) can be set appropriately for GPIOV33 pins. * (dm6446) can be set appropriately for GPIOV33 pins.
*/ */
static int davinci_gpio_irq_setup(struct platform_device *pdev, int bank_irq) static int davinci_gpio_irq_setup(struct platform_device *pdev)
{ {
unsigned gpio, bank; unsigned gpio, bank;
int irq; int irq;
@ -492,6 +512,7 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev, int bank_irq)
dev_err(dev, "Error %ld getting gpio clock\n", PTR_ERR(clk)); dev_err(dev, "Error %ld getting gpio clock\n", PTR_ERR(clk));
return PTR_ERR(clk); return PTR_ERR(clk);
} }
ret = clk_prepare_enable(clk); ret = clk_prepare_enable(clk);
if (ret) if (ret)
return ret; return ret;
@ -531,12 +552,11 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev, int bank_irq)
if (pdata->gpio_unbanked) { if (pdata->gpio_unbanked) {
/* pass "bank 0" GPIO IRQs to AINTC */ /* pass "bank 0" GPIO IRQs to AINTC */
chips->chip.to_irq = gpio_to_irq_unbanked; chips->chip.to_irq = gpio_to_irq_unbanked;
chips->base_irq = bank_irq;
chips->gpio_unbanked = pdata->gpio_unbanked; chips->gpio_unbanked = pdata->gpio_unbanked;
binten = GENMASK(pdata->gpio_unbanked / 16, 0); binten = GENMASK(pdata->gpio_unbanked / 16, 0);
/* AINTC handles mask/unmask; GPIO handles triggering */ /* AINTC handles mask/unmask; GPIO handles triggering */
irq = bank_irq; irq = chips->irqs[0];
irq_chip = gpio_get_irq_chip(irq); irq_chip = gpio_get_irq_chip(irq);
irq_chip->name = "GPIO-AINTC"; irq_chip->name = "GPIO-AINTC";
irq_chip->irq_set_type = gpio_irq_type_unbanked; irq_chip->irq_set_type = gpio_irq_type_unbanked;
@ -547,10 +567,11 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev, int bank_irq)
writel_relaxed(~0, &g->set_rising); writel_relaxed(~0, &g->set_rising);
/* set the direct IRQs up to use that irqchip */ /* set the direct IRQs up to use that irqchip */
for (gpio = 0; gpio < pdata->gpio_unbanked; gpio++, irq++) { for (gpio = 0; gpio < pdata->gpio_unbanked; gpio++) {
irq_set_chip(irq, irq_chip); irq_set_chip(chips->irqs[gpio], irq_chip);
irq_set_handler_data(irq, chips); irq_set_handler_data(chips->irqs[gpio], chips);
irq_set_status_flags(irq, IRQ_TYPE_EDGE_BOTH); irq_set_status_flags(chips->irqs[gpio],
IRQ_TYPE_EDGE_BOTH);
} }
goto done; goto done;
@ -560,7 +581,7 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev, int bank_irq)
* Or, AINTC can handle IRQs for banks of 16 GPIO IRQs, which we * Or, AINTC can handle IRQs for banks of 16 GPIO IRQs, which we
* then chain through our own handler. * then chain through our own handler.
*/ */
for (gpio = 0, bank = 0; gpio < ngpio; bank++, bank_irq++, gpio += 16) { for (gpio = 0, bank = 0; gpio < ngpio; bank++, gpio += 16) {
/* disabled by default, enabled only as needed /* disabled by default, enabled only as needed
* There are register sets for 32 GPIOs. 2 banks of 16 * There are register sets for 32 GPIOs. 2 banks of 16
* GPIOs are covered by each set of registers hence divide by 2 * GPIOs are covered by each set of registers hence divide by 2
@ -587,8 +608,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev, int bank_irq)
irqdata->bank_num = bank; irqdata->bank_num = bank;
irqdata->chip = chips; irqdata->chip = chips;
irq_set_chained_handler_and_data(bank_irq, gpio_irq_handler, irq_set_chained_handler_and_data(chips->irqs[bank],
irqdata); gpio_irq_handler, irqdata);
binten |= BIT(bank); binten |= BIT(bank);
} }

3
include/linux/platform_data/gpio-davinci.h
View File

@ -22,6 +22,7 @@
#include <asm-generic/gpio.h> #include <asm-generic/gpio.h>
#define MAX_REGS_BANKS 5 #define MAX_REGS_BANKS 5
#define MAX_INT_PER_BANK 32
struct davinci_gpio_platform_data { struct davinci_gpio_platform_data {
u32 ngpio; u32 ngpio;
@ -41,7 +42,7 @@ struct davinci_gpio_controller {
spinlock_t lock; spinlock_t lock;
void __iomem *regs[MAX_REGS_BANKS]; void __iomem *regs[MAX_REGS_BANKS];
int gpio_unbanked; int gpio_unbanked;
unsigned int base_irq; int irqs[MAX_INT_PER_BANK];
unsigned int base; unsigned int base;
}; };