Skip to content

Commit

Permalink
imx: move gpio init after to irq init
Browse files Browse the repository at this point in the history
The commit 9a763bf "get rid of mxc_gpio_init" changed gpio_init
and irq_init sequence. Usually we will call set_irq_chained_handler
in gpio_init functions, this should be called after the irq_init
called, otherwise the chained irq can't get propoer irq_chip and this
irq will remain masked even we called set_irq_chained_handler.

Signed-off-by: Jason Wang <jason77.wang@gmail.com>
Tested-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
Jason Wang authored and Sascha Hauer committed Jul 26, 2010
1 parent 95afd09 commit 84659ab
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-imx/mm-imx1.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ int imx1_register_gpios(void);

void __init mx1_init_irq(void)
{
imx1_register_gpios();
mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR));
imx1_register_gpios();
}
2 changes: 1 addition & 1 deletion arch/arm/mach-imx/mm-imx21.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ int imx21_register_gpios(void);

void __init mx21_init_irq(void)
{
imx21_register_gpios();
mxc_init_irq(MX21_IO_ADDRESS(MX21_AVIC_BASE_ADDR));
imx21_register_gpios();
}
2 changes: 1 addition & 1 deletion arch/arm/mach-imx/mm-imx27.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ int imx27_register_gpios(void);

void __init mx27_init_irq(void)
{
imx27_register_gpios();
mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR));
imx27_register_gpios();
}
2 changes: 1 addition & 1 deletion arch/arm/mach-mx25/mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ int imx25_register_gpios(void);

void __init mx25_init_irq(void)
{
imx25_register_gpios();
mxc_init_irq((void __iomem *)MX25_AVIC_BASE_ADDR_VIRT);
imx25_register_gpios();
}

2 changes: 1 addition & 1 deletion arch/arm/mach-mx3/mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ int imx3x_register_gpios(void);

void __init mx31_init_irq(void)
{
imx3x_register_gpios();
mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR));
imx3x_register_gpios();
}

void __init mx35_init_irq(void)
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-mx5/mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ void __init mx51_init_irq(void)
if (!tzic_virt)
panic("unable to map TZIC interrupt controller\n");

imx51_register_gpios();
tzic_init_irq(tzic_virt);
imx51_register_gpios();
}

0 comments on commit 84659ab

Please sign in to comment.