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

Commit 07c9249f authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 7554/1: VIC: use irq_domain_add_simple() 



Instead of allocating descriptors on-the-fly for the device tree
initialization case, use irq_domain_add_simple() which will take
care of this if you pass negative as the first_irq.

Alter the signature of __vic_init() to pass the first_irq as
signed so this works as expected.

Switching the VIC to use irq_domain_add_simple() also has the
upside of displaying the same WARNING when you boot with
pre-allocated descriptors on systems using SPARSE_IRQ but
yet not using device tree.

Cc: Grant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ddffeb8c

arch/arm/common/vic.c

+6 −12
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static void __init vic_register(void __iomem *base, unsigned int irq, 
	v->resume_sources = resume_sources;

	v->irq = irq;

	vic_id++;

	v->domain = irq_domain_add_legacy(node, fls(valid_sources), irq, 0,

	v->domain = irq_domain_add_simple(node, fls(valid_sources), irq,

					  &vic_irqdomain_ops, v);

}
@@ -350,7 +350,7 @@ static void __init vic_init_st(void __iomem *base, unsigned int irq_start, 
	vic_register(base, irq_start, vic_sources, 0, node);

}



void __init __vic_init(void __iomem *base, unsigned int irq_start,

void __init __vic_init(void __iomem *base, int irq_start,

			      u32 vic_sources, u32 resume_sources,

			      struct device_node *node)

{
@@ -416,18 +416,12 @@ int __init vic_of_init(struct device_node *node, struct device_node *parent) 
	if (WARN_ON(!regs))

		return -EIO;



	irq_base = irq_alloc_descs(-1, 0, 32, numa_node_id());

	if (WARN_ON(irq_base < 0))

		goto out_unmap;



	__vic_init(regs, irq_base, ~0, ~0, node);

	/*

	 * Passing -1 as first IRQ makes the simple domain allocate descriptors

	 */

	__vic_init(regs, -1, ~0, ~0, node);



	return 0;



 out_unmap:

	iounmap(regs);



	return -EIO;

}

#endif /* CONFIG OF */

arch/arm/include/asm/hardware/vic.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
struct device_node;

struct pt_regs;



void __vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources,

void __vic_init(void __iomem *base, int irq_start, u32 vic_sources,

		u32 resume_sources, struct device_node *node);

void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources, u32 resume_sources);

int vic_of_init(struct device_node *node, struct device_node *parent);