From patchwork Wed Dec 12 23:51:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 10727381 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 EF3B514BD for ; Wed, 12 Dec 2018 23:52:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDF412B2C4 for ; Wed, 12 Dec 2018 23:52:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0DBA2B46F; Wed, 12 Dec 2018 23:52:27 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 66CA32B2C4 for ; Wed, 12 Dec 2018 23:52:27 +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=dT3RPcEDme5Pyqfm+Jv6ntTU25fuJslh/DZFQFw+mkc=; b=RkU+12YM+XWjnC aOqdmcLn7v6CNxzdG94C0l3OzHHtGKXSP3gtvR6wjZXqUDbdYuHzwiYiTccB48zTFiVnkjnX33T0k sxfsclV2PYOsdiEK5b5MByA48bfzEzA/9DiIaYtwjiurDyimNjiZ3c32mcst7G70TyIFhAEYSTU8s Dj/r6Cgtxfj5ypowYWPqJ/67qP+34vInbtOHjhUCRy4Q3+c0t3wT/vGz3QmpiQZjcEIo4BLWgsb4Z xe1eptjH+h5MQ3n0fVeXaHx1SFiU61R6y89AMxF0Oz1ILpPIq1Ar5sM7iIwDgPtWF87tvu9RSkImS xu1K0DYn6WOv2Bvs+YhQ==; 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 1gXEIi-0000b4-BI; Wed, 12 Dec 2018 23:52:24 +0000 Received: from anholt.net ([50.246.234.109]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gXEIS-0000IA-7q; Wed, 12 Dec 2018 23:52:10 +0000 Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 5274110A1DB2; Wed, 12 Dec 2018 15:51:53 -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 L90MOFdNcoqB; Wed, 12 Dec 2018 15:51:51 -0800 (PST) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 4811110A1D6F; Wed, 12 Dec 2018 15:51:51 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 3F86C2FE36F0; Wed, 12 Dec 2018 15:51:50 -0800 (PST) From: Eric Anholt To: Florian Fainelli , linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, Guenter Roeck , Wim Van Sebroeck , Lee Jones , Stefan Wahren , Mark Rutland , Rob Herring Subject: [PATCH v4 4/5] ARM: bcm283x: Extend the WDT DT node out to cover the whole PM block. (v4) Date: Wed, 12 Dec 2018 15:51:49 -0800 Message-Id: <20181212235150.6491-5-eric@anholt.net> X-Mailer: git-send-email 2.20.0.rc1 In-Reply-To: <20181212235150.6491-1-eric@anholt.net> References: <20181212235150.6491-1-eric@anholt.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181212_155208_306273_624BC9C1 X-CRM114-Status: GOOD ( 12.44 ) 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: Eric Anholt , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.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 It was covering part of the PM block's range, up to the WDT regs. To support the rest of the PM block's functionality, we need the full register range plus the AXI Async Bridge regs for PM sequencing. This doesn't convert any of the consumers over to the new binding yet, since we will need to be careful in coordinating our usage of firmware services that might power domains on and off versus the bcm2835-pm driver's access of those same domains. Signed-off-by: Eric Anholt --- v4: Add the system-power-controller node. arch/arm/boot/dts/bcm283x.dtsi | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 31b29646b14c..20ed8b1da11b 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -121,8 +121,17 @@ }; watchdog@7e100000 { - compatible = "brcm,bcm2835-pm-wdt"; - reg = <0x7e100000 0x28>; + compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; + #power-domain-cells = <1>; + #reset-cells = <1>; + reg = <0x7e100000 0x114>, + <0x7e00a000 0x24>; + clocks = <&clocks BCM2835_CLOCK_V3D>, + <&clocks BCM2835_CLOCK_PERI_IMAGE>, + <&clocks BCM2835_CLOCK_H264>, + <&clocks BCM2835_CLOCK_ISP>; + clock-names = "v3d", "peri_image", "h264", "isp"; + system-power-controller; }; clocks: cprman@7e101000 {