From patchwork Fri Apr 3 08:20:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 6154331 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 02AF4BF4A6 for ; Fri, 3 Apr 2015 08:24:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A297203C4 for ; Fri, 3 Apr 2015 08:24:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 37C3B203DB for ; Fri, 3 Apr 2015 08:24:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ydwr5-0001Oc-23; Fri, 03 Apr 2015 08:21:31 +0000 Received: from mailout4.w1.samsung.com ([210.118.77.14]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ydwqs-0001Cm-TS for linux-arm-kernel@lists.infradead.org; Fri, 03 Apr 2015 08:21:20 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NM800DOS21C9T90@mailout4.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 03 Apr 2015 09:24:48 +0100 (BST) X-AuditID: cbfec7f4-b7f126d000001e9a-c2-551e4cb7ad74 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 62.48.07834.7BC4E155; Fri, 03 Apr 2015 09:17:59 +0100 (BST) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NM8004Y81UOV040@eusync2.samsung.com>; Fri, 03 Apr 2015 09:20:51 +0100 (BST) From: Krzysztof Kozlowski To: Kukjin Kim , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] ARM: dts: Enable S3C RTC on Trats2 and Arndale Octa Date: Fri, 03 Apr 2015 10:20:44 +0200 Message-id: <1428049244-1152-2-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1428049244-1152-1-git-send-email-k.kozlowski@samsung.com> References: <1428049244-1152-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkluLIzCtJLcpLzFFi42I5/e/4Fd3tPnKhBuv2aFnMP3KO1eLo7wKL 1y8MLfofv2a22PT4GqvF5V1z2CxmnN/HZPHyyA9Gi7VH7rI7cHr8fX6dxePWnXqPTas62Tw2 L6n36NuyitHj8ya5ALYoLpuU1JzMstQifbsErox9t18wF5yVqFjeuoG1gXG7SBcjJ4eEgInE 6Wk32SBsMYkL99YD2VwcQgJLGSUaWx9BOX1MEqc/zmcCqWITMJbYvHwJWIeIwApGiYtNliBF zAInGCXe7D7LApIQFvCWuHHsACOIzSKgKrH18RSgZg4OXgE3iaY3GRDb5CROHpvMCmJzCrhL 9Kx8zwxiCwGVfDy8imkCI+8CRoZVjKKppckFxUnpuYZ6xYm5xaV56XrJ+bmbGCHB9mUH4+Jj VocYBTgYlXh4HapkQ4VYE8uKK3MPMUpwMCuJ8K7YDRTiTUmsrEotyo8vKs1JLT7EyMTBKdXA qMD8e+btnGuiQdpn5b7m/475efzO/+u5cpO2ywf433FK2jTt6kUt/ucSVx8GpglrLS4uYn5Z 51rLe+1k3tPVSw4efd99w8vgjMxn7WA1DZGrd51Enh1+1lkoYX/Iqzjh78VnS2v1gqWedy5e puT3MVTdotPqe5G9Xaoxu2iSjPqEfZ+/d/e5KbEUZyQaajEXFScCABCB1jsUAgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150403_012119_110396_C9FE016E X-CRM114-Status: GOOD ( 10.71 ) X-Spam-Score: -5.0 (-----) Cc: Markus Reichl , Krzysztof Kozlowski , Javier Martinez Canillas , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Extend the S3C RTC node with rtc_src clock so it could be operational. The rtc_src clock is provided by MAX77686 (Trats2) or S2MPS11 (Arndale Octa). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Javier Martinez Canillas --- Patch depends on new file "dt-bindings/clock/samsung,s2mps11.h" from: 1. ARM: dts: Add bindings for 32kHz clocks from s2mps11 http://www.spinics.net/lists/linux-samsung-soc/msg43345.html Changes since v1: 1. Add Javier's reviewed-by. 2. Do not fix Odroid-U3 because Markus Reichl posted fix already: http://www.spinics.net/lists/linux-samsung-soc/msg43108.html --- arch/arm/boot/dts/exynos4.dtsi | 2 +- arch/arm/boot/dts/exynos4412-trats2.dts | 9 ++++++++- arch/arm/boot/dts/exynos5420-arndale-octa.dts | 11 +++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 8ea2e374acaf..95efdf805f20 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -266,7 +266,7 @@ status = "disabled"; }; - rtc@10070000 { + rtc: rtc@10070000 { compatible = "samsung,s3c6410-rtc"; reg = <0x10070000 0x100>; interrupt-parent = <&pmu_system_controller>; diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index 173ffa479ad3..c032cde11d5c 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts @@ -16,6 +16,7 @@ #include "exynos4412.dtsi" #include #include +#include / { model = "Samsung Trats 2 based on Exynos4412"; @@ -214,7 +215,7 @@ pinctrl-names = "default"; status = "okay"; - max77686_pmic@09 { + max77686: max77686_pmic@09 { compatible = "maxim,max77686"; interrupt-parent = <&gpx0>; interrupts = <7 0>; @@ -1304,3 +1305,9 @@ PIN_SLP(gpv4-0, INPUT, DOWN); }; }; + +&rtc { + status = "okay"; + clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>; + clock-names = "rtc", "rtc_src"; +}; diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts index b82b6fa15f48..d78fcd997ce6 100644 --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts @@ -13,6 +13,7 @@ #include "exynos5420.dtsi" #include #include +#include / { model = "Insignal Arndale Octa evaluation board based on EXYNOS5420"; @@ -38,10 +39,6 @@ }; }; - rtc@101E0000 { - status = "okay"; - }; - codec@11000000 { samsung,mfc-r = <0x43000000 0x800000>; samsung,mfc-l = <0x51000000 0x800000>; @@ -376,3 +373,9 @@ &cci { status = "disabled"; }; + +&rtc { + status = "okay"; + clocks = <&clock CLK_RTC>, <&s2mps11_osc S2MPS11_CLK_AP>; + clock-names = "rtc", "rtc_src"; +};