From patchwork Tue Sep 17 10:43:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leela Krishna Amudala X-Patchwork-Id: 2901821 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 C1AD0BFF05 for ; Tue, 17 Sep 2013 10:22:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA2C820347 for ; Tue, 17 Sep 2013 10:22:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F8C12032D for ; Tue, 17 Sep 2013 10:22:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752407Ab3IQKWc (ORCPT ); Tue, 17 Sep 2013 06:22:32 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:64178 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752479Ab3IQKWb (ORCPT ); Tue, 17 Sep 2013 06:22:31 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MT9006LKM3DXH40@mailout1.samsung.com>; Tue, 17 Sep 2013 19:22:30 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id DD.2C.31253.66D28325; Tue, 17 Sep 2013 19:22:30 +0900 (KST) X-AuditID: cbfee690-b7f3b6d000007a15-66-52382d66c8df Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id FA.6A.05832.56D28325; Tue, 17 Sep 2013 19:22:30 +0900 (KST) Received: from chromeserver-PowerEdge-T410.sisodomain.com ([107.108.73.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MT900C6GM539BA0@mmp1.samsung.com>; Tue, 17 Sep 2013 19:22:29 +0900 (KST) From: Leela Krishna Amudala To: linux-samsung-soc@vger.kernel.org Cc: wim@iguana.be, kgene.kim@samsung.com, devicetree@vger.kernel.org, t.figa@samsung.com, dianders@chromium.org, linux-watchdog@vger.kernel.org Subject: [PATCH 4/4] ARM: dts: exynos: add PMU registers addresses and mask bit to watchdog node Date: Tue, 17 Sep 2013 16:13:43 +0530 Message-id: <1379414623-26329-5-git-send-email-l.krishna@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1379414623-26329-1-git-send-email-l.krishna@samsung.com> References: <1379414623-26329-1-git-send-email-l.krishna@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrALMWRmVeSWpSXmKPExsWyRsSkVjdN1yLIoP8dl8X8I+dYLc4uO8hm 0bvgKpvFjPP7mCxurNvHbrF+xmsWi1szXrA6sHvMbrjI4nFts5hH35ZVjB6fN8kFsERx2aSk 5mSWpRbp2yVwZbw/eo+54DRPxddbRxgbGDdzdTFyckgImEi0XljBBmGLSVy4tx7I5uIQEljK KLHzxWdGmKJZy6aC2UICixglLq+UgCiazSTxfu8UsG42AWOJ+3M3M4HYIgKqEp/bFrCDFDEL TGSUuL2qhxUkISyQJNG9bgaYzQJUdPLETzCbV8BV4t7G1VBnKEp0P5sAZnMKuEn8/b0eqIYD aJurRNeGVJCZEgL97BLnWnYwQ8wRkPg2+RALSI2EgKzEpgPMEGMkJQ6uuMEygVF4ASPDKkbR 1ILkguKk9CITveLE3OLSvHS95PzcTYzA0D7979mEHYz3DlgfYkwGGjeRWUo0OR8YG3kl8YbG ZkYWpiamxkbmlmakCSuJ86q3WAcKCaQnlqRmp6YWpBbFF5XmpBYfYmTi4JRqYGRbeEXqTGmx zYcovl3ldTWfA5M+RTRfV6/IdJl1Zr207Iy2nbl/q9Xf2loZROpGzI13Nhc7KFxuPltjT/jU oO28wVy8BSpsdZZ7Uww+7THQb5PJ8z3z8FPg1EeiB9z6l3oUsX+vvFn65dyeiT6+7YLXG0qd Xy2OmcZbd2XaHvlrEgad3NaiSizFGYmGWsxFxYkALcg1p4MCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLIsWRmVeSWpSXmKPExsVy+t9jAd00XYsgg3PzmS3mHznHanF22UE2 i94FV9ksZpzfx2RxY90+dov1M16zWNya8YLVgd1jdsNFFo9rm8U8+rasYvT4vEkugCWqgdEm IzUxJbVIITUvOT8lMy/dVsk7ON453tTMwFDX0NLCXEkhLzE31VbJxSdA1y0zB+gCJYWyxJxS oFBAYnGxkr4dpgmhIW66FjCNEbq+IUFwPUYGaCBhDWPG+6P3mAtO81R8vXWEsYFxM1cXIyeH hICJxKxlUxkhbDGJC/fWs4HYQgKLGCUur5ToYuQCsmczSbzfOwUswSZgLHF/7mYmEFtEQFXi c9sCdpAiZoGJjBK3V/WwgiSEBZIkutfNALNZgIpOnvgJZvMKuErc27iaDWKbokT3swlgNqeA m8Tf3+uBajiAtrlKdG1IncDIu4CRYRWjaGpBckFxUnqukV5xYm5xaV66XnJ+7iZGcOQ8k97B uKrB4hCjAAejEg/vDCnzICHWxLLiytxDjBIczEoivKEsFkFCvCmJlVWpRfnxRaU5qcWHGJOB jprILCWanA+M6rySeENjE3NTY1NLEwsTM0vShJXEeQ+2WgcKCaQnlqRmp6YWpBbBbGHi4JRq YAz4bJEUvaTud0fMffZFSSoKHFPuOa6/uoh1fWvagXP+XGIp16fE57I+cKnemTMx3ftbRiuz JXP3ydmrujMEVaUz61ZKl8Rr7dn25PuLW4tSxdsuzNivdsZxoYHc7YBHdocOeOWZfeX+mMwc MkdqAecFe4P1d//1L2075HLIq6biY43/7EcW8UosxRmJhlrMRcWJAJkFVLDgAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 This patch adds support for specifying the pmu registers and masking bit for watchdog to enable/disable and mask/unmask the watchdog reset request. Reviewed-by: Doug Anderson Signed-off-by: Leela Krishna Amudala --- arch/arm/boot/dts/exynos5.dtsi | 2 +- arch/arm/boot/dts/exynos5250.dtsi | 1 + arch/arm/boot/dts/exynos5420.dtsi | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index a8bf0c2..e1cc6ef 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -104,7 +104,7 @@ watchdog@101D0000 { compatible = "samsung,s3c2410-wdt"; - reg = <0x101D0000 0x100>; + reg = <0x101D0000 0x100>, <0x10040408 0x4>, <0x1004040c 0x4>; interrupts = <0 42 0>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 6bb42cf..8bf28a7a 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -161,6 +161,7 @@ watchdog@101D0000 { clocks = <&clock 336>; clock-names = "watchdog"; + reset-mask-bit = <20>; status = "okay"; }; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 9fadc23..29235ea 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -189,6 +189,7 @@ watchdog@101D0000 { clocks = <&clock 316>; clock-names = "watchdog"; + reset-mask-bit = <0>; status = "okay"; };