From patchwork Thu Mar 7 13:17:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lartey X-Patchwork-Id: 2231831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 5B6FDDF223 for ; Thu, 7 Mar 2013 13:24:01 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UDajf-00042S-CK; Thu, 07 Mar 2013 13:19:51 +0000 Received: from slimlogic.co.uk ([89.16.172.20]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UDaiH-0003i4-US for linux-arm-kernel@lists.infradead.org; Thu, 07 Mar 2013 13:18:30 +0000 Received: from localhost.localdomain (cpc1-sgyl22-0-0-cust5.sgyl.cable.virginmedia.com [92.235.204.6]) by slimlogic.co.uk (Postfix) with ESMTPSA id 50AD91006C1; Thu, 7 Mar 2013 13:18:24 +0000 (GMT) From: Ian Lartey To: linux-kernel@vger.kernel.org Subject: [PATCH v8 06/12] watchdog: Kconfig for Palmas watchdog Date: Thu, 7 Mar 2013 13:17:50 +0000 Message-Id: <1362662276-20792-6-git-send-email-ian@slimlogic.co.uk> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1362662276-20792-1-git-send-email-ian@slimlogic.co.uk> References: <1362662276-20792-1-git-send-email-ian@slimlogic.co.uk> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130307_081826_633740_C4EFF1C7 X-CRM114-Status: UNSURE ( 9.41 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: t-kristo@ti.com, broonie@opensource.wolfsonmicro.com, mturquette@linaro.org, linux-watchdog@vger.kernel.org, swarren@wwwdotorg.org, j-keerthy@ti.com, linus.walleij@linaro.org, linux-doc@vger.kernel.org, lgirdwood@gmail.com, rob.herring@calxeda.com, grant.likely@secretlab.ca, wim@iguana.be, ldewangan@nvidia.com, rpurdie@rpsys.net, linux-arm-kernel@lists.infradead.org, rob@landley.net, cooloney@gmail.com, gg@slimlogic.co.uk, Ian Lartey , linux-leds@vger.kernel.org, sameo@linux.intel.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add the Kconfig and Makefile for the Palmas watchdog driver Signed-off-by: Ian Lartey Signed-off-by: Graeme Gregory --- drivers/watchdog/Kconfig | 8 ++++++++ drivers/watchdog/Makefile | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 9fcc70c..d48cb0e 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -103,6 +103,14 @@ config WM8350_WATCHDOG Support for the watchdog in the WM8350 AudioPlus PMIC. When the watchdog triggers the system will be reset. +config PALMAS_WATCHDOG + tristate "Palmas Watchdog" + depends on MFD_PALMAS + select WATCHDOG_CORE + help + Support for the watchdog in the Palmas family of PMICs. When the + watchdog times out system will be reset. + # ALPHA Architecture # ARM Architecture diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index a300b94..e845c21 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -171,3 +171,4 @@ obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o +obj-$(CONFIG_PALMAS_WATCHDOG) += palmas_wdt.o