Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9cbf3be67d51f73cf125aa8dec4ec8c215f264e8
Commit:     9cbf3be67d51f73cf125aa8dec4ec8c215f264e8
Parent:     63482aaadacbc7e125d672bf8d8f2d39c13a49ed
Author:     Magnus Damm <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 10 18:03:58 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 18:03:58 2007 +0900

    sh: fix r2d board detection
    
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 arch/sh/boards/renesas/rts7751r2d/irq.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c 
b/arch/sh/boards/renesas/rts7751r2d/irq.c
index dadc4aa..7cc2813 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/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;
        }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to