Skip to content

Commit

Permalink
sh: fix r2d board detection
Browse files Browse the repository at this point in the history
This patch fixes the R2D-PLUS and R2D-1 board detection code. Tested on two
R2D-PLUS and two R2D-1 boards.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Oct 10, 2007
1 parent 63482aa commit 9cbf3be
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions arch/sh/boards/renesas/rts7751r2d/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void __init init_rts7751r2d_IRQ(void)
{
struct intc_desc *d;

switch (ctrl_inw(PA_BVERREG)) {
switch (ctrl_inw(PA_VERREG) & 0xf0) {
#ifdef CONFIG_RTS7751R2D_PLUS
case 0x10:
printk(KERN_INFO "Using R2D-PLUS interrupt controller.\n");
Expand All @@ -139,13 +139,16 @@ void __init init_rts7751r2d_IRQ(void)
break;
#endif
#ifdef CONFIG_RTS7751R2D_1
case 0x11:
case 0x00: /* according to manual */
case 0x30: /* in reality */
printk(KERN_INFO "Using R2D-1 interrupt controller.\n");
d = &intc_desc_r2d_1;
memcpy(irl2irq, irl2irq_r2d_1, R2D_NR_IRL);
break;
#endif
default:
printk(KERN_INFO "Unknown R2D interrupt controller 0x%04x\n",
ctrl_inw(PA_VERREG));
return;
}

Expand Down

0 comments on commit 9cbf3be

Please sign in to comment.