Skip to content

Commit

Permalink
irqchip: exynos-combiner: remove hard-coded irq_base value
Browse files Browse the repository at this point in the history
Replace irq_domain_add_simple with "irq_domain_add_linear" in order to use
linear irq domain, and to remove hardcoded irq_base_value.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Chander Kashyap authored and Kukjin Kim committed Dec 1, 2013
1 parent 6ce4eac commit 9403ac8
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions drivers/irqchip/exynos-combiner.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ static struct irq_domain_ops combiner_irq_domain_ops = {

static void __init combiner_init(void __iomem *combiner_base,
struct device_node *np,
unsigned int max_nr,
int irq_base)
unsigned int max_nr)
{
int i, irq;
unsigned int nr_irq;
Expand All @@ -186,7 +185,7 @@ static void __init combiner_init(void __iomem *combiner_base,
return;
}

combiner_irq_domain = irq_domain_add_simple(np, nr_irq, irq_base,
combiner_irq_domain = irq_domain_add_linear(np, nr_irq,
&combiner_irq_domain_ops, combiner_data);
if (WARN_ON(!combiner_irq_domain)) {
pr_warning("%s: irq domain init failed\n", __func__);
Expand All @@ -207,7 +206,6 @@ static int __init combiner_of_init(struct device_node *np,
{
void __iomem *combiner_base;
unsigned int max_nr = 20;
int irq_base = -1;

combiner_base = of_iomap(np, 0);
if (!combiner_base) {
Expand All @@ -221,14 +219,7 @@ static int __init combiner_of_init(struct device_node *np,
__func__, max_nr);
}

/*
* FIXME: This is a hardwired COMBINER_IRQ(0,0). Once all devices
* get their IRQ from DT, remove this in order to get dynamic
* allocation.
*/
irq_base = 160;

combiner_init(combiner_base, np, max_nr, irq_base);
combiner_init(combiner_base, np, max_nr);

return 0;
}
Expand Down

0 comments on commit 9403ac8

Please sign in to comment.