From patchwork Mon Oct 7 18:23:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Kryger X-Patchwork-Id: 20867 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4618125DFC for ; Mon, 7 Oct 2013 18:25:34 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id x20sf14488531qcv.11 for ; Mon, 07 Oct 2013 11:25:34 -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=TulOJLfOWNYQLW4ub5YxZJXaXjlz/maTPjSvMcvuB/mgccWkwlEkcejgDncDQ0M1Y3 6ugCTasmOrNHb0GMdfd5xSSQjwSfcEhyqCTJsnHmMVQy9YPHwBZaODGHxbVaQYu3sE7z LdqMkkPM3p9hYGIt349XyzpE1My8xyTgDu/sQW8reVPcdfQQZXW1Ly7N0NLwyR6AqKJ5 fCKww9OslqCCSDYsn+i7wMxokTyq8457+UFt2EDHd5pJYx7Lt6vZkm0W4ZxN8hS/vK1v L1dVKV5Gwbx8xaMag0TAVArHogWiOnoj5ZP6trLtlWZqBjh8ztguqDJb/mlWEFm+U1jZ PaXQ== X-Received: by 10.58.2.194 with SMTP id 2mr2824439vew.27.1381170334126; Mon, 07 Oct 2013 11:25:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.116.135 with SMTP id jw7ls2582149qeb.58.gmail; Mon, 07 Oct 2013 11:25:34 -0700 (PDT) X-Received: by 10.221.51.206 with SMTP id vj14mr5330996vcb.17.1381170334002; Mon, 07 Oct 2013 11:25:34 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id sc5si8059943vdc.139.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Oct 2013 11:25:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id oz11so3885545veb.17 for ; Mon, 07 Oct 2013 11:25:33 -0700 (PDT) X-Gm-Message-State: ALoCoQnWnNACfhQDGwRMUbQJv+eohu39sQAFD08AIz7ThzpYSNC9NuHkg2PCWzpTO1lHXBnaRtoj X-Received: by 10.58.67.9 with SMTP id j9mr27218741vet.3.1381170333907; Mon, 07 Oct 2013 11:25:33 -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 u4csp145268vcz; Mon, 7 Oct 2013 11:25:33 -0700 (PDT) X-Received: by 10.42.148.138 with SMTP id r10mr61499icv.80.1381170330669; Mon, 07 Oct 2013 11:25:30 -0700 (PDT) Received: from mms1.broadcom.com (mms1.broadcom.com. [216.31.210.17]) by mx.google.com with ESMTP id yz6si18406235icb.78.1969.12.31.16.00.00; Mon, 07 Oct 2013 11:25:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of tkryger@broadcom.com designates 216.31.210.17 as permitted sender) client-ip=216.31.210.17; Received: from [10.9.208.57] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Mon, 07 Oct 2013 11:25:18 -0700 X-Server-Uuid: 06151B78-6688-425E-9DE2-57CB27892261 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.1.438.0; Mon, 7 Oct 2013 11:24:18 -0700 Received: from mail-sj1-12.sj.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.1.438.0; Mon, 7 Oct 2013 11:24:18 -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 3AAEC207CF; Mon, 7 Oct 2013 11:24:18 -0700 (PDT) Received: by mps-infra-lab3.broadcom.com (Postfix, from userid 1004) id EF3CD4589E0; Mon, 7 Oct 2013 11:24:17 -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: [PATCH v2 4/6] clocksource: kona: Add basic use of external clock Date: Mon, 7 Oct 2013 11:23:58 -0700 Message-ID: <1381170240-23227-5-git-send-email-tim.kryger@linaro.org> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1381170240-23227-1-git-send-email-tim.kryger@linaro.org> References: <1381170240-23227-1-git-send-email-tim.kryger@linaro.org> MIME-Version: 1.0 X-WSS-ID: 7E4C23070UO14823646-11-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.128.172 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);