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

Commit fec607aa authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/fix-irqdomain' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

parents e6b6edf2 04aafd71

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

+5 −4
Original line number Diff line number Diff line
@@ -37,14 +37,15 @@ static void __init imx6q_map_io(void) 
	imx6q_clock_map_io();

}



static void __init imx6q_gpio_add_irq_domain(struct device_node *np,

static int __init imx6q_gpio_add_irq_domain(struct device_node *np,

				struct device_node *interrupt_parent)

{

	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS -

				   32 * 7; /* imx6q gets 7 gpio ports */

	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;



	gpio_irq_base -= 32;

	irq_domain_add_simple(np, gpio_irq_base);

	gpio_irq_base += 32;



	return 0;

}



static const struct of_device_id imx6q_irq_match[] __initconst = {

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

+7 −5
Original line number Diff line number Diff line
@@ -44,20 +44,22 @@ static const struct of_dev_auxdata imx51_auxdata_lookup[] __initconst = { 
	{ /* sentinel */ }

};



static void __init imx51_tzic_add_irq_domain(struct device_node *np,

static int __init imx51_tzic_add_irq_domain(struct device_node *np,

				struct device_node *interrupt_parent)

{

	irq_domain_add_simple(np, 0);

	return 0;

}



static void __init imx51_gpio_add_irq_domain(struct device_node *np,

static int __init imx51_gpio_add_irq_domain(struct device_node *np,

				struct device_node *interrupt_parent)

{

	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS -

				   32 * 4; /* imx51 gets 4 gpio ports */

	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;



	gpio_irq_base -= 32;

	irq_domain_add_simple(np, gpio_irq_base);

	gpio_irq_base += 32;



	return 0;

}



static const struct of_device_id imx51_irq_match[] __initconst = {

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

+7 −5
Original line number Diff line number Diff line
@@ -48,20 +48,22 @@ static const struct of_dev_auxdata imx53_auxdata_lookup[] __initconst = { 
	{ /* sentinel */ }

};



static void __init imx53_tzic_add_irq_domain(struct device_node *np,

static int __init imx53_tzic_add_irq_domain(struct device_node *np,

				struct device_node *interrupt_parent)

{

	irq_domain_add_simple(np, 0);

	return 0;

}



static void __init imx53_gpio_add_irq_domain(struct device_node *np,

static int __init imx53_gpio_add_irq_domain(struct device_node *np,

				struct device_node *interrupt_parent)

{

	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS -

				   32 * 7; /* imx53 gets 7 gpio ports */

	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;



	gpio_irq_base -= 32;

	irq_domain_add_simple(np, gpio_irq_base);

	gpio_irq_base += 32;



	return 0;

}



static const struct of_device_id imx53_irq_match[] __initconst = {