iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'samsung-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

Browse Source 
From Kukjin Kim:
Samsung irq update for v3.14
- use linear irq domain for exynos-combiner

* tag 'samsung-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  irqchip: exynos-combiner: remove hard-coded irq_base value

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2013-12-22 14:08:08 -08:00
parent 8f2d751a9e 9403ac8822
commit 4ac63adc4f
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/irqchip/exynos-combiner.c
View File

@ -171,8 +171,7 @@ static struct irq_domain_ops combiner_irq_domain_ops = {
static void __init combiner_init(void __iomem *combiner_base, static void __init combiner_init(void __iomem *combiner_base,
struct device_node *np, struct device_node *np,
unsigned int max_nr, unsigned int max_nr)
int irq_base)
{ {
int i, irq; int i, irq;
unsigned int nr_irq; unsigned int nr_irq;
@ -186,7 +185,7 @@ static void __init combiner_init(void __iomem *combiner_base,
return; 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); &combiner_irq_domain_ops, combiner_data);
if (WARN_ON(!combiner_irq_domain)) { if (WARN_ON(!combiner_irq_domain)) {
pr_warning("%s: irq domain init failed\n", __func__); pr_warning("%s: irq domain init failed\n", __func__);
@ -207,7 +206,6 @@ static int __init combiner_of_init(struct device_node *np,
{ {
void __iomem *combiner_base; void __iomem *combiner_base;
unsigned int max_nr = 20; unsigned int max_nr = 20;
int irq_base = -1;
combiner_base = of_iomap(np, 0); combiner_base = of_iomap(np, 0);
if (!combiner_base) { if (!combiner_base) {
@ -221,14 +219,7 @@ static int __init combiner_of_init(struct device_node *np,
__func__, max_nr); __func__, max_nr);
} }
/* combiner_init(combiner_base, np, 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);
return 0; return 0;
} }