---

yaml --- r: 68304 b: refs/heads/master c: 9cbf3be h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 3312d3c · 3312d3c
1 parent 3caac31
commit 3312d3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63482aaadacbc7e125d672bf8d8f2d39c13a49ed
+refs/heads/master: 9cbf3be67d51f73cf125aa8dec4ec8c215f264e8
diff --git a/trunk/arch/sh/boards/renesas/rts7751r2d/irq.c b/trunk/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -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");
@@ -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;
 	}