From patchwork Wed Nov 27 11:50:10 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: 3247441 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EAAA19F526 for ; Wed, 27 Nov 2013 11:47:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE29E2010A for ; Wed, 27 Nov 2013 11:47:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A1C22012E for ; Wed, 27 Nov 2013 11:47:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754379Ab3K0LrQ (ORCPT ); Wed, 27 Nov 2013 06:47:16 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:20811 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752650Ab3K0LrN (ORCPT ); Wed, 27 Nov 2013 06:47:13 -0500 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MWX0020C7ENER80@mailout2.samsung.com>; Wed, 27 Nov 2013 20:47:11 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.125]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id DB.15.21927.FBBD5925; Wed, 27 Nov 2013 20:47:11 +0900 (KST) X-AuditID: cbfee68d-b7f1a6d0000055a7-9d-5295dbbfb8d6 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 33.7E.32308.EBBD5925; Wed, 27 Nov 2013 20:47:11 +0900 (KST) Received: from chrome-server.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 <0MWX00K4W7E6P270@mmp1.samsung.com>; Wed, 27 Nov 2013 20:47:10 +0900 (KST) From: Leela Krishna Amudala To: linux-samsung-soc@vger.kernel.org, wim@iguana.be Cc: dianders@chromium.org, kgene.kim@samsung.com, t.figa@samsung.com, devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org, cpgs@samsung.com, linux@roeck-us.net Subject: [PATCH V10 3/3] ARM: dts: update watchdog device nodes for Exynos5250 and Exynos5420 Date: Wed, 27 Nov 2013 17:20:10 +0530 Message-id: <1385553010-30183-4-git-send-email-l.krishna@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1385553010-30183-1-git-send-email-l.krishna@samsung.com> References: <1385553010-30183-1-git-send-email-l.krishna@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRmVeSWpSXmKPExsWyRsSkVnf/7alBBt1b+CxeHtK0mH/kHKvF 2WUH2Sx6F1xls5hxfh+TxY11+9gtniw8w2SxfsZrFotbM16wOnB6zG64yOJxbbOYx87vDewe fVtWMXp83iQXwBrFZZOSmpNZllqkb5fAlXFm7i3mgk3CFQc6JrI2MH7k72Lk5JAQMJFo6jjF BGGLSVy4t56ti5GLQ0hgKaPEh9WTGWGKnq3/zw6RWMQo8eXkKWaQhJBAL5PEyn/+IDabgLHE /bmbwSaJADVcn3sGbBKzwCpGiXXrjoJNEhaIl1jcOJEdxGYRUJV48fgPWJxXwFXiSdN/Zoht ihLdzyawgdicAm4SO1ZeBBrKAbTMVeLhPDmQmRIC69glXvz4zQQxR0Di2+RDLCA1EgKyEpsO QI2RlDi44gbLBEbhBYwMqxhFUwuSC4qT0osM9YoTc4tL89L1kvNzNzECw/70v2e9OxhvH7A+ xJgMNG4is5Rocj4wbvJK4g2NzYwsTE1MjY3MLc1IE1YS5016mBQkJJCeWJKanZpakFoUX1Sa k1p8iJGJg1OqgdFe2OBmC6PvQ8PUrKWe3PdKL02M7JZ/H3v3gqHLZ+M3+ZpNzlyG9jOUnT9m vP2s6PC74l3w6w5NToa+55O73RXP7X8v/W2LXGp8mv+rbJHsJpE3/iWH4v97XYlR/89g8v8g ZyrzcfGbLK9zWdncVrpv/6B/JuJHftieVT+NFxl+O3Vd4PPsECWW4oxEQy3mouJEAN9513CR AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNIsWRmVeSWpSXmKPExsVy+t9jAd39t6cGGXRfZLF4eUjTYv6Rc6wW Z5cdZLPoXXCVzWLG+X1MFjfW7WO3eLLwDJPF+hmvWSxuzXjB6sDpMbvhIovHtc1iHju/N7B7 9G1ZxejxeZNcAGtUA6NNRmpiSmqRQmpecn5KZl66rZJ3cLxzvKmZgaGuoaWFuZJCXmJuqq2S i0+ArltmDtA9SgpliTmlQKGAxOJiJX07TBNCQ9x0LWAaI3R9Q4LgeowM0EDCGsaMM3NvMRds Eq440DGRtYHxI38XIyeHhICJxLP1/9khbDGJC/fWs3UxcnEICSxilPhy8hQzSEJIoJdJYuU/ fxCbTcBY4v7czUwgtghQ8/W5Z8AamAVWMUqsW3eUESQhLBAvsbhxIthUFgFViReP/4DFeQVc JZ40/WeG2KYo0f1sAhuIzSngJrFj5UWgoRxAy1wlHs6Tm8DIu4CRYRWjaGpBckFxUnquoV5x Ym5xaV66XnJ+7iZGcFQ9k9rBuLLB4hCjAAejEg/vhMtTgoRYE8uKK3MPMUpwMCuJ8GaenBok xJuSWFmVWpQfX1Sak1p8iDEZ6KiJzFKiyfnAiM8riTc0NjE3NTa1NLEwMbMkTVhJnPdAq3Wg kEB6YklqdmpqQWoRzBYmDk6pBsbw2qSEV7tmcQaYbPj1T7RpaeERbS+zdSnT9q20O9Bg8fAF i8lOu22yx6R1/i5iN1ewWqAvYeUa1yH69nug6hM9ztmiVbxXbp8X++NWwaS61cTe7dj9S521 6Yu3vnKNbnI+sH9qX86G+pciHvezXlrt+RPIOH2jM0tgy9J5HgV+S64XXLhv+USJpTgj0VCL uag4EQC8/ll97gIAAA== 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 In Exynos5 series SoCs, PMU has registers to enable/disable mask/unmask watchdog timer which is not the case with s3c series SoCs so, there is a need to have different compatible names for watchdog to handle these pmu registers access. Hence this patch removes watchdog node from Exynos5.dtsi common file and make it separate by updating existing node in Exynos5250 and adding new node to Exynos5420. This patch also makes the watchdog node enabled by default Signed-off-by: Leela Krishna Amudala Reviewed-by: Tomasz Figa Reviewed-by: Doug Anderson Tested-by: Doug Anderson --- arch/arm/boot/dts/exynos5.dtsi | 7 ------- arch/arm/boot/dts/exynos5250.dtsi | 6 +++++- arch/arm/boot/dts/exynos5420.dtsi | 9 +++++++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index 074739d..de6a606 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -102,13 +102,6 @@ status = "disabled"; }; - watchdog { - compatible = "samsung,s3c2410-wdt"; - reg = <0x101D0000 0x100>; - interrupts = <0 42 0>; - status = "disabled"; - }; - fimd@14400000 { compatible = "samsung,exynos5250-fimd"; interrupt-parent = <&combiner>; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 2f264ad..54df046 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -168,9 +168,13 @@ reg = <0x10040000 0x5000>; }; - watchdog { + watchdog@101D0000 { + compatible = "samsung,exynos5250-wdt"; + reg = <0x101D0000 0x100>; + interrupts = <0 42 0>; clocks = <&clock 336>; clock-names = "watchdog"; + samsung,syscon-phandle = <&pmu_syscon>; }; g2d@10850000 { diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 06e97a7..f5a0076 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -315,4 +315,13 @@ compatible = "samsung,exynos5420-pmu", "syscon"; reg = <0x10040000 0x5000>; }; + + watchdog@101D0000 { + compatible = "samsung,exynos5420-wdt"; + reg = <0x101D0000 0x100>; + interrupts = <0 42 0>; + clocks = <&clock 316>; + clock-names = "watchdog"; + samsung,syscon-phandle = <&pmu_syscon>; + }; };