diff options
| author | ian <ian@FreeBSD.org> | 2015-08-23 20:16:13 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2015-08-23 20:16:13 +0000 |
| commit | d958a69ae31c2077009bd7d87b6d35829ac64f27 (patch) | |
| tree | e79f361a8427f802be4070c71b25fa51fd4a8294 /sys/arm/conf | |
| parent | 8cf9fedbf651f151cb25af637e612be5b827d962 (diff) | |
| download | FreeBSD-src-d958a69ae31c2077009bd7d87b6d35829ac64f27.zip FreeBSD-src-d958a69ae31c2077009bd7d87b6d35829ac64f27.tar.gz | |
MFC r286942, r286943, r286944: imx watchdog fixes...
Add compatible strings for all the hardware this driver works with.
Also, move the READ/WRITE bus space access macros from the header into the
source file, and rename them to RD2/WR2 to make it clear they're 16-bit
accessors. (READ/WRITE just don't seem like good names to be in a public
header file.)
Make the imx watchdog actually work, by setting WDOG_CR_WDE (enable bit).
Also, follow the rules from watchdog(9) about what values to return in
various situations (especially, don't touch *error when asked to set a
non-zero timeout that isn't achievable on the hardware).
Enable the watchdog driver on imx6, now that it works.
Diffstat (limited to 'sys/arm/conf')
| -rw-r--r-- | sys/arm/conf/IMX6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6 index 394933d..2676a6d 100644 --- a/sys/arm/conf/IMX6 +++ b/sys/arm/conf/IMX6 @@ -160,5 +160,5 @@ device ffec # Freescale Fast Ethernet Controller device fsliic # Freescale i2c/iic device iic # iic protocol device iicbus # iic bus -#device imxwdt # Watchdog. WARNING: can't be disabled!!! +device imxwdt # Watchdog. WARNING: can't be disabled!!! |
