aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/hpwdt.c
diff options
context:
space:
mode:
authorThomas Mingarelli <Thomas.Mingarelli@hp.com>2009-03-02 19:17:16 -0500
committerWim Van Sebroeck <wim@iguana.be>2009-03-25 05:04:27 -0400
commitd8100c3abfd32986a8820ce4e614b0223a2d22a9 (patch)
tree25ba6450b7547ba45e690aaaf60b4c904788e473 /drivers/watchdog/hpwdt.c
parent2855d28a35d14e0087c48cb6f15d0446ea4c54c3 (diff)
[WATCHDOG] hpwdt.c: Add new HP BMC controller.
Add the PCI-ID for the upcoming new BMC controller for HP hardware. Signed-off-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/hpwdt.c')
-rw-r--r--drivers/watchdog/hpwdt.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 763c1ea5dce5..dad4fe6e20fc 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -47,6 +47,7 @@
47#define PCI_BIOS32_PARAGRAPH_LEN 16 47#define PCI_BIOS32_PARAGRAPH_LEN 16
48#define PCI_ROM_BASE1 0x000F0000 48#define PCI_ROM_BASE1 0x000F0000
49#define ROM_SIZE 0x10000 49#define ROM_SIZE 0x10000
50#define HPWDT_VERSION "1.01"
50 51
51struct bios32_service_dir { 52struct bios32_service_dir {
52 u32 signature; 53 u32 signature;
@@ -130,12 +131,8 @@ static void *cru_rom_addr;
130static struct cmn_registers cmn_regs; 131static struct cmn_registers cmn_regs;
131 132
132static struct pci_device_id hpwdt_devices[] = { 133static struct pci_device_id hpwdt_devices[] = {
133 { 134 { PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) },
134 .vendor = PCI_VENDOR_ID_COMPAQ, 135 { PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) },
135 .device = 0xB203,
136 .subvendor = PCI_ANY_ID,
137 .subdevice = PCI_ANY_ID,
138 },
139 {0}, /* terminate list */ 136 {0}, /* terminate list */
140}; 137};
141MODULE_DEVICE_TABLE(pci, hpwdt_devices); 138MODULE_DEVICE_TABLE(pci, hpwdt_devices);
@@ -704,10 +701,11 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
704 } 701 }
705 702
706 printk(KERN_INFO 703 printk(KERN_INFO
707 "hp Watchdog Timer Driver: 1.00" 704 "hp Watchdog Timer Driver: %s"
708 ", timer margin: %d seconds (nowayout=%d)" 705 ", timer margin: %d seconds (nowayout=%d)"
709 ", allow kernel dump: %s (default = 0/OFF).\n", 706 ", allow kernel dump: %s (default = 0/OFF).\n",
710 soft_margin, nowayout, (allow_kdump == 0) ? "OFF" : "ON"); 707 HPWDT_VERSION, soft_margin, nowayout,
708 (allow_kdump == 0) ? "OFF" : "ON");
711 709
712 return 0; 710 return 0;
713 711
@@ -757,6 +755,7 @@ static int __init hpwdt_init(void)
757MODULE_AUTHOR("Tom Mingarelli"); 755MODULE_AUTHOR("Tom Mingarelli");
758MODULE_DESCRIPTION("hp watchdog driver"); 756MODULE_DESCRIPTION("hp watchdog driver");
759MODULE_LICENSE("GPL"); 757MODULE_LICENSE("GPL");
758MODULE_VERSION(HPWDT_VERSION);
760MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 759MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
761 760
762module_param(soft_margin, int, 0); 761module_param(soft_margin, int, 0);