Commit d95b95c8 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ben Hutchings

x86/platform/intel-mid: Correct MSI IRQ line for watchdog device

commit 80354c29 upstream.

The interrupt line used for the watchdog is 12, according to the official
Intel Edison BSP code.

And indeed after fixing it we start getting an interrupt and thus the
watchdog starts working again:

  [  191.699951] Kernel panic - not syncing: Kernel Watchdog
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 78a3bb9e ("x86: intel-mid: add watchdog platform code for Merrifield")
Link: http://lkml.kernel.org/r/20170312150744.45493-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
[bwh: Backported to 3.16: adjust filename]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent f3139612
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include <asm/io_apic.h> #include <asm/io_apic.h>
#define TANGIER_EXT_TIMER0_MSI 15 #define TANGIER_EXT_TIMER0_MSI 12
static struct platform_device wdt_dev = { static struct platform_device wdt_dev = {
.name = "intel_mid_wdt", .name = "intel_mid_wdt",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment