From patchwork Wed Jun 1 09:45:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 9146937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0C9E660777 for ; Wed, 1 Jun 2016 09:48:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F023B25819 for ; Wed, 1 Jun 2016 09:48:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4719269CB; Wed, 1 Jun 2016 09:48:52 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8557B25819 for ; Wed, 1 Jun 2016 09:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757727AbcFAJsj (ORCPT ); Wed, 1 Jun 2016 05:48:39 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:65080 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757138AbcFAJsg (ORCPT ); Wed, 1 Jun 2016 05:48:36 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O830005Z78UXU70@mailout3.w1.samsung.com>; Wed, 01 Jun 2016 10:48:30 +0100 (BST) X-AuditID: cbfec7f4-f796c6d000001486-e2-574eaf6e4417 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 7B.11.05254.E6FAE475; Wed, 1 Jun 2016 10:48:30 +0100 (BST) Received: from AMDC2174.DIGITAL.local ([106.120.53.17]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O8300GFP78QSC00@eusync3.samsung.com>; Wed, 01 Jun 2016 10:48:30 +0100 (BST) From: Krzysztof Kozlowski To: Kukjin Kim , Krzysztof Kozlowski , Sylwester Nawrocki , Tomasz Figa , Michael Turquette , Stephen Boyd , Javier Martinez Canillas , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz Subject: [PATCH 3/3] ARM: dts: exynos: Add watchdog amd Security SubSystem to Exynos5410 Date: Wed, 01 Jun 2016 11:45:51 +0200 Message-id: <1464774351-23604-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1464774351-23604-1-git-send-email-k.kozlowski@samsung.com> References: <1464774351-23604-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLLMWRmVeSWpSXmKPExsVy+t/xq7p56/3CDS4e1bTYOGM9q8X8I+dY Ld68XcNk8fqFoUX/49fMFpseX2O1+Nhzj9Xi8q45bBYzzu9jsrh4ytXi8Jt2VosfZ7pZLFbt +sPowOvx/kYru8flvl4mj52z7rJ7bFrVyeaxeUm9x5Z+IK9vyypGj8+b5AI4orhsUlJzMstS i/TtErgyPl7fzFqwQaLi3L1bjA2MH4W7GDk5JARMJP5cvsEMYYtJXLi3nq2LkYtDSGApo8SV V9+hnEYmie3LHzCCVLEJGEtsXr6EDcQWEbjKLHHqkiKIzSxgIbF162p2EFtYIEpi5+mVTCA2 i4CqRN+kc6xdjBwcvALuEpP3OUEsk5M4eWwyK4jNKeAhceZ/O9hIIaCSR70vmCYw8i5gZFjF KJpamlxQnJSea6hXnJhbXJqXrpecn7uJERKoX3YwLj5mdYhRgINRiYdX4aJvuBBrYllxZe4h RgkOZiUR3jmr/MKFeFMSK6tSi/Lji0pzUosPMUpzsCiJ887d9T5ESCA9sSQ1OzW1ILUIJsvE wSnVwFjeHC3Jos1dsTtOdZuLYMjpXib5Qzt8Z5z4/tSyYiFzwwF7z9WLJMM3868zW6OtE/Ks /83W9SsNEhc/EhZyVoxwcc2U01YJNXrm9/dpMSPfzNPbxLunRgcyKpjcn/Vg74WGDV6rQl8t Ff0XcnLRsTXrLcs+ft6kV3lTMHr2gXL2De8W1e9I/qLEUpyRaKjFXFScCAAGc+/kUAIAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move watchdog and Security SubSystem nodes from exynos5420.dtsi to file shared with Exynos5410 and configure the clocks on the latter. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Javier Martinez Canillas --- arch/arm/boot/dts/exynos5410.dtsi | 11 +++++++++++ arch/arm/boot/dts/exynos5420.dtsi | 28 +++++++++++----------------- arch/arm/boot/dts/exynos54xx.dtsi | 12 ++++++++++++ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi index f1effd3f03c4..b76f56c2fe8b 100644 --- a/arch/arm/boot/dts/exynos5410.dtsi +++ b/arch/arm/boot/dts/exynos5410.dtsi @@ -297,6 +297,11 @@ clock-names = "uart", "clk_uart_baud0"; }; +&sss { + clocks = <&clock CLK_SSS>; + clock-names = "secss"; +}; + &sromc { #address-cells = <2>; #size-cells = <1>; @@ -349,4 +354,10 @@ samsung,pmureg-phandle = <&pmu_system_controller>; }; +&watchdog { + clocks = <&clock CLK_WDT>; + clock-names = "watchdog"; + samsung,syscon-phandle = <&pmu_system_controller>; +}; + #include "exynos5410-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 265747bb19d1..beb6f453039e 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -694,23 +694,6 @@ #include "exynos4412-tmu-sensor-conf.dtsi" }; - watchdog: watchdog@101D0000 { - compatible = "samsung,exynos5420-wdt"; - reg = <0x101D0000 0x100>; - interrupts = <0 42 0>; - clocks = <&clock CLK_WDT>; - clock-names = "watchdog"; - samsung,syscon-phandle = <&pmu_system_controller>; - }; - - sss: sss@10830000 { - compatible = "samsung,exynos4210-secss"; - reg = <0x10830000 0x300>; - interrupts = <0 112 0>; - clocks = <&clock CLK_SSS>; - clock-names = "secss"; - }; - sysmmu_g2dr: sysmmu@0x10A60000 { compatible = "samsung,exynos-sysmmu"; reg = <0x10A60000 0x1000>; @@ -1030,6 +1013,11 @@ clock-names = "uart", "clk_uart_baud0"; }; +&sss { + clocks = <&clock CLK_SSS>; + clock-names = "secss"; +}; + &usbdrd3_0 { clocks = <&clock CLK_USBD300>; clock-names = "usbdrd30"; @@ -1073,4 +1061,10 @@ samsung,pmureg-phandle = <&pmu_system_controller>; }; +&watchdog { + clocks = <&clock CLK_WDT>; + clock-names = "watchdog"; + samsung,syscon-phandle = <&pmu_system_controller>; +}; + #include "exynos5420-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi index 0eb8aa31b7d9..06a604911e87 100644 --- a/arch/arm/boot/dts/exynos54xx.dtsi +++ b/arch/arm/boot/dts/exynos54xx.dtsi @@ -74,6 +74,18 @@ }; }; + watchdog: watchdog@101d0000 { + compatible = "samsung,exynos5420-wdt"; + reg = <0x101d0000 0x100>; + interrupts = <0 42 0>; + }; + + sss: sss@10830000 { + compatible = "samsung,exynos4210-secss"; + reg = <0x10830000 0x300>; + interrupts = <0 112 0>; + }; + /* i2c_0-3 are defined in exynos5.dtsi */ hsi2c_4: i2c@12ca0000 { compatible = "samsung,exynos5250-hsi2c";