Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 06:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WATCHDOG] Mixcom Watchdog - get rid of port offset's

Browse Source 
Get rid of the port offset's used for the
mixcom and flashcom watchdog devices.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Wim Van Sebroeck 2007-06-03 15:39:25 +00:00
parent b10958d338
commit 63e6e17ead
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/char/watchdog/mixcomwd.c
View File

@ -54,12 +54,19 @@
#include <asm/uaccess.h>
#include <asm/io.h>
static int mixcomwd_ioports[] = { 0x180, 0x280, 0x380, 0x000 };
#define MIXCOM_WATCHDOG_OFFSET 0xc10
/*
* We have two types of cards that can be probed:
* 1) The Mixcom cards: these cards can be found at addresses
* 0x180, 0x280, 0x380 with an additional offset of 0xc10.
* (Or 0xd90, 0xe90, 0xf90).
* 2) The FlashCOM cards: these cards can be set up at
* 0x300 -> 0x378, in 0x8 jumps with an offset of 0x04.
* (Or 0x304 -> 0x37c in 0x8 jumps).
* Each card has it's own ID.
*/
#define MIXCOM_ID 0x11
#define FLASHCOM_WATCHDOG_OFFSET 0x4
#define FLASHCOM_ID 0x18
static int mixcomwd_ioports[] = { 0xd90, 0xe90, 0xf90, 0x000 };
static void mixcomwd_timerfun(unsigned long d);
@ -214,7 +221,6 @@ static int __init mixcomwd_checkcard(int port)
{
int id;
port += MIXCOM_WATCHDOG_OFFSET;
if (!request_region(port, 1, "MixCOM watchdog")) {
return 0;
}
@ -231,7 +237,6 @@ static int __init flashcom_checkcard(int port)
{
int id;
port += FLASHCOM_WATCHDOG_OFFSET;
if (!request_region(port, 1, "MixCOM watchdog")) {
return 0;
}
@ -257,8 +262,8 @@ static int __init mixcomwd_init(void)
}
}
/* The FlashCOM card can be set up at 0x300 -> 0x378, in 0x8 jumps */
for (i = 0x300; !found && i < 0x380; i+=0x8) {
/* The FlashCOM card can be set up at 0x304 -> 0x37c, in 0x8 jumps */
for (i = 0x304; !found && i < 0x380; i+=0x8) {
watchdog_port = flashcom_checkcard(i);
if (watchdog_port) {
found = 1;