From patchwork Fri Jan 17 12:25:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 3504341 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 21CE4C02DC for ; Fri, 17 Jan 2014 13:01:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1EB872012F for ; Fri, 17 Jan 2014 13:01:38 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 031CE2015E for ; Fri, 17 Jan 2014 13:01:37 +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 1W493C-00054b-JG; Fri, 17 Jan 2014 13:01:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W4939-0008L3-Fo; Fri, 17 Jan 2014 13:01:27 +0000 Received: from mail-pd0-f176.google.com ([209.85.192.176]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W4936-0008K5-3K for linux-arm-kernel@lists.infradead.org; Fri, 17 Jan 2014 13:01:25 +0000 Received: by mail-pd0-f176.google.com with SMTP id r10so3967231pdi.21 for ; Fri, 17 Jan 2014 05:01:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6rl6yt5GXtLp8HEoZkJcN5+zh9+2PRXUYk4zW6x+sTA=; b=FptGQJAUBdqJNtSBLuWU6obbSt+rvIh//kvlwO/XQUqKEo05+tOqMbG1eH+3/JUm0V n+qFX6IPjGfNB/J+AgLyxkr8VR3P9RMZxEKEI153ZF7PbTNutZa6UF1OZ7b9VQCBg4oI w3l6Tfo6sfk3w51rfFzEPZd6QjaBAx4piQQef1dWeYve7hInBG1h8rNEFCrXDxrvUmmC iIetSOmH+5pKOmlJ9sToqO+xLQZ1N80TCj9AfqVnCWibTZYFPNEnswuwmBguKaj1W9G6 d2llV1N6SD6YSQnBrLmGarsgpQVXsaiENcDDYNrLxABwoWrVG4Z/79iliMWEqTfTqBHK xBGw== X-Gm-Message-State: ALoCoQltEGvoVUwmMp6iX5alXk/VJ+r3VY6695H+f4nu4RBGBNQpaBCrSnQ67YYAyUa40cfvDhaP X-Received: by 10.66.156.137 with SMTP id we9mr2063224pab.30.1389963662931; Fri, 17 Jan 2014 05:01:02 -0800 (PST) Received: from localhost ([218.17.215.175]) by mx.google.com with ESMTPSA id x8sm2539809pbq.28.2014.01.17.05.00.41 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 17 Jan 2014 05:01:02 -0800 (PST) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , Will Deacon , Russell King - ARM Linux Subject: [PATCH 20/20] ARM64 / clocksource: Use clocksource_acpi_init() Date: Fri, 17 Jan 2014 20:25:14 +0800 Message-Id: <1389961514-13562-21-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389961514-13562-1-git-send-email-hanjun.guo@linaro.org> References: <1389961514-13562-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140117_080124_221831_0EE55560 X-CRM114-Status: GOOD ( 11.60 ) X-Spam-Score: -1.1 (-) Cc: Mark Rutland , Matthew Garrett , linaro-kernel@lists.linaro.org, Arnd Bergmann , Rob Herring , Linus Walleij , Olof Johansson , linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, linux-acpi@vger.kernel.org, Hanjun Guo , patches@linaro.org, Grant Likely , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Charles.Garcia-Tobin@arm.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 X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 Use clocksource_acpi_init() on ARM64 to initialise timers in ACPI way when DT is not available. Signed-off-by: Hanjun Guo --- arch/arm64/kernel/time.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index 29c39d5..6e453ac 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -67,6 +67,12 @@ void __init time_init(void) clocksource_of_init(); + /* + * Since ACPI or FDT will only one be available in the system, + * we can use clocksource_acpi_init() here safely + */ + clocksource_acpi_init(); + arch_timer_rate = arch_timer_get_rate(); if (!arch_timer_rate) panic("Unable to initialise architected timer.\n");