From patchwork Mon Apr 15 14:42:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2445421 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 5DB563FD1A for ; Mon, 15 Apr 2013 14:44:46 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1URkdf-0005W4-OV; Mon, 15 Apr 2013 14:44:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1URkdL-0004ee-84; Mon, 15 Apr 2013 14:43:51 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1URkd6-0004d2-C2 for linux-arm-kernel@lists.infradead.org; Mon, 15 Apr 2013 14:43:38 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MLA004MPWWLCU00@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 15 Apr 2013 23:43:33 +0900 (KST) X-AuditID: cbfee61b-b7f076d0000034b6-10-516c1215e42f Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 8D.7A.13494.5121C615; Mon, 15 Apr 2013 23:43:33 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MLA00IP2WU8X910@mmp2.samsung.com>; Mon, 15 Apr 2013 23:43:33 +0900 (KST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/3] ARM: EXYNOS: Fix support of Exynos4210 rev0 SoC Date: Mon, 15 Apr 2013 16:42:01 +0200 Message-id: <1366036922-4103-3-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1366036922-4103-1-git-send-email-t.figa@samsung.com> References: <1366036922-4103-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrELMWRmVeSWpSXmKPExsVy+t9jQV1RoZxAg33T1Sz+TjrGbnFg9kNW i94FV9kszja9YbfY9Pgaq8WM8/uYLNYeuctusX7GaxaLYzOWMDpwevz+NYnR4861PWwem5fU e5yfsZDRo2/LKkaPz5vkAtiiuGxSUnMyy1KL9O0SuDImHr3CVrCDr+L0g/2sDYxzeboYOTgk BEwk3rTqdDFyApliEhfurWfrYuTiEBKYzihx80c/M4TTxSQx6+U0dpAqNgE1ic8Nj9hAbBEB DYkpXY/ZQYqYBZ4xSix7+YcRJCEs4C7xa8Y/MJtFQFXi7Z1lTCA2r4CjxIvZV1kg1slLPL3f BzaIU8BJ4s6ET2C2EFDN/pmNjBMYeRcwMqxiFE0tSC4oTkrPNdIrTswtLs1L10vOz93ECA65 Z9I7GFc1WBxiFOBgVOLhnaCdHSjEmlhWXJl7iFGCg1lJhPc4R06gEG9KYmVValF+fFFpTmrx IUZpDhYlcd6DrdaBQgLpiSWp2ampBalFMFkmDk6pBsaJK/qmLbNnSP9wd81Psee3MkufF+5Z lPBFoEH0v83BU3EP9FZsrJX18iq5u9bd9M6sRS+3rdpkvrlre00PX+381/WRu3f2HPyxJsnC 0rSfJcmwS0Vc//jqhltPEns5L9RluGSyiTyomb68yjmyc5MQ4wur1Mr6/ecnPJoQaNfhZSO8 u8j+1X8lluKMREMt5qLiRAAZ1/kgNQIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130415_104336_714471_0E31BFCC X-CRM114-Status: GOOD ( 10.50 ) X-Spam-Score: -7.5 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: kgene.kim@samsung.com, arnd@arndb.de, devicetree-discuss@lists.ozlabs.org, kyungmin.park@samsung.com, linux-samsung-soc@vger.kernel.org, thomas.abraham@linaro.org, Tomasz Figa , m.szyprowski@samsung.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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 This patch extends exynos_init_time() function to handle Exynos4210 rev0 SoC, which differs in availability of system timers and needs different clocksource initialization. This makes it possible to use exynos_init_time() function as init_time callback for all Exynos-based boards, including Universal_C210, which originally had to use samsung_timer_init(). Signed-off-by: Tomasz Figa Acked-by: Arnd Bergmann --- arch/arm/mach-exynos/common.c | 6 +++++- arch/arm/mach-exynos/mach-universal_c210.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index b65229d..ec596fc 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -457,7 +458,10 @@ void __init exynos_init_time(void) exynos4_clk_init(NULL); exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f); #endif - mct_init(); + if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_0) + samsung_timer_init(); + else + mct_init(); } } diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index 020e1f4..a728812 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@ -1177,7 +1177,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") .map_io = universal_map_io, .init_machine = universal_machine_init, .init_late = exynos_init_late, - .init_time = samsung_timer_init, + .init_time = exynos_init_time, .reserve = &universal_reserve, .restart = exynos4_restart, MACHINE_END