Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ac63adc authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-irq' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents 8f2d751a 9403ac88

drivers/irqchip/exynos-combiner.c

+3 −12
Original line number Diff line number Diff line
@@ -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;
@@ -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__);
@@ -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) {
@@ -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;

}