From patchwork Wed Feb 12 13:41:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 3638251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A2AC9BF13A for ; Wed, 12 Feb 2014 13:45:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93FEB20145 for ; Wed, 12 Feb 2014 13:45:34 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A0D220142 for ; Wed, 12 Feb 2014 13:45:33 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDa6D-0003cs-14; Wed, 12 Feb 2014 13:43:37 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDa5h-0003Xd-5f; Wed, 12 Feb 2014 13:43:05 +0000 Received: from mail-ee0-f42.google.com ([74.125.83.42]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDa5K-0003SP-Ky for linux-arm-kernel@lists.infradead.org; Wed, 12 Feb 2014 13:42:43 +0000 Received: by mail-ee0-f42.google.com with SMTP id b15so4373155eek.29 for ; Wed, 12 Feb 2014 05:42:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:content-type; bh=V4UKTyWLKZCV4smzMcEu4tqsQn32Yz4yi4k8jEZtgEE=; b=bWw9kHgDXzH32/DBKbgwYMNCfLB5rc0tmmPlPR/+Agch5boet4mbZRZJifvWHcyGWG 6WDU/bkcH5nn3bzfmxbrWL3O5S3jsx545nXxWA1G1Sj/G6YNUYRTgHZdxdOqkai7doln F2Wi/hR5CnJevrbaI4pWlGn1XCTpbeMyjxbWiRvgTJDNBvk7uVGf6+w7eH2iXX3KtaVa 1AwrTF/IUcjo+TOkntqXp95iBgbtaAfz5kA2v1qw+tMAyx9O+14EF7bwJS7WJT1FlHRF 1VxnpVCPgYI9V/WAX3cgTEGBhC+2ZE2MJkePMYw5gQobKR9wn/BvekH3fToJwBeoxyV+ MDHw== X-Gm-Message-State: ALoCoQkKYwFIqXWRV/AvtJlIspehZZHXxDGG1b0FoMzI3+th8Cn5zW4+mYtHtFhrs7T3nmRss2C9 X-Received: by 10.14.246.68 with SMTP id p44mr4139871eer.72.1392212540642; Wed, 12 Feb 2014 05:42:20 -0800 (PST) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id m9sm80827718eeh.3.2014.02.12.05.42.17 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 12 Feb 2014 05:42:18 -0800 (PST) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Subject: [PATCH v3 10/11] watchdog: xilinx: Enable this driver for Zynq Date: Wed, 12 Feb 2014 14:41:24 +0100 Message-Id: X-Mailer: git-send-email 1.8.2.3 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140212_084242_850363_BBC17AF6 X-CRM114-Status: GOOD ( 14.00 ) X-Spam-Score: -1.9 (-) Cc: linux-arm-kernel@lists.infradead.org, wim@iguana.be, linux-watchdog@vger.kernel.org, linux@roeck-us.net 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 X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Enable this driver for Zynq. Move it to architecture independent Kconfig part. Signed-off-by: Michal Simek Reviewed-by: Guenter Roeck --- Changes in v3: None Changes in v2: None Build tested by zero day testing system. --- drivers/watchdog/Kconfig | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) -- 1.8.2.3 diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 9db5d3c..6120403 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -111,6 +111,15 @@ config WM8350_WATCHDOG Support for the watchdog in the WM8350 AudioPlus PMIC. When the watchdog triggers the system will be reset. +config XILINX_WATCHDOG + tristate "Xilinx Watchdog timer" + select WATCHDOG_CORE + help + Watchdog driver for the xps_timebase_wdt ip core. + + To compile this driver as a module, choose M here: the + module will be called of_xilinx_wdt. + # ALPHA Architecture # ARM Architecture @@ -1022,19 +1031,6 @@ config M54xx_WATCHDOG # MicroBlaze Architecture -config XILINX_WATCHDOG - tristate "Xilinx Watchdog timer" - depends on MICROBLAZE - select WATCHDOG_CORE - ---help--- - Watchdog driver for the xps_timebase_wdt ip core. - - IMPORTANT: The xps_timebase_wdt parent must have the property - "clock-frequency" at device tree. - - To compile this driver as a module, choose M here: the - module will be called of_xilinx_wdt. - # MIPS Architecture config ATH79_WDT