Message ID | 1389961514-13562-21-git-send-email-hanjun.guo@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBDWLZTMOWUARBEGT4SLAKGQEKNYDIGI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4062620540 for <linaro@patches.linaro.org>; Fri, 17 Jan 2014 13:01:05 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id fa1sf4209637pad.0 for <linaro@patches.linaro.org>; Fri, 17 Jan 2014 05:01:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=6rl6yt5GXtLp8HEoZkJcN5+zh9+2PRXUYk4zW6x+sTA=; b=ffgtvKdm4IbzNVS8WClSUsXh4A0Sth+yCwhiTv4tjOzvLfv7lF+RvJ5+vsbG5pfVHj dReaGCkgULle78PnAPX5pK/dwZ0hDR4715Rt4USwZrEZ1jdQysN1/khbDs1Cm1sxy40L JrAEhmZjvu28mpz89DjoEPKP61mig3ywVTu/5Bv9l8TZ+X007mTGk3CgsC7mU/tmfynr pkrJqfuOqv2pE70S3+D0GRTfj7N8IfQ+UoVg6/icDZBtJD9kfWTaw7LKT3MPSk8v6Bvv auiycqAyDXkVd62vwIlOpyS9xwLtjwRz+UvP3E/wWk2/L6TvhJRCkY+k1Av2cST1wPTI Ij6A== X-Gm-Message-State: ALoCoQmYpOO9R4SI90vqq1N8Jub/G2wgFMtVhrqKvmbGTPsuxEKP/VhhGdPNHXSDlCua1NAGfhKn X-Received: by 10.66.172.38 with SMTP id az6mr633069pac.7.1389963664426; Fri, 17 Jan 2014 05:01:04 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.26.137 with SMTP id l9ls19900qeg.14.gmail; Fri, 17 Jan 2014 05:01:04 -0800 (PST) X-Received: by 10.52.76.105 with SMTP id j9mr99423vdw.52.1389963664243; Fri, 17 Jan 2014 05:01:04 -0800 (PST) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by mx.google.com with ESMTPS id fi9si4872086vcb.114.2014.01.17.05.01.04 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 05:01:04 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.51; Received: by mail-vb0-f51.google.com with SMTP id 11so1554551vbe.10 for <patchwork-forward@linaro.org>; Fri, 17 Jan 2014 05:01:04 -0800 (PST) X-Received: by 10.58.243.37 with SMTP id wv5mr136524vec.41.1389963664180; Fri, 17 Jan 2014 05:01:04 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp17792ved; Fri, 17 Jan 2014 05:01:03 -0800 (PST) X-Received: by 10.68.226.200 with SMTP id ru8mr1885488pbc.77.1389963663358; Fri, 17 Jan 2014 05:01:03 -0800 (PST) Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com [209.85.192.174]) by mx.google.com with ESMTPS id wm3si10055335pab.281.2014.01.17.05.01.03 for <patches@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 05:01:03 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.174 is neither permitted nor denied by best guess record for domain of hanjun.guo@linaro.org) client-ip=209.85.192.174; Received: by mail-pd0-f174.google.com with SMTP id w10so3932997pde.5 for <patches@linaro.org>; Fri, 17 Jan 2014 05:01:03 -0800 (PST) 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 <multiple recipients> (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 17 Jan 2014 05:01:02 -0800 (PST) From: Hanjun Guo <hanjun.guo@linaro.org> To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Russell King - ARM Linux <linux@arm.linux.org.uk> Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Grant Likely <grant.likely@linaro.org>, Matthew Garrett <mjg59@srcf.ucam.org>, Olof Johansson <olof@lixom.net>, Linus Walleij <linus.walleij@linaro.org>, Bjorn Helgaas <bhelgaas@google.com>, Rob Herring <robh@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Arnd Bergmann <arnd@arndb.de>, patches@linaro.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org, Charles.Garcia-Tobin@arm.com, Hanjun Guo <hanjun.guo@linaro.org> 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
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");
Use clocksource_acpi_init() on ARM64 to initialise timers in ACPI way when DT is not available. Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> --- arch/arm64/kernel/time.c | 6 ++++++ 1 file changed, 6 insertions(+)