[src/trunk]: src/sys/arch/sandpoint/pci DLink DSM-G600 IDSEL-14 (USB) needs s...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e4d768d9fea9
branches:  trunk
changeset: 763438:e4d768d9fea9
user:      phx <phx%NetBSD.org@localhost>
date:      Sat Mar 19 19:54:02 2011 +0000

description:
DLink DSM-G600 IDSEL-14 (USB) needs special handling: Pin A is mapped to
EPIC-IRQ 1, but Pin C must be mapped to IRQ 2.

diffstat:

 sys/arch/sandpoint/pci/pci_machdep.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 2bf8698d0b2e -r e4d768d9fea9 sys/arch/sandpoint/pci/pci_machdep.c
--- a/sys/arch/sandpoint/pci/pci_machdep.c      Sat Mar 19 17:12:12 2011 +0000
+++ b/sys/arch/sandpoint/pci/pci_machdep.c      Sat Mar 19 19:54:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.23 2011/02/14 09:00:04 nisimura Exp $        */
+/*     $NetBSD: pci_machdep.c,v 1.24 2011/03/19 19:54:02 phx Exp $     */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.23 2011/02/14 09:00:04 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.24 2011/03/19 19:54:02 phx Exp $");
 
 #include "opt_pci.h"
 
@@ -353,6 +353,8 @@
        case BRD_DLINKDSM:
                /* map line 13,14,15,16 to EPIC IRQ0,1,3,4 */
                *ihp = (line < 15) ? line - 13 : line - 12;
+               if (line == 14 && pin == 3)
+                       *ihp += 1;      /* USB pin C (EHCI) uses next IRQ */
                break;
        case BRD_NH230NAS:
                /* map line 13,14,15,16 to EPIC IRQ0,3,1,2 */