From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 01 Dec 2015 14:12:13 +0100 (CET) Received: from proxima.lp0.eu ([81.2.80.65]:54183 "EHLO proxima.lp0.eu" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27008078AbbLANMLXXPYd (ORCPT ); Tue, 1 Dec 2015 14:12:11 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=fire.lp0.eu; s=exim; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:Cc:References:To:Subject; bh=ut9AeWHnVfgjUQjcQQYxgKq7hCN3CHRrYq4WJU0BjQE=; b=uHSpNAZuImya5ho4+YhCEIw+7vzmWTE0ZctzdHyibJItXgSO/jYtiJU4lDW4CMc5r/xfnLoJEVXmqdWnA8bpxqLmhVMr/LFCxB8scnCo1ceIf965A3tTtF0iBL0iwoN87003QmRZz2zSTko5La8t4jjZdn977d5JQuHFhlVxSapbLzU425g1cwrM2nGG4dlWr7xIqKmh8qnhHRoppa04gi7o5MCsuKE3MWcbqz2LSEXtMV0cqG6uDxAQku63tWybxP/Gxy9jzqcXbkqWlVjg3i34OaihpTL9iP6ITaZIT3Vrt9J8nvh7qIqnSPpiaM0IInQhZrLGs68Gv1sG/C7M/A==; Received: from redrum.lp0.eu ([2001:8b0:ffea:0:2e0:81ff:fe4d:2bec]:45596 ident=simon) by proxima.lp0.eu ([2001:8b0:ffea:0:205:b4ff:fe12:530]:465) with esmtpsav (UNKNOWN:DHE-RSA-AES256-SHA:256/CN=Simon Arlott) id 1a3kis-00005r-LR (Exim); Tue, 01 Dec 2015 13:11:59 +0000 Subject: [PATCH 11/11] watchdog: bcm63xx_wdt: Use brcm,bcm6345-wdt device tree binding To: Guenter Roeck , Thomas Gleixner References: <565D9A40.60409@simon.arlott.org.uk> Cc: Florian Fainelli , MIPS Mailing List , Jonas Gorski , "devicetree@vger.kernel.org" , Ralf Baechle , Jason Cooper , Marc Zyngier , Kevin Cernekee , Wim Van Sebroeck , Maxime Bizon , Linux Kernel Mailing List , linux-watchdog@vger.kernel.org, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala From: Simon Arlott Message-ID: <565D9C9D.2050107@simon.arlott.org.uk> Date: Tue, 1 Dec 2015 13:11:57 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <565D9A40.60409@simon.arlott.org.uk> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 50262 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: simon@fire.lp0.eu Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips Add of_match_table for "brcm,bcm6345-wdt". Use a NULL clock name when not on mach-bcm63xx so that the device tree clock name does not have to be "periph". Allow the watchdog to be selected on BMIPS_GENERIC and select the BCM6345 timer interrupt handler. Signed-off-by: Simon Arlott --- drivers/watchdog/Kconfig | 3 ++- drivers/watchdog/bcm63xx_wdt.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 6815b74..0c50add 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1272,8 +1272,9 @@ config OCTEON_WDT config BCM63XX_WDT tristate "Broadcom BCM63xx hardware watchdog" - depends on BCM63XX + depends on BCM63XX || BMIPS_GENERIC select WATCHDOG_CORE + select BCM6345_L2_TIMER_IRQ if BMIPS_GENERIC help Watchdog driver for the built in watchdog hardware in Broadcom BCM63xx SoC. diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c index fa6c28b..4db4145 100644 --- a/drivers/watchdog/bcm63xx_wdt.c +++ b/drivers/watchdog/bcm63xx_wdt.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,11 @@ #define PFX KBUILD_MODNAME -#define WDT_CLK_NAME "periph" +#ifdef CONFIG_BCM63XX +# define WDT_CLK_NAME "periph" +#else +# define WDT_CLK_NAME NULL +#endif struct bcm63xx_wdt_hw { struct watchdog_device wdd; @@ -286,12 +291,19 @@ static void bcm63xx_wdt_shutdown(struct platform_device *pdev) bcm63xx_wdt_stop(&hw->wdd); } +static const struct of_device_id bcm63xx_wdt_dt_ids[] = { + { .compatible = "brcm,bcm6345-wdt" }, + {} +}; +MODULE_DEVICE_TABLE(of, bcm63xx_wdt_dt_ids); + static struct platform_driver bcm63xx_wdt_driver = { .probe = bcm63xx_wdt_probe, .remove = bcm63xx_wdt_remove, .shutdown = bcm63xx_wdt_shutdown, .driver = { .name = "bcm63xx-wdt", + .of_match_table = bcm63xx_wdt_dt_ids, } }; -- 2.1.4 -- Simon Arlott