From patchwork Mon Apr 14 07:38:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanho Min X-Patchwork-Id: 3977191 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F40B6BFF02 for ; Mon, 14 Apr 2014 07:41:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F15C201DC for ; Mon, 14 Apr 2014 07:41:46 +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 365EC201CE for ; Mon, 14 Apr 2014 07:41:45 +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 1WZbUH-0007No-IW; Mon, 14 Apr 2014 07:39:29 +0000 Received: from lgeamrelo04.lge.com ([156.147.1.127]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WZbUE-00075K-T4 for linux-arm-kernel@lists.infradead.org; Mon, 14 Apr 2014 07:39:28 +0000 Received: from unknown (HELO mambo.154.147.1.1) (10.178.36.63) by 156.147.1.127 with ESMTP; 14 Apr 2014 16:38:59 +0900 X-Original-SENDERIP: 10.178.36.63 X-Original-MAILFROM: chanho.min@lge.com From: Chanho Min To: Catalin Marinas Subject: [PATCH] arm64:init: Move of_clk_init to time_init Date: Mon, 14 Apr 2014 16:38:53 +0900 Message-Id: <1397461133-12143-1-git-send-email-chanho.min@lge.com> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140414_003927_310629_4C36033F X-CRM114-Status: UNSURE ( 8.93 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.0 (-) Cc: Ard Biesheuvel , Chanho Min , Will Deacon , linux-kernel@vger.kernel.org, Rob Herring , linux-arm-kernel@lists.infradead.org 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 X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,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 Clock providers should be initialized before clocksource_of_init. If not, Clock source initialization can be fail to get the clock. Signed-off-by: Chanho Min Acked-by: Will Deacon --- arch/arm64/kernel/setup.c | 1 - arch/arm64/kernel/time.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 720853f..93e7df89 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -393,7 +393,6 @@ void __init setup_arch(char **cmdline_p) static int __init arm64_device_init(void) { - of_clk_init(NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); return 0; } diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index 29c39d5..8799242 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -33,6 +33,7 @@ #include #include #include +#include #include @@ -64,7 +65,7 @@ EXPORT_SYMBOL(profile_pc); void __init time_init(void) { u32 arch_timer_rate; - + of_clk_init(NULL); clocksource_of_init(); arch_timer_rate = arch_timer_get_rate();