Commit 19b022572b9e0fa8ce5490db888714ecb2b1293e
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fix from Wim Van Sebroeck: "Fix the watchdog mask bit offset for Exynos7" * git://www.linux-watchdog.org/linux-watchdog: watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7
Showing 1 changed file Side-by-side Diff
drivers/watchdog/s3c2410_wdt.c
... | ... | @@ -161,7 +161,7 @@ |
161 | 161 | static const struct s3c2410_wdt_variant drv_data_exynos7 = { |
162 | 162 | .disable_reg = EXYNOS5_WDT_DISABLE_REG_OFFSET, |
163 | 163 | .mask_reset_reg = EXYNOS5_WDT_MASK_RESET_REG_OFFSET, |
164 | - .mask_bit = 0, | |
164 | + .mask_bit = 23, | |
165 | 165 | .rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET, |
166 | 166 | .rst_stat_bit = 23, /* A57 WDTRESET */ |
167 | 167 | .quirks = QUIRK_HAS_PMU_CONFIG | QUIRK_HAS_RST_STAT, |