From patchwork Thu Nov 14 19:10:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Kryger X-Patchwork-Id: 21521 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B6A5323FDD for ; Thu, 14 Nov 2013 19:11:14 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id if17sf2358420vcb.4 for ; Thu, 14 Nov 2013 11:11:14 -0800 (PST) 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=jYYJrnLDfGIxUJvwBVXykJ9KcLl1cyfCdkDm193kY/w=; b=BuawurSiNHV07ZPdBClFSDkpx6aKwdAlqb1XwotwxeeN/M5o2ekqhUuzELrjq5Pbbx Yv6VPnFCHo89BpxV9ZtmDU/ZyfO86PGTH4F4dqKHS7D7CDevoGEL32quikeLV99tPRwF ykoEuSh5E+MiLiWfcKz2Y2fNaYY3WH+QbaDutWAfthcz/497dQdbBVdjios2vzDRd/KY cGEKjCYStO6nN4zq9c10/zgA74WzmPr+O+/tEVYCxKiqM7FngFnM/NpYzc9tP3sUB3pq EewqXUrVKswndXR4UJXIyQMcixnxd0lEFH1hdeviPPXMtvTF2yMKmff0Bp8Iq259DKGi Yshg== X-Gm-Message-State: ALoCoQkFbgJiOFYHj+1c2oDQWuNHqH7Et4Gtmm5bJKJI5Z6ugHt3W2b9PR/aBxQckuzVtyD232QQ X-Received: by 10.58.112.195 with SMTP id is3mr1215706veb.29.1384456274561; Thu, 14 Nov 2013 11:11:14 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.196 with SMTP id de4ls1144733qeb.77.gmail; Thu, 14 Nov 2013 11:11:14 -0800 (PST) X-Received: by 10.220.252.71 with SMTP id mv7mr542893vcb.68.1384456274488; Thu, 14 Nov 2013 11:11:14 -0800 (PST) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id gu4si17685783vdc.20.2013.11.14.11.11.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Nov 2013 11:11:14 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.169 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.169; Received: by mail-vc0-f169.google.com with SMTP id hu8so1036544vcb.14 for ; Thu, 14 Nov 2013 11:11:14 -0800 (PST) X-Received: by 10.52.171.198 with SMTP id aw6mr476355vdc.51.1384456274400; Thu, 14 Nov 2013 11:11:14 -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.220.174.196 with SMTP id u4csp339961vcz; Thu, 14 Nov 2013 11:11:13 -0800 (PST) X-Received: by 10.60.138.136 with SMTP id qq8mr3026080oeb.59.1384456271754; Thu, 14 Nov 2013 11:11:11 -0800 (PST) Received: from mms2.broadcom.com (mms2.broadcom.com. [216.31.210.18]) by mx.google.com with ESMTP id uq6si261950obc.83.2013.11.14.11.11.10 for ; Thu, 14 Nov 2013 11:11:11 -0800 (PST) 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.55] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Thu, 14 Nov 2013 11:10:33 -0800 X-Server-Uuid: 4500596E-606A-40F9-852D-14843D8201B2 Received: from IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) by IRVEXCHCAS07.corp.ad.broadcom.com (10.9.208.55) with Microsoft SMTP Server (TLS) id 14.1.438.0; Thu, 14 Nov 2013 11:11:00 -0800 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; Thu, 14 Nov 2013 11:11:00 -0800 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 E8059207D8; Thu, 14 Nov 2013 11:10:58 -0800 (PST) Received: by mps-infra-lab3.broadcom.com (Postfix, from userid 1004) id BF39F4589FB; Thu, 14 Nov 2013 11:10:58 -0800 (PST) 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" , "Device Tree List" , "Linux ARM Kernel List" , "Linux Kernel Mailing List" , "Linux MMC List" , "Linaro Patches List" Subject: [PATCH v3 7/8] clocksource: kona: Add basic use of external clock Date: Thu, 14 Nov 2013 11:10:42 -0800 Message-ID: <1384456243-27053-8-git-send-email-tim.kryger@linaro.org> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1384456243-27053-1-git-send-email-tim.kryger@linaro.org> References: <1384456243-27053-1-git-send-email-tim.kryger@linaro.org> MIME-Version: 1.0 X-WSS-ID: 7E9BFFA34RS8193360-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.169 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 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..8a4ab36 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("unable to determine clock-frequency"); + } /* Setup IRQ numbers */ timers.tmr_irq = irq_of_parse_and_map(node, 0);