Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 179972
b: refs/heads/master
c: ef39a1b
h: refs/heads/master
v: v3
  • Loading branch information
Denis Turischev authored and Wim Van Sebroeck committed Jan 25, 2010
1 parent 9ce799a commit 77d8373
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e605d554ec17be55741b066387ae9f341777f52c
refs/heads/master: ef39a1bf3c4fbdea085c618be424cc88b803f248
4 changes: 2 additions & 2 deletions trunk/drivers/watchdog/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,8 @@ config SBC_FITPC2_WATCHDOG
tristate "Compulab SBC-FITPC2 watchdog"
depends on X86
---help---
This is the driver for the built-in watchdog timer on the fit-PC2
Single-board computer made by Compulab.
This is the driver for the built-in watchdog timer on the fit-PC2,
fit-PC2i, CM-iAM single-board computers made by Compulab.

It`s possible to enable watchdog timer either from BIOS (F2) or from booted Linux.
When "Watchdog Timer Value" enabled one can set 31-255 s operational range.
Expand Down
11 changes: 5 additions & 6 deletions trunk/drivers/watchdog/sbc_fitpc2_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ static DEFINE_SPINLOCK(wdt_lock);
static void wdt_send_data(unsigned char command, unsigned char data)
{
outb(command, COMMAND_PORT);
mdelay(100);
msleep(100);
outb(data, DATA_PORT);
mdelay(200);
msleep(200);
}

static void wdt_enable(void)
Expand Down Expand Up @@ -202,11 +202,10 @@ static int __init fitpc2_wdt_init(void)
{
int err;

if (strcmp("SBC-FITPC2", dmi_get_system_info(DMI_BOARD_NAME))) {
pr_info("board name is: %s. Should be SBC-FITPC2\n",
dmi_get_system_info(DMI_BOARD_NAME));
if (!strstr(dmi_get_system_info(DMI_BOARD_NAME), "SBC-FITPC2"))
return -ENODEV;
}

pr_info("%s found\n", dmi_get_system_info(DMI_BOARD_NAME));

if (!request_region(COMMAND_PORT, 1, WATCHDOG_NAME)) {
pr_err("I/O address 0x%04x already in use\n", COMMAND_PORT);
Expand Down

0 comments on commit 77d8373

Please sign in to comment.