From patchwork Wed Oct 16 21:47:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Kryger X-Patchwork-Id: 21085 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5FFED25E83 for ; Wed, 16 Oct 2013 21:48:22 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id w8sf2704337qac.2 for ; Wed, 16 Oct 2013 14:48:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=YNSlhdNfv7x0pF2crQgETfBLSVdyHDCiXsdczj3Nggs=; b=VdcllOIssgpRBP9SMZsTrCKGlBAlT2Foxbl6pLTkMckKhzPpP+IQCbggDgZzLv2J1x grUIi99lCxshc47jOy/8ARCil0ZIuI7j6Z2chhU9N2TVcZOMQyVTWksvF6qvORkMbOS6 el3tDA1S6jWhAXIEWGxun5kGJz+IhfZx71DjUMuEGnWF9wljvJnZWqGqAIhqXt8LoqeX HwnH6Wc8ZRXENtBjncbvP2y6uJzAnACoiwrmX/qCQEab574oIPSkc3yFneccCS8z7XWc slPGz77aCVRfCBkFNq95F1PRebW26gl/RGPt9ciwmFBWkCNUB4D75GRYdH1Ep5n05qZI bFtQ== X-Received: by 10.236.80.42 with SMTP id j30mr2767388yhe.29.1381960102251; Wed, 16 Oct 2013 14:48:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.128.138 with SMTP id no10ls704034qeb.18.gmail; Wed, 16 Oct 2013 14:48:22 -0700 (PDT) X-Received: by 10.58.233.98 with SMTP id tv2mr4138228vec.11.1381960102153; Wed, 16 Oct 2013 14:48:22 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id gq10si25192553vdc.95.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Oct 2013 14:48:22 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id id10so693522vcb.40 for ; Wed, 16 Oct 2013 14:48:22 -0700 (PDT) X-Gm-Message-State: ALoCoQlsTCI47xdqqR3Jvy9VnfKBhmRRfmy42sFF/PfJqCKHNHyU2aSUdk4khsReT0QWpJnoO6QA X-Received: by 10.221.44.136 with SMTP id ug8mr4121007vcb.13.1381960102048; Wed, 16 Oct 2013 14:48:22 -0700 (PDT) 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.220.174.196 with SMTP id u4csp70025vcz; Wed, 16 Oct 2013 14:48:21 -0700 (PDT) X-Received: by 10.50.30.9 with SMTP id o9mr4042683igh.0.1381960100308; Wed, 16 Oct 2013 14:48:20 -0700 (PDT) Received: from mms2.broadcom.com (mms2.broadcom.com. [216.31.210.18]) by mx.google.com with ESMTP id pe9si3782994icc.9.1969.12.31.16.00.00; Wed, 16 Oct 2013 14:48:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of tkryger@broadcom.com designates 216.31.210.18 as permitted sender) client-ip=216.31.210.18; Received: from [10.9.208.53] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Wed, 16 Oct 2013 14:48:07 -0700 X-Server-Uuid: 4500596E-606A-40F9-852D-14843D8201B2 Received: from IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) by IRVEXCHCAS06.corp.ad.broadcom.com (10.9.208.53) with Microsoft SMTP Server (TLS) id 14.1.438.0; Wed, 16 Oct 2013 14:48:12 -0700 Received: from mail-sj1-12.sj.broadcom.com (10.10.10.20) by IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) with Microsoft SMTP Server id 14.1.438.0; Wed, 16 Oct 2013 14:48:12 -0700 Received: from mps-infra-lab3.broadcom.com ( mps-infra-lab3.sj.broadcom.com [10.19.114.109]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 72C2E2087A; Wed, 16 Oct 2013 14:47:36 -0700 (PDT) Received: by mps-infra-lab3.broadcom.com (Postfix, from userid 1004) id 66C8A4589E6; Wed, 16 Oct 2013 14:47:36 -0700 (PDT) From: "Tim Kryger" To: "Christian Daudt" , "Rob Herring" , "Pawel Moll" , "Mark Rutland" , "Stephen Warren" , "Ian Campbell" , "Daniel Lezcano" , "Thomas Gleixner" , "Chris Ball" cc: "Tim Kryger" , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, patches@linaro.org Subject: [RESEND PATCH v2 4/6] clocksource: kona: Add basic use of external clock Date: Wed, 16 Oct 2013 14:47:08 -0700 Message-ID: <1381960030-1640-5-git-send-email-tim.kryger@linaro.org> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1381960030-1640-1-git-send-email-tim.kryger@linaro.org> References: <1381960030-1640-1-git-send-email-tim.kryger@linaro.org> MIME-Version: 1.0 X-WSS-ID: 7E41D61D1R0101263017-01-01 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tim.kryger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.181 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: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , When an clock handle is specified in the device tree, enable it and use it to determine the external clock frequency. Signed-off-by: Tim Kryger Reviewed-by: Markus Mayer Reviewed-by: Matt Porter --- drivers/clocksource/bcm_kona_timer.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c index 0d7d8c3..fd11f96 100644 --- a/drivers/clocksource/bcm_kona_timer.c +++ b/drivers/clocksource/bcm_kona_timer.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -107,11 +108,18 @@ static const struct of_device_id bcm_timer_ids[] __initconst = { static void __init kona_timers_init(struct device_node *node) { u32 freq; + struct clk *external_clk; - if (!of_property_read_u32(node, "clock-frequency", &freq)) + external_clk = of_clk_get_by_name(node, NULL); + + if (!IS_ERR(external_clk)) { + arch_timer_rate = clk_get_rate(external_clk); + clk_prepare_enable(external_clk); + } else if (!of_property_read_u32(node, "clock-frequency", &freq)) { arch_timer_rate = freq; - else - panic("clock-frequency not set in the .dts file"); + } else { + panic("neither clock-frequency or clocks handle in .dts file"); + } /* Setup IRQ numbers */ timers.tmr_irq = irq_of_parse_and_map(node, 0);