summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko2017-03-12 16:07:44 +0100
committerIngo Molnar2017-03-13 08:11:57 +0100
commit80354c29025833acd72ddac1ffa21c6cb50128cd (patch)
tree0b587f179c95c8a351858bacbe07289f5ccf396b
parentLinux 4.11-rc2 (diff)
downloadkernel-qcow2-linux-80354c29025833acd72ddac1ffa21c6cb50128cd.tar.gz
kernel-qcow2-linux-80354c29025833acd72ddac1ffa21c6cb50128cd.tar.xz
kernel-qcow2-linux-80354c29025833acd72ddac1ffa21c6cb50128cd.zip
x86/platform/intel-mid: Correct MSI IRQ line for watchdog device
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: Andy 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: 78a3bb9e408b ("x86: intel-mid: add watchdog platform code for Merrifield") Link: http://lkml.kernel.org/r/20170312150744.45493-1-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c
index 86edd1e941eb..9e304e2ea4f5 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c
@@ -19,7 +19,7 @@
#include <asm/intel_scu_ipc.h>
#include <asm/io_apic.h>
-#define TANGIER_EXT_TIMER0_MSI 15
+#define TANGIER_EXT_TIMER0_MSI 12
static struct platform_device wdt_dev = {
.name = "intel_mid_wdt",