Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19b02257 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 15bd1e5c 5476b2b7

drivers/watchdog/s3c2410_wdt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -161,7 +161,7 @@ static const struct s3c2410_wdt_variant drv_data_exynos5420 = { 
static const struct s3c2410_wdt_variant drv_data_exynos7 = {

static const struct s3c2410_wdt_variant drv_data_exynos7 = {

	.disable_reg = EXYNOS5_WDT_DISABLE_REG_OFFSET,

	.disable_reg = EXYNOS5_WDT_DISABLE_REG_OFFSET,

	.mask_reset_reg = EXYNOS5_WDT_MASK_RESET_REG_OFFSET,

	.mask_reset_reg = EXYNOS5_WDT_MASK_RESET_REG_OFFSET,

	.mask_bit = 0,

	.mask_bit = 23,

	.rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET,

	.rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET,

	.rst_stat_bit = 23,	/* A57 WDTRESET */

	.rst_stat_bit = 23,	/* A57 WDTRESET */

	.quirks = QUIRK_HAS_PMU_CONFIG | QUIRK_HAS_RST_STAT,

	.quirks = QUIRK_HAS_PMU_CONFIG | QUIRK_HAS_RST_STAT,