From patchwork Wed Jul 24 09:38:19 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: 2832611 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 97B38C0319 for ; Wed, 24 Jul 2013 09:16:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CB60720189 for ; Wed, 24 Jul 2013 09:16:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52713201B2 for ; Wed, 24 Jul 2013 09:16:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751727Ab3GXJQM (ORCPT ); Wed, 24 Jul 2013 05:16:12 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:36807 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474Ab3GXJQM (ORCPT ); Wed, 24 Jul 2013 05:16:12 -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 <0MQF00ER3OBO1W80@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 24 Jul 2013 18:15:38 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.122]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 7E.EF.29708.A3B9FE15; Wed, 24 Jul 2013 18:15:38 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-2b-51ef9b3ac9ac Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 0C.08.31505.A3B9FE15; Wed, 24 Jul 2013 18:15:38 +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 <0MQF00H0OODQGV30@mmp1.samsung.com>; Wed, 24 Jul 2013 18:15:38 +0900 (KST) From: Leela Krishna Amudala To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, dianders@chromium.org, jg1.han@samsung.com, t.figa@samsung.com, sachin.kamat@linaro.org Subject: [PATCH 3/3] ARM: dts: exynos: add PMU registers addresses and mask bit to watchdog node Date: Wed, 24 Jul 2013 15:08:19 +0530 Message-id: <1374658699-3961-4-git-send-email-l.krishna@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1374658699-3961-1-git-send-email-l.krishna@samsung.com> References: <1374658699-3961-1-git-send-email-l.krishna@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRmVeSWpSXmKPExsWyRsSkStdq9vtAg//bpC3OLjvIZnF54SVW i94FV9ksZpzfx2Rx8k8vo8X6Ga9ZHNg8ZjdcZPG4c20Pm0ffllWMHp83yQWwRHHZpKTmZJal FunbJXBlTHzezV4wl7Ni854XzA2M59m7GDk5JARMJPbfaGWDsMUkLtxbD2RzcQgJLGWUOHD/ CBtM0bFHJ5hBbCGBRYwSsw4FQBTNZpJ482k12CQ2AWOJ+3M3M4HYIgKqEp/bFoDFmQVKJE7N mgNmCwskSUzaswBsKAtQzf3G92D1vAIuEod+XGKEWKYo0f1sAlgNp4CrxPsLh6EWu0icPfOD HWSxhEA7u8SsCddYIAYJSHybfAjI5gBKyEpsOsAMMUdS4uCKGywTGIUXMDKsYhRNLUguKE5K LzLRK07MLS7NS9dLzs/dxAgM6dP/nk3YwXjvgPUhxmSgcROZpUST84ExkVcSb2hsZmRhamJq bGRuaUaasJI4r3qLdaCQQHpiSWp2ampBalF8UWlOavEhRiYOTqkGxq61mXuvuXva5G3rEi3Z JuHbyjozdbH90gb5wONPlzVc1J1/yJRlXtT/dQ6XL+xzemO4my9/hZiLa9pxvR2as+88TO7L fvNrxZXdyprnj3PwlCp2T92VqmB99Oo1v7qeX7OyZz8OFeH3aEg+4Wq9ZoXye92np7dPXR1e Vm0yIdX9j/+bBQkrPyqxFGckGmoxFxUnAgCEy8AofwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJIsWRmVeSWpSXmKPExsVy+t9jAV2r2e8DDd6cFrQ4u+wgm8XlhZdY LXoXXGWzmHF+H5PFyT+9jBbrZ7xmcWDzmN1wkcXjzrU9bB59W1YxenzeJBfAEtXAaJORmpiS WqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtF1JoSwxpxQoFJBY XKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjDmDHxeTd7wVzOis17XjA3MJ5n72Lk5JAQMJE4 9ugEM4QtJnHh3no2EFtIYBGjxKxDAV2MXED2bCaJN59WgzWwCRhL3J+7mQnEFhFQlfjctgAs zixQInFq1hwwW1ggSWLSngVgg1iAau43vger5xVwkTj04xIjxDJFie5nE8BqOAVcJd5fOMwM sdhF4uyZH+wTGHkXMDKsYhRNLUguKE5KzzXSK07MLS7NS9dLzs/dxAiOmGfSOxhXNVgcYhTg YFTi4S2Y9S5QiDWxrLgy9xCjBAezkghvy7T3gUK8KYmVValF+fFFpTmpxYcYk4GumsgsJZqc D4zmvJJ4Q2MTc1NjU0sTCxMzS9KElcR5D7ZaBwoJpCeWpGanphakFsFsYeLglGpgzFe6KxSj ssaCw22u3knXnZMnT+G7vVJjgcbfHb6zjrcxz9GMUJE6pmnhFsC6Of+aTfP6iQHpnT1ttfv/ /by6a26fuOJjnyVhOy6uqAz2kTUVnRa9bi6XwKeD2XkHmk/YNfb9XmYUflJD84gaI/eVO8a6 nZ6bd95xlb51xeBUX9KJd/pX6ietVGIpzkg01GIuKk4EAJYCe0jcAgAA 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=-6.9 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/exynos5420.dtsi | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index f65e124..4d63b74 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -104,7 +104,7 @@ watchdog { 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/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index e1d2d20..ea5b49f 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -150,5 +150,6 @@ clocks = <&clock 316>; clock-names = "watchdog"; status = "okay"; + reset-mask-bit = <0>; }; };