From patchwork Tue Dec 3 16:41:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 3277731 Return-Path: X-Original-To: patchwork-linux-acpi@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 4BE219F380 for ; Tue, 3 Dec 2013 16:42:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62C9D2037A for ; Tue, 3 Dec 2013 16:42:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52E652015E for ; Tue, 3 Dec 2013 16:42:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754130Ab3LCQmV (ORCPT ); Tue, 3 Dec 2013 11:42:21 -0500 Received: from mail-pb0-f49.google.com ([209.85.160.49]:65140 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754107Ab3LCQmS (ORCPT ); Tue, 3 Dec 2013 11:42:18 -0500 Received: by mail-pb0-f49.google.com with SMTP id jt11so21359696pbb.22 for ; Tue, 03 Dec 2013 08:42:18 -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=2Pa+DZQz/kArkHs+YmS8JQrnQI43QRfXOU0BRoFbMvk=; b=P4uLgOwIdGZ7olLs18L4GgNfyPpkw+8Mv5eUYOXoDHZDTOed7xkcJc+LEtVACE/CAY MjiIrSUhtsWAPf7CATuBIaklJv/fZTiOk480BJetJVkxU43n/6y7UPY3SQ08deRCakvX JTFOhRHfUT2azpETt1tVfpunzvrmMUlHGagPGWPeA0RXABmYh6cqcLHR73IZkWFp4rKN n7VSLpbL7d/1NK8uTI0hwO0BmYE1be1T4+l/EwlgOrI5H/qRS9CaiZFR3XOHVO8lm20D 4bFeEGwspifM5vaTzCB3I3d9iuhLPyqxHM9y0EvN3ELY5oKO+FWAL+GrPfmUu/7YJgoZ jeHQ== X-Gm-Message-State: ALoCoQle+2LoqLJnaLSo2Xa4Pea1LbQGIJxxnvGoZ4bWrSvj1zlxhO3SD6zDTyLWvAXAPjMokF+i X-Received: by 10.66.164.136 with SMTP id yq8mr75264379pab.67.1386088938029; Tue, 03 Dec 2013 08:42:18 -0800 (PST) Received: from localhost ([219.142.3.202]) by mx.google.com with ESMTPSA id rz6sm136460589pab.22.2013.12.03.08.42.10 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 03 Dec 2013 08:42:17 -0800 (PST) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , Will Deacon , Russell King - ARM Linux , Daniel Lezcano Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Grant Likely , Matthew Garrett , Olof Johansson , Linus Walleij , Bjorn Helgaas , Rob Herring , Mark Rutland , Jon Masters , patches@linaro.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [RFC part3 PATCH 2/2] ARM64 / clocksource: Use arch_timer_acpi_init() Date: Wed, 4 Dec 2013 00:41:31 +0800 Message-Id: <1386088891-2917-3-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1386088891-2917-1-git-send-email-hanjun.guo@linaro.org> References: <1386088891-2917-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Use arch_timer_acpi_init() on ARM64 to initialise arch timer in ACPI way when DT is not available. Signed-off-by: Hanjun Guo --- arch/arm64/kernel/time.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index 29c39d5..fb009da 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -67,6 +67,10 @@ void __init time_init(void) clocksource_of_init(); + /* if can't be initialised from DT, try ACPI way */ + if (!arch_timer_get_rate()) + arch_timer_acpi_init(); + arch_timer_rate = arch_timer_get_rate(); if (!arch_timer_rate) panic("Unable to initialise architected timer.\n");