diff options
| author | Andrey Borzenkov <arvidjaar@mail.ru> | 2007-08-16 19:32:19 +0000 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-08-16 20:28:43 +0000 |
| commit | 6e420b7e26dd539f1f78fe920d295b022a2d99c8 (patch) | |
| tree | d31560156bf956358c15231befe853a3e0a90e11 /drivers | |
| parent | 568779c9c44bc20c4b7fd18a7d027517f5aaa081 (diff) | |
| download | kernel-crypto-6e420b7e26dd539f1f78fe920d295b022a2d99c8.tar.gz kernel-crypto-6e420b7e26dd539f1f78fe920d295b022a2d99c8.tar.xz kernel-crypto-6e420b7e26dd539f1f78fe920d295b022a2d99c8.zip | |
[WATCHDOG] Add support for 1533 bridge to alim1535_wdt
From: Andrey Borzenkov <arvidjaar@mail.ru>
They are apparently pretty close (even lspci combines them). The patch
adds support for 0x1533 bridge in addition to 0x1535.
Tested on Toshiba Portege 4000 with
00:07.0 ISA bridge [0601]: ALi Corporation M1533/M1535 PCI to ISA Bridge
[Aladdin IV/V/V+] [10b9:1533]
00:08.0 Bridge [0680]: ALi Corporation M7101 Power Management Controller
[PMU] [10b9:7101]
with result
[ 2090.906736] PCI: Enabling device 0000:00:08.0 (0000 -> 0001)
[ 2090.914034] ALi_M1535: initialized. timeout=3D60 sec (nowayout=3D0)
Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/watchdog/alim1535_wdt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/watchdog/alim1535_wdt.c b/drivers/char/watchdog/alim1535_wdt.c index e3f6a7d0c83..c404fc69e7e 100644 --- a/drivers/char/watchdog/alim1535_wdt.c +++ b/drivers/char/watchdog/alim1535_wdt.c @@ -312,6 +312,7 @@ static int ali_notify_sys(struct notifier_block *this, unsigned long code, void */ static struct pci_device_id ali_pci_tbl[] = { + { PCI_VENDOR_ID_AL, 0x1533, PCI_ANY_ID, PCI_ANY_ID,}, { PCI_VENDOR_ID_AL, 0x1535, PCI_ANY_ID, PCI_ANY_ID,}, { 0, }, }; @@ -329,9 +330,11 @@ static int __init ali_find_watchdog(void) struct pci_dev *pdev; u32 wdog; - /* Check for a 1535 series bridge */ + /* Check for a 1533/1535 series bridge */ pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1535, NULL); - if(pdev == NULL) + if (pdev == NULL) + pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1533, NULL); + if (pdev == NULL) return -ENODEV; pci_dev_put(pdev); |