Skip to content

Commit

Permalink
ARM: mach-shmobile: Kota2 PINT fix
Browse files Browse the repository at this point in the history
Support PINT on sh73a0 and Kota2 using INTC PINT macros.

With this patch applied the Kota2 ethernet is handled
through one of the chained sh73a0 PINT interrupt controllers.

sh73a0 PINT support is included in 3.2-rc but the Kota2 board
code does not make use of this shared code base without this
patch. Without this patch kota2 on-board ethernet is broken.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Nov 24, 2011
1 parent a9098b3 commit 1b6cec8
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions arch/arm/mach-shmobile/board-kota2.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static struct resource smsc9220_resources[] = {
.flags = IORESOURCE_MEM,
},
[1] = {
.start = gic_spi(33), /* PINTA2 @ PORT144 */
.start = SH73A0_PINT0_IRQ(2), /* PINTA2 */
.flags = IORESOURCE_IRQ,
},
};
Expand Down Expand Up @@ -317,18 +317,6 @@ static void __init kota2_map_io(void)
shmobile_setup_console();
}

#define PINTER0A 0xe69000a0
#define PINTCR0A 0xe69000b0

void __init kota2_init_irq(void)
{
sh73a0_init_irq();

/* setup PINT: enable PINTA2 as active low */
__raw_writel(1 << 29, PINTER0A);
__raw_writew(2 << 10, PINTCR0A);
}

static void __init kota2_init(void)
{
sh73a0_pinmux_init();
Expand Down Expand Up @@ -447,7 +435,7 @@ struct sys_timer kota2_timer = {

MACHINE_START(KOTA2, "kota2")
.map_io = kota2_map_io,
.init_irq = kota2_init_irq,
.init_irq = sh73a0_init_irq,
.handle_irq = shmobile_handle_irq_gic,
.init_machine = kota2_init,
.timer = &kota2_timer,
Expand Down

0 comments on commit 1b6cec8

Please sign in to comment.