From patchwork Tue Dec 2 08:49:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanwoo Choi X-Patchwork-Id: 5418071 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 4F0229F1C5 for ; Tue, 2 Dec 2014 08:52:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 806FC202F0 for ; Tue, 2 Dec 2014 08:52:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93C492028D for ; Tue, 2 Dec 2014 08:52:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754258AbaLBIuX (ORCPT ); Tue, 2 Dec 2014 03:50:23 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:21895 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753545AbaLBIuL (ORCPT ); Tue, 2 Dec 2014 03:50:11 -0500 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NFY0003B5VC7Q20@mailout1.samsung.com>; Tue, 02 Dec 2014 17:50:00 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.116]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 87.4F.17016.83D7D745; Tue, 02 Dec 2014 17:50:00 +0900 (KST) X-AuditID: cbfee68d-f79296d000004278-14-547d7d38d1a7 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 38.6F.20081.83D7D745; Tue, 02 Dec 2014 17:50:00 +0900 (KST) Received: from chan.10.32.193.11 ([10.252.81.195]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NFY00K6X5V9LDO1@mmp2.samsung.com>; Tue, 02 Dec 2014 17:49:59 +0900 (KST) From: Chanwoo Choi To: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kgene.kim@samsung.com, mark.rutland@arm.com, marc.zyngier@arm.com, arnd@arndb.de, olof@lixom.net, catalin.marinas@arm.com, will.deacon@arm.com, s.nawrocki@samsung.com, tomasz.figa@gmail.com, kyungmin.park@samsung.com, inki.dae@samsung.com, chanho61.park@samsung.com, geunsik.lim@samsung.com, sw0312.kim@samsung.com, jh80.chung@samsung.com, cw00.choi@samsung.com, a.kesavan@samsung.com, pankaj.dubey@samsung.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Daniel Lezcano , Thomas Gleixner Subject: [PATCH 18/19] clocksource: exynos_mct: Add the support for Exynos 64bit SoC Date: Tue, 02 Dec 2014 17:49:55 +0900 Message-id: <1417510196-6714-19-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.5.5 In-reply-to: <1417510196-6714-1-git-send-email-cw00.choi@samsung.com> References: <1417510196-6714-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsWyRsSkRNeitjbE4PZ+OYvHaxYzWfyddIzd 4v2yHkaLy/u1La5/ec5qMe+zrMX8I+dYLf5MaGWzmHR/AovFjV9trBa9C66yWZxtesNusenx NVaLy7vmsFnMOL8PaMadf2wWS69fZLI4df0zm8WirV/YLQ6/aWe1mDH5JZvF5k1TmS1W7frD aPHy4wkWBwmPNfPWMHr8/jWJ0WPnrLvsHneu7WHzeHfuHLvH5iX1HldONLF69G1ZxejxeZNc AGcUl01Kak5mWWqRvl0CV8bqf1vZCu7wVXy8fZexgXE3TxcjJ4eEgInE6e1bmSBsMYkL99az dTFycQgJLGWU2P1nFxtM0dzXH5ghEtMZJW5feAxV1cQksezwbHaQKjYBLYn9L26AdYgIOEs0 TG1kAiliFjjEIrH8bztQgoNDWCBM4l+LEkgNi4CqxMJz88B6eQVcJR6seMoOsU1BYtnymawg NidQvOtMH1hcSMBF4lfrR3aQmRICWzgk7n+4wQIxSEDi2+RDLCDzJQRkJTYdYIaYIylxcMUN lgmMwgsYGVYxiqYWJBcUJ6UXGeoVJ+YWl+al6yXn525iBEbt6X/Pencw3j5gfYhRgINRiYf3 5PmaECHWxLLiytxDjKZAGyYyS4km5wNTQ15JvKGxmZGFqYmpsZG5pZmSOK+i1M9gIYH0xJLU 7NTUgtSi+KLSnNTiQ4xMHJxSDYwlz5rvlty90+fiJL9+Sv9128baec39bVdEDdzPb2Mw1vu/ fZlH9s1dy39mtHkuqF2XKHixUWPe/JbpIX9crOqF/Z8tl51v0bNnW8w0JVX+bSIPt98LdTgi q1Q/TcaZd/K0IHe+xQ/7K3vcntgHp+y4/siDdeaG45N3srzxU9xyOcf5UeVrxedKLMUZiYZa zEXFiQCp3/0f1QIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphleLIzCtJLcpLzFFi42I5/e+xoK5FbW2IwelXIhaP1yxmsvg76Ri7 xftlPYwWl/drW1z/8pzVYt5nWYv5R86xWvyZ0MpmMen+BBaLG7/aWC16F1xlszjb9IbdYtPj a6wWl3fNYbOYcX4f0Iw7/9gsll6/yGRx6vpnNotFW7+wWxx+085qMWPySzaLzZumMlus2vWH 0eLlxxMsDhIea+atYfT4/WsSo8fOWXfZPe5c28Pm8e7cOXaPzUvqPa6caGL16NuyitHj8ya5 AM6oBkabjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKBv lRTKEnNKgUIBicXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZoIGENYwZq/9tZSu4w1fx8fZdxgbG 3TxdjJwcEgImEnNff2CGsMUkLtxbz9bFyMUhJDCdUeL2hcdQThOTxLLDs9lBqtgEtCT2v7jB BmKLCDhLNExtZAIpYhY4xCKx/G87UIKDQ1ggTOJfixJIDYuAqsTCc/PAenkFXCUerHjKDrFN QWLZ8pmsIDYnULzrTB9YXEjAReJX60f2CYy8CxgZVjGKphYkFxQnpeca6hUn5haX5qXrJefn bmIEp4RnUjsYVzZYHGIU4GBU4uE9cb4mRIg1say4MvcQowQHs5II7y/j2hAh3pTEyqrUovz4 otKc1OJDjKZAV01klhJNzgemq7ySeENjEzMjSyNzQwsjY3Mlcd4bN3NDhATSE0tSs1NTC1KL YPqYODilGhiz62Y7WTXtulK+x8y947X/72xGkw/sT/b3rXL9tN4isNxl8cHFMYY/G2adnay1 pXf1ibdquf+LbjVyXM2OS/6/QWYqc3HU3MfvDywW4PLb9C+7aObfbGN20W3C/4Vu3oheH/m0 QeCLpUujTexlwwzO0uP8qrf9RAsY/IT+rLFTV9CLU93/LV+JpTgj0VCLuag4EQDmVrPsHwMA AA== 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, 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 This patch adds the support for Exynos 64bit SoC. The delay_timer is only used for Exynos 32bit SoC. Cc: Daniel Lezcano Cc: Thomas Gleixner Cc: Kukjin Kim Cc: Mark Rutland Signed-off-by: Chanwoo Choi --- drivers/clocksource/Kconfig | 1 - drivers/clocksource/exynos_mct.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 9042060..27ef3fa 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -134,7 +134,6 @@ config CLKSRC_METAG_GENERIC config CLKSRC_EXYNOS_MCT def_bool y if ARCH_EXYNOS - depends on !ARM64 help Support for Multi Core Timer controller on Exynos SoCs. diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c index 9403061..b840ea1 100644 --- a/drivers/clocksource/exynos_mct.c +++ b/drivers/clocksource/exynos_mct.c @@ -223,6 +223,7 @@ static u64 notrace exynos4_read_sched_clock(void) return exynos4_read_count_32(); } +#if defined(CONFIG_ARM) static struct delay_timer exynos4_delay_timer; static cycles_t exynos4_read_current_timer(void) @@ -231,14 +232,17 @@ static cycles_t exynos4_read_current_timer(void) "cycles_t needs to move to 32-bit for ARM64 usage"); return exynos4_read_count_32(); } +#endif static void __init exynos4_clocksource_init(void) { exynos4_mct_frc_start(); +#if defined(CONFIG_ARM) exynos4_delay_timer.read_current_timer = &exynos4_read_current_timer; exynos4_delay_timer.freq = clk_rate; register_current_timer_delay(&exynos4_delay_timer); +#endif if (clocksource_register_hz(&mct_frc, clk_rate)) panic("%s: can't register clocksource\n", mct_frc.name);