From patchwork Tue Nov 20 17:19:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 10690959 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E877C1709 for ; Tue, 20 Nov 2018 17:31:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0A872ACE9 for ; Tue, 20 Nov 2018 17:31:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3E0A2AD20; Tue, 20 Nov 2018 17:31:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4416F2ACE9 for ; Tue, 20 Nov 2018 17:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XKrdOnqKUVAvzDjJfzp7YNNWbOWVTowYhWpK0gobEAY=; b=YHN+Z/cHrxvBYX /7CSmlOd9FvqO4ki+daDPakYep4K2wBEdT7MTEtlT1yQrz27VTMSYJSWQ4yStPHAHKg05trjwsM8i 1IZ7hiwCbW8oJA4GaTj5z9pwcW4LfzSf/ic0ZBsrRLQO4xCTljjKnF0KSBW7idBN4PXYm85SUH1AQ /l0+wIS5I2LqQwGFO+Sn9mo+gq92w3f1NDVbXeY14S+TgDb5LGkFmDLFDzMG9urXggsAdhbC6uQQd 4/oS+mTj/fpjottzTk5fjVKoC+Mlqwo3G49fLQ9C3TQlWZmN1kQxv2S+FHO5kHs6GjVSCkIBLNba3 DInvI2PGfaxnS+qO6mOg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP9qC-0004NJ-QT; Tue, 20 Nov 2018 17:29:36 +0000 Received: from anholt.net ([50.246.234.109]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP9q1-0004HZ-EQ; Tue, 20 Nov 2018 17:29:31 +0000 Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 1CCC710A162F; Tue, 20 Nov 2018 09:20:06 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at anholt.net Received: from anholt.net ([127.0.0.1]) by localhost (kingsolver.anholt.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id WOvex56wzHwU; Tue, 20 Nov 2018 09:20:04 -0800 (PST) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 3E36B10A0B73; Tue, 20 Nov 2018 09:20:01 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 0B05D2FE1FE5; Tue, 20 Nov 2018 09:20:00 -0800 (PST) From: Eric Anholt To: Florian Fainelli , Rob Herring , Mark Rutland , Wim Van Sebroeck , Guenter Roeck , linux-watchdog@vger.kernel.org Subject: [PATCH 1/8] watchdog: bcm2835: Move the driver to the soc/ directory. Date: Tue, 20 Nov 2018 09:19:53 -0800 Message-Id: <20181120172000.15102-2-eric@anholt.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181120172000.15102-1-eric@anholt.net> References: <20181120172000.15102-1-eric@anholt.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_092925_517804_CC38383C X-CRM114-Status: GOOD ( 14.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , linux-kernel@vger.kernel.org, Eric Anholt , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The binding for the bcm2835 "wdt" actually covers a large range of the PM block's register space. The WDT is not a separate HW block from the rest of power domain management, so move the driver to the soc/ directory in preparation for expanding its role to cover power domains. This move does result in the driver being made mandatory for the BCM2835 platform, which is probably actually reasonable given that it's necessary for reboot/halt support. Signed-off-by: Eric Anholt --- drivers/soc/bcm/Makefile | 1 + .../{watchdog/bcm2835_wdt.c => soc/bcm/bcm2835-pm.c} | 0 drivers/watchdog/Kconfig | 11 ----------- drivers/watchdog/Makefile | 1 - 4 files changed, 1 insertion(+), 12 deletions(-) rename drivers/{watchdog/bcm2835_wdt.c => soc/bcm/bcm2835-pm.c} (100%) diff --git a/drivers/soc/bcm/Makefile b/drivers/soc/bcm/Makefile index dc4fced72d21..16504eb694b1 100644 --- a/drivers/soc/bcm/Makefile +++ b/drivers/soc/bcm/Makefile @@ -1,2 +1,3 @@ +obj-$(CONFIG_ARCH_BCM2835) += bcm2835-pm.o obj-$(CONFIG_RASPBERRYPI_POWER) += raspberrypi-power.o obj-$(CONFIG_SOC_BRCMSTB) += brcmstb/ diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/soc/bcm/bcm2835-pm.c similarity index 100% rename from drivers/watchdog/bcm2835_wdt.c rename to drivers/soc/bcm/bcm2835-pm.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 2d64333f4782..796e2a593056 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1573,17 +1573,6 @@ config BCM63XX_WDT To compile this driver as a loadable module, choose M here. The module will be called bcm63xx_wdt. -config BCM2835_WDT - tristate "Broadcom BCM2835 hardware watchdog" - depends on ARCH_BCM2835 || (OF && COMPILE_TEST) - select WATCHDOG_CORE - help - Watchdog driver for the built in watchdog hardware in Broadcom - BCM2835 SoC. - - To compile this driver as a loadable module, choose M here. - The module will be called bcm2835_wdt. - config BCM_KONA_WDT tristate "BCM Kona Watchdog" depends on ARCH_BCM_MOBILE || COMPILE_TEST diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index f69cdff5ad7f..1788537e85af 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -70,7 +70,6 @@ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o -obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o obj-$(CONFIG_SIRFSOC_WATCHDOG) += sirfsoc_wdt.o obj-$(CONFIG_ST_LPC_WATCHDOG) += st_lpc_wdt.o