From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750782AbdCMHRl (ORCPT ); Mon, 13 Mar 2017 03:17:41 -0400 Received: from terminus.zytor.com ([65.50.211.136]:42810 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750763AbdCMHRb (ORCPT ); Mon, 13 Mar 2017 03:17:31 -0400 Date: Mon, 13 Mar 2017 00:15:50 -0700 From: tip-bot for Andy Shevchenko Message-ID: Cc: bp@alien8.de, david.a.cohen@linux.intel.com, peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, hpa@zytor.com, andriy.shevchenko@linux.intel.com Reply-To: hpa@zytor.com, andriy.shevchenko@linux.intel.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, bp@alien8.de, david.a.cohen@linux.intel.com, peterz@infradead.org In-Reply-To: <20170312150744.45493-1-andriy.shevchenko@linux.intel.com> References: <20170312150744.45493-1-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/platform/intel-mid: Correct MSI IRQ line for watchdog device Git-Commit-ID: 80354c29025833acd72ddac1ffa21c6cb50128cd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 80354c29025833acd72ddac1ffa21c6cb50128cd Gitweb: http://git.kernel.org/tip/80354c29025833acd72ddac1ffa21c6cb50128cd Author: Andy Shevchenko AuthorDate: Sun, 12 Mar 2017 17:07:44 +0200 Committer: Ingo Molnar CommitDate: Mon, 13 Mar 2017 08:11:57 +0100 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 Cc: Borislav Petkov Cc: David Cohen Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner 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 --- arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 86edd1e9..9e304e2 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 #include -#define TANGIER_EXT_TIMER0_MSI 15 +#define TANGIER_EXT_TIMER0_MSI 12 static struct platform_device wdt_dev = { .name = "intel_mid_wdt",