From patchwork Thu Nov 28 04:34:03 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: 3251861 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 B5FBDC045B for ; Thu, 28 Nov 2013 04:31:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA9E02061C for ; Thu, 28 Nov 2013 04:31:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2EF52061B for ; Thu, 28 Nov 2013 04:31:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758631Ab3K1EbO (ORCPT ); Wed, 27 Nov 2013 23:31:14 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:51697 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932372Ab3K1EbM (ORCPT ); Wed, 27 Nov 2013 23:31:12 -0500 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MWY0038DHVNYK80@mailout3.samsung.com>; Thu, 28 Nov 2013 13:30:59 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 67.23.21927.307C6925; Thu, 28 Nov 2013 13:30:59 +0900 (KST) X-AuditID: cbfee68d-b7f1a6d0000055a7-9d-5296c703a8d6 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 5F.54.31284.307C6925; Thu, 28 Nov 2013 13:30:59 +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 <0MWY00FFTHVCUMY0@mmp1.samsung.com>; Thu, 28 Nov 2013 13:30:59 +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 V11 3/3] ARM: dts: update watchdog device nodes for Exynos5250 and Exynos5420 Date: Thu, 28 Nov 2013 10:04:03 +0530 Message-id: <1385613243-3559-4-git-send-email-l.krishna@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1385613243-3559-1-git-send-email-l.krishna@samsung.com> References: <1385613243-3559-1-git-send-email-l.krishna@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRmVeSWpSXmKPExsWyRsSkVpf5+LQgg/+b5S1eHtK0mH/kHKvF 2WUH2Sx6F1xls5hxfh+TxY11+9gtniw8w2SxfsZrFotbM16wOnB6zG64yOJxbbOYx87vDewe fVtWMXp83iQXwBrFZZOSmpNZllqkb5fAlXFm7i3mgk3CFQc6JrI2MH7k72Lk4JAQMJE4Pcmw i5ETyBSTuHBvPVsXIxeHkMBSRonH868xQSRMJKYtXMoKkVjEKLH71Ep2CKeXSWL/5vlsIFVs AsYS9+duBusQAeq4PvcM2ChmgVWMEuvWHWUESQgLxEtMXPOADWQ1i4CqxM29uSBhXgEXiQN9 /WwQ2xQlup9NACvhFHCVOL9MDCQsBFSy6OZMJpCREgLL2CXe/+4A28UiICDxbfIhFohvZCU2 HWCGGCMpcXDFDZYJjMILGBlWMYqmFiQXFCelFxnqFSfmFpfmpesl5+duYgQG/el/z3p3MN4+ YH2IMRlo3ERmKdHkfGDU5JXEGxqbGVmYmpgaG5lbmpEmrCTOm/QwKUhIID2xJDU7NbUgtSi+ qDQntfgQIxMHp1QDY/3552ufHP7TOUGdtfNv0v+GLdtMPnpe+C1x8vlZ5uWh/Y0dxase209r lO7dWHtBaIG/itv2npxtBnknPCT5Tb3XRqTcPt1VwfFfV/yCR+qHrEABeT1d29L6K063Lvk6 LFFc8ELgGLOHzn2HOMYYjalxliw7Hh+NPaMh2Op14qzv+oi8+FJjJZbijERDLeai4kQAMGD2 JJACAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNIsWRmVeSWpSXmKPExsVy+t9jAV3m49OCDOasFrN4eUjTYv6Rc6wW Z5cdZLPoXXCVzWLG+X1MFjfW7WO3eLLwDJPF+hmvWSxuzXjB6sDpMbvhIovHtc1iHju/N7B7 9G1ZxejxeZNcAGtUA6NNRmpiSmqRQmpecn5KZl66rZJ3cLxzvKmZgaGuoaWFuZJCXmJuqq2S i0+ArltmDtA9SgpliTmlQKGAxOJiJX07TBNCQ9x0LWAaI3R9Q4LgeowM0EDCGsaMM3NvMRds Eq440DGRtYHxI38XIyeHhICJxLSFS1khbDGJC/fWs3UxcnEICSxilNh9aiU7hNPLJLF/83w2 kCo2AWOJ+3M3M4HYIkDd1+eeAetgFljFKLFu3VFGkISwQLzExDUPgBIcHCwCqhI39+aChHkF XCQO9PWzQWxTlOh+NgGshFPAVeL8MjGQsBBQyaKbM5kmMPIuYGRYxSiaWpBcUJyUnmukV5yY W1yal66XnJ+7iREcVc+kdzCuarA4xCjAwajEwyuhMy1IiDWxrLgy9xCjBAezkgivQjFQiDcl sbIqtSg/vqg0J7X4EGMy0E0TmaVEk/OBEZ9XEm9obGJuamxqaWJhYmZJmrCSOO/BVutAIYH0 xJLU7NTUgtQimC1MHJxSDYxtLbaBD9MaWO+pmHYUN5a9veGkqmxc6FIr9LUgIp1RZe2XeVoZ S74EnTAJMWGR4Qi4lu3m517tNqn7ciXP+wZvty1Bv8SzxPj2x827L2wew31FX+ymsyWTS1qD kuwUy0kvjjAcDTA+oaRrr2h76s359ec6Ra7xnBWa/lDhY9/KkFW7k/9IKLEUZyQaajEXFScC ANXltbvuAgAA 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>; + }; };