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

Commit 6b783f7c authored by Grant Likely's avatar Grant Likely
Browse files

irq_domain: Remove irq_domain_add_simple() 



irq_domain_add_simple() was a stop-gap measure until complete irq_domain
support was complete.  This patch removes the irq_domain_add_simple()
interface.

This patch also drops the explicit irq_domain initialization performed
by the mach-versatile code because the versatile interrupt controller
already has irq_domain support built into it.  This was a bug that was
hanging around quietly for a while, but with the full irq_domain which
actually verifies that irq_domain ranges are available it would cause
the registration to fail and the system wouldn't boot.

v4: Fixed number of irqs in mx5 gpio code
v2: Updated to pass in host_data pointer on irq_domain allocation.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Milton Miller <miltonm@bga.com>
Cc: Russell King <linux@arm.linux.org.uk>
Tested-by: default avatarOlof Johansson <olof@lixom.net>
parent 75294957

arch/arm/mach-imx/imx51-dt.c

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static const struct of_dev_auxdata imx51_auxdata_lookup[] __initconst = { 
static int __init imx51_tzic_add_irq_domain(struct device_node *np,

				struct device_node *interrupt_parent)

{

	irq_domain_add_simple(np, 0);

	irq_domain_add_legacy(np, 128, 0, 0, &irq_domain_simple_ops, NULL);

	return 0;

}
@@ -57,7 +57,7 @@ static int __init imx51_gpio_add_irq_domain(struct device_node *np, 
	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;



	gpio_irq_base -= 32;

	irq_domain_add_simple(np, gpio_irq_base);

	irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops, NULL);



	return 0;

}

arch/arm/mach-imx/imx53-dt.c

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static const struct of_dev_auxdata imx53_auxdata_lookup[] __initconst = { 
static int __init imx53_tzic_add_irq_domain(struct device_node *np,

				struct device_node *interrupt_parent)

{

	irq_domain_add_simple(np, 0);

	irq_domain_add_legacy(np, 128, 0, 0, &irq_domain_simple_ops, NULL);

	return 0;

}
@@ -61,7 +61,7 @@ static int __init imx53_gpio_add_irq_domain(struct device_node *np, 
	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;



	gpio_irq_base -= 32;

	irq_domain_add_simple(np, gpio_irq_base);

	irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops, NULL);



	return 0;

}

arch/arm/mach-imx/mach-imx6q.c

+2 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ static int __init imx6q_gpio_add_irq_domain(struct device_node *np, 
	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;



	gpio_irq_base -= 32;

	irq_domain_add_simple(np, gpio_irq_base);

	irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops,

			      NULL);



	return 0;

}

arch/arm/mach-msm/board-msm8x60.c

+2 −6
Original line number Diff line number Diff line
@@ -80,12 +80,8 @@ static struct of_device_id msm_dt_gic_match[] __initdata = { 


static void __init msm8x60_dt_init(void)

{

	struct device_node *node;



	node = of_find_matching_node_by_address(NULL, msm_dt_gic_match,

			MSM8X60_QGIC_DIST_PHYS);

	if (node)

		irq_domain_add_simple(node, GIC_SPI_START);

	irq_domain_generate_simple(msm_dt_gic_match, MSM8X60_QGIC_DIST_PHYS,

				GIC_SPI_START);



	if (of_machine_is_compatible("qcom,msm8660-surf")) {

		printk(KERN_INFO "Init surf UART registers\n");

arch/arm/mach-omap2/board-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void __init omap_generic_init(void) 
{

	struct device_node *node = of_find_matching_node(NULL, intc_match);

	if (node)

		irq_domain_add_simple(node, 0);

		irq_domain_add_legacy(node, 32, 0, 0, &irq_domain_simple_ops, NULL);



	omap_sdrc_init(NULL, NULL);