From cd15d85b91490cc75548faabfd588d51cbc2ae52 Mon Sep 17 00:00:00 2001 From: njoly Date: Thu, 29 Jul 2010 18:15:01 +0000 Subject: [PATCH] Adjust ICH10 watchdog timer entries which are really LPC interface bridges. While here consistently use `xxx LPC Interface Bridge' for Intel products. --- sys/dev/pci/pcidevs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index f3977c13a987..7dfcead8a82e 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1045 2010/07/29 17:53:19 njoly Exp $ +$NetBSD: pcidevs,v 1.1046 2010/07/29 18:15:01 njoly Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2471,7 +2471,7 @@ product INTEL 82801BA_HPB 0x244e 82801BA Hub-PCI Bridge product INTEL 82801E_SMB 0x2453 82801E SMBus Controller product INTEL 82801E_LAN_1 0x2459 82801E LAN Controller product INTEL 82801E_LAN_2 0x245d 82801E LAN Controller -product INTEL 82801CA_LPC 0x2480 82801CA LPC Interface +product INTEL 82801CA_LPC 0x2480 82801CA LPC Interface Bridge product INTEL 82801CA_USB_1 0x2482 82801CA USB Controller product INTEL 82801CA_SMB 0x2483 82801CA SMBus Controller product INTEL 82801CA_USB_2 0x2484 82801CA USB Controller @@ -2480,7 +2480,7 @@ product INTEL 82801CA_MOD 0x2486 82801CA AC'97 Modem Controller product INTEL 82801CA_USBC 0x2487 82801CA USB Controller product INTEL 82801CA_IDE_1 0x248A 82801CA IDE Controller product INTEL 82801CA_IDE_2 0x248B 82801CA IDE Controller -product INTEL 82801CAM_LPC 0x248C 82801CAM LPC Interface +product INTEL 82801CAM_LPC 0x248C 82801CAM LPC Interface Bridge product INTEL 82801DB_LPC 0x24C0 82801DB LPC Interface Bridge product INTEL 82801DB_USB_1 0x24C2 82801DB USB UHCI Controller product INTEL 82801DB_SMB 0x24C3 82801DB SMBus Controller @@ -2654,7 +2654,7 @@ product INTEL 82801G_IDE 0x27df 82801GB/GR IDE Controller product INTEL 82801G_EXP_5 0x27e0 82801GB/GR PCI Express Port #5 product INTEL 82801G_EXP_6 0x27e2 82801GB/GR PCI Express Port #6 product INTEL 82801H_LPC 0x2810 82801H LPC Interface Bridge -product INTEL 82801HEM_LPC 0x2811 82801HEM LPC +product INTEL 82801HEM_LPC 0x2811 82801HEM LPC Interface Bridge product INTEL 82801HH_LPC 0x2812 82801HH LPC Interface Bridge product INTEL 82801HO_LPC 0x2814 82801HO LPC Interface Bridge product INTEL 82801HBM_LPC 0x2815 82801HBM LPC Interface Bridge @@ -2789,16 +2789,16 @@ product INTEL E7525_PCIE_A1 0x3596 E7525 PCI Express Port A1 product INTEL E7525_PCIE_B 0x3597 E7525 PCI Express Port B product INTEL ICH10_SATA2_4x1 0x3a00 ICH10 SATA2(4port1) product INTEL ICH10_SATA2_2x1 0x3a06 ICH10 SATA2(2port1) -product INTEL ICH10DO_TIMER 0x3a14 ICH10DO Watchdog Timer -product INTEL ICH10R_TIMER 0x3a16 ICH10R Watchdog Timer -product INTEL ICH10_TIMER 0x3a18 ICH10 Watchdog Timer -product INTEL ICH10D_TIMER 0x3a1a ICH10D Watchdog Timer +product INTEL ICH10DO_LPC 0x3a14 ICH10DO LPC Interface Bridge +product INTEL ICH10R_LPC 0x3a16 ICH10R LPC Interface Bridge +product INTEL ICH10_LPC 0x3a18 ICH10 LPC Interface Bridge +product INTEL ICH10D_LPC 0x3a1a ICH10D LPC Interface Bridge product INTEL ICH10_SATA2_4x2 0x3a20 ICH10 SATA2(4port2) product INTEL ICH10R_AHCI 0x3a22 ICH10R AHCI Controller product INTEL ICH10_SATA2_2x2 0x3a26 ICH10 SATA2(2port2) product INTEL ICH10_SMB1 0x3a30 ICH10 SMBus Serial Bus 1 product INTEL ICH10_SMB2 0x3a60 ICH10 SMBus Serial Bus 2 -product INTEL 3400_LPC 0x3b14 3400 LPC +product INTEL 3400_LPC 0x3b14 3400 LPC Interface Bridge product INTEL 3400_SATA_1 0x3b20 3400 SATA product INTEL 3400_SATA_2 0x3b21 3400 SATA product INTEL 3400_AHCI_1 0x3b22 3400 AHCI