Samsung irq update for v3.14
- use linear irq domain for exynos-combiner -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSrgDeAAoJEA0Cl+kVi2xqENAP/j4Val2f8qIh1WQSoowuvwN7 giGn6uNRiIdVHKSP2l0wQ3m+adHgwaxHQt887sudanK2UHvvc0fbXd1DI0q/KoNs xWS5Prbtvl95+uyoS7XpO67YEzDIREGm6GZ9PqgKEb1ZScLK8W85vN2mbXZRHExU LrzwC0e+cf3uXBW8u5JpVfG4GPkB1vrTomDgotvXW1Q4sVn+MTVjG1N5VmbVrSB3 R8HFhhJsKMxxY5VjczPWLOoQpWVUf3LfiUQ6WhOQ2KZ+kHusl04dd1Qla2BHK8kk 7FzDCjUhpG2mWKlttUy6Wq37oMMj0dCnsdcfbtFu388PmvrjBl65Z6AoSvsvqUSB A02itxgR8ev6rgoS+A/wxrlQ/7vWBjbedXxvE718j4QuA9iq+UMwihcatwwCBGlZ Ui37lplkek03SZMXsIYPqlCR6SJRfPvCwX94z0eRztBSHzYmKzD7hFgtRXes2Fei nVMvGGmkKaYFeYjdx5fkMqqcGk6XleM2X/zWA5DHchzSmt59RreG1oc7VtO/DPhQ 3O6tfg8dLLQ++cd7bu9Lhk9TCnPu/NnarRHm/gJFCvc6WP7eTydGUpA/CesKFcOU MpRQQygk9cJLvPSpX3WP6/KV8+l7KMbf4eQhMdZH9BkLWZlhfALDDjs90PNVwOsJ zmmO7Qmppt6nyMIo1cYJ =SPvW -----END PGP SIGNATURE----- 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: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
4ac63adc4f
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue