Commit 47126d80 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  davinci: DM365 EVM: fix video input mux bits
  ARM: davinci: Check for NULL return from irq_alloc_generic_chip
  arm: davinci: Fix low level gpio irq handlers' argument
parents 4746efde 9daedd83
...@@ -520,7 +520,7 @@ static void __init evm_init_cpld(void) ...@@ -520,7 +520,7 @@ static void __init evm_init_cpld(void)
*/ */
if (have_imager()) { if (have_imager()) {
label = "HD imager"; label = "HD imager";
mux |= 1; mux |= 2;
/* externally mux MMC1/ENET/AIC33 to imager */ /* externally mux MMC1/ENET/AIC33 to imager */
mux |= BIT(6) | BIT(5) | BIT(3); mux |= BIT(6) | BIT(5) | BIT(3);
...@@ -540,7 +540,7 @@ static void __init evm_init_cpld(void) ...@@ -540,7 +540,7 @@ static void __init evm_init_cpld(void)
resets &= ~BIT(1); resets &= ~BIT(1);
if (have_tvp7002()) { if (have_tvp7002()) {
mux |= 2; mux |= 1;
resets &= ~BIT(2); resets &= ~BIT(2);
label = "tvp7002 HD"; label = "tvp7002 HD";
} else { } else {
......
...@@ -254,8 +254,10 @@ gpio_irq_handler(unsigned irq, struct irq_desc *desc) ...@@ -254,8 +254,10 @@ gpio_irq_handler(unsigned irq, struct irq_desc *desc)
{ {
struct davinci_gpio_regs __iomem *g; struct davinci_gpio_regs __iomem *g;
u32 mask = 0xffff; u32 mask = 0xffff;
struct davinci_gpio_controller *d;
g = (__force struct davinci_gpio_regs __iomem *) irq_desc_get_handler_data(desc); d = (struct davinci_gpio_controller *)irq_desc_get_handler_data(desc);
g = (struct davinci_gpio_regs __iomem *)d->regs;
/* we only care about one bank */ /* we only care about one bank */
if (irq & 1) if (irq & 1)
...@@ -274,11 +276,14 @@ gpio_irq_handler(unsigned irq, struct irq_desc *desc) ...@@ -274,11 +276,14 @@ gpio_irq_handler(unsigned irq, struct irq_desc *desc)
if (!status) if (!status)
break; break;
__raw_writel(status, &g->intstat); __raw_writel(status, &g->intstat);
if (irq & 1)
status >>= 16;
/* now demux them to the right lowlevel handler */ /* now demux them to the right lowlevel handler */
n = (int)irq_get_handler_data(irq); n = d->irq_base;
if (irq & 1) {
n += 16;
status >>= 16;
}
while (status) { while (status) {
res = ffs(status); res = ffs(status);
n += res; n += res;
...@@ -424,7 +429,13 @@ static int __init davinci_gpio_irq_setup(void) ...@@ -424,7 +429,13 @@ static int __init davinci_gpio_irq_setup(void)
/* set up all irqs in this bank */ /* set up all irqs in this bank */
irq_set_chained_handler(bank_irq, gpio_irq_handler); irq_set_chained_handler(bank_irq, gpio_irq_handler);
irq_set_handler_data(bank_irq, (__force void *)g);
/*
* Each chip handles 32 gpios, and each irq bank consists of 16
* gpio irqs. Pass the irq bank's corresponding controller to
* the chained irq handler.
*/
irq_set_handler_data(bank_irq, &chips[gpio / 32]);
for (i = 0; i < 16 && gpio < ngpio; i++, irq++, gpio++) { for (i = 0; i < 16 && gpio < ngpio; i++, irq++, gpio++) {
irq_set_chip(irq, &gpio_irqchip); irq_set_chip(irq, &gpio_irqchip);
......
...@@ -52,6 +52,12 @@ davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) ...@@ -52,6 +52,12 @@ davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
struct irq_chip_type *ct; struct irq_chip_type *ct;
gc = irq_alloc_generic_chip("AINTC", 1, irq_start, base, handle_edge_irq); gc = irq_alloc_generic_chip("AINTC", 1, irq_start, base, handle_edge_irq);
if (!gc) {
pr_err("%s: irq_alloc_generic_chip for IRQ %u failed\n",
__func__, irq_start);
return;
}
ct = gc->chip_types; ct = gc->chip_types;
ct->chip.irq_ack = irq_gc_ack_set_bit; ct->chip.irq_ack = irq_gc_ack_set_bit;
ct->chip.irq_mask = irq_gc_mask_clr_bit; ct->chip.irq_mask = irq_gc_mask_clr_bit;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment