diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-12-10 16:40:26 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-10 16:40:26 +0300 |
| commit | e826d22e16c3230621a937e22f43c403d6e494a7 (patch) | |
| tree | 61bc8d95f5c3c7bdf93fac9ca57cd9d5b87a69b8 /drivers/watchdog/mtk_wdt.c | |
| parent | 9a5e5234bafeaa2e9d15881d443c38d3d82d0b38 (diff) | |
| parent | 0bdf5a05647a66dcc6394986e061daeac9b1cf96 (diff) | |
| download | linux-e826d22e16c3230621a937e22f43c403d6e494a7.tar.xz | |
Merge tag 'drm-i915-get-eld' into topic/hdmi-jack
Merge the latest i915 audio component changes for HDMI/DP get_eld ops.
This is actually used in HD-audio side in this branch.
Diffstat (limited to 'drivers/watchdog/mtk_wdt.c')
| -rw-r--r-- | drivers/watchdog/mtk_wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index 6ad9df948711..b751f43d76ed 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -123,6 +123,7 @@ static int mtk_wdt_stop(struct watchdog_device *wdt_dev) reg = readl(wdt_base + WDT_MODE); reg &= ~WDT_MODE_EN; + reg |= WDT_MODE_KEY; iowrite32(reg, wdt_base + WDT_MODE); return 0; |