Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dee00abbbcab97b8ee3bbafb5e786dde83e26741

Authored by Giel van Schijndel
Committed by Wim Van Sebroeck
1 parent 29c3e8c8d1
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

watchdog: f71808e_wdt: add support for the F71889FG 

Signed-off-by: Giel van Schijndel <me@mortis.eu>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Showing 2 changed files with 11 additions and 3 deletions Side-by-side Diff

drivers/watchdog/Kconfig
Diff comments   View file @ dee00ab
... ... @@ -409,11 +409,11 @@
409 409 Most people will say N.
410 410  
411 411 config F71808E_WDT
412   - tristate "Fintek F71808E and F71882FG Watchdog"
  412 + tristate "Fintek F71808E, F71882FG and F71889FG Watchdog"
413 413 depends on X86 && EXPERIMENTAL
414 414 help
415 415 This is the driver for the hardware watchdog on the Fintek
416   - F71808E and F71882FG Super I/O controllers.
  416 + F71808E, F71882FG and F71889FG Super I/O controllers.
417 417  
418 418 You can compile this driver directly into the kernel, or use
419 419 it as a module. The module will be called f71808e_wdt.
drivers/watchdog/f71808e_wdt.c
Diff comments   View file @ dee00ab
... ... @@ -308,6 +308,12 @@
308 308 superio_set_bit(watchdog.sioaddr, 0x29, 1);
309 309 break;
310 310  
  311 + case f71889fg:
  312 + /* set pin 40 to WDTRST# */
  313 + superio_outb(watchdog.sioaddr, 0x2b,
  314 + superio_inb(watchdog.sioaddr, 0x2b) & 0xcf);
  315 + break;
  316 +
311 317 default:
312 318 /*
313 319 * 'default' label to shut up the compiler and catch
314 320  
... ... @@ -708,8 +714,10 @@
708 714 case SIO_F71882_ID:
709 715 watchdog.type = f71882fg;
710 716 break;
711   - case SIO_F71862_ID:
712 717 case SIO_F71889_ID:
  718 + watchdog.type = f71889fg;
  719 + break;
  720 + case SIO_F71862_ID:
713 721 /* These have a watchdog, though it isn't implemented (yet). */
714 722 err = -ENOSYS;
715 723 goto exit;