From patchwork Thu Nov 15 13:55:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12871 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7DBA74C177F for ; Thu, 15 Nov 2012 13:56:04 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2B457A191D3 for ; Thu, 15 Nov 2012 13:56:04 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so2088042iej.11 for ; Thu, 15 Nov 2012 05:56:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=GN3q25bl8nJWUgc0uShkzng0o5WjlVKasPe8u7VWYEg=; b=NMpmSrjuy5ONlvKaP9NsumNMLEfa7ZKQDvufpkHUekgx577SG+ZAzDD3yRGRCmHjAQ RdBDQKry/A9ZC+P48G6gue9vcJStTSyKDpXgCluCCwGu/Cc8DbUVcWecz9fpxlw5X+vB eIZPUw+uK4l9ajU1Xqemgrm3q2W+l6lWsTjmUxcZXZn4lR/oQRSnOLv+0fx/LXLEFKQj D4Gr+Me7e0BoKp74roKBxxpJvKY0308M/N3DaK9H/X6DREFe/Mij9Az2YPHJqvGZR2Bo I08NWH8Ep9mw8qVmSjOwnftXFhcpamMiBO/UJxhRYjrieEyUNSQ7lj+NdJoJLqZogn2O v6aw== Received: by 10.50.152.137 with SMTP id uy9mr860393igb.62.1352987763935; Thu, 15 Nov 2012 05:56:03 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp827441igt; Thu, 15 Nov 2012 05:56:03 -0800 (PST) Received: by 10.14.1.69 with SMTP id 45mr4026693eec.23.1352987762990; Thu, 15 Nov 2012 05:56:02 -0800 (PST) Received: from eu1sys200aog115.obsmtp.com (eu1sys200aog115.obsmtp.com [207.126.144.139]) by mx.google.com with SMTP id l45si29660696eep.63.2012.11.15.05.55.53 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Nov 2012 05:56:02 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.139 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.139; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.139 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob115.postini.com ([207.126.147.11]) with SMTP ID DSNKUKT0aJixbhlNB2+bIwkl9VyAD81DUbBA@postini.com; Thu, 15 Nov 2012 13:56:02 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 3AE281C1; Thu, 15 Nov 2012 13:55:42 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id B0D0926D1; Thu, 15 Nov 2012 13:55:42 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 6E9CC24C2F3; Thu, 15 Nov 2012 14:55:35 +0100 (CET) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Thu, 15 Nov 2012 14:55:41 +0100 From: Linus Walleij To: Cc: , Anmar Oueja , Ulf Hansson , Linus Walleij Subject: [PATCH 2/2] clocksource/mtu-nomadik: use apb_pclk Date: Thu, 15 Nov 2012 14:55:38 +0100 Message-ID: <1352987738-9422-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlMIc89lhtR2DcfLWRTj5p+R7k0JH8lJQ7+X2LgYtfhwd/gY0Aiw4sF5A5lbpsH3KLSzoye From: Ulf Hansson After improving the clock tree we need to make sure the the MTU timer explicitly grabs and enables it silicon clock (pclk). Signed-off-by: Ulf Hansson Acked-by: Mike Turquette Signed-off-by: Linus Walleij --- This version of the patch is based upon the ux500 SPARSE_IRQ commit and is intended to be merged after [1/2] so as to avoid conflicts between the clk and ARM SoC trees. --- drivers/clocksource/nomadik-mtu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index 23c780b..8914c3c 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c @@ -177,9 +177,15 @@ void nmdk_clksrc_reset(void) void __init nmdk_timer_init(void __iomem *base, int irq) { unsigned long rate; - struct clk *clk0; + struct clk *clk0, *pclk0; mtu_base = base; + + pclk0 = clk_get_sys("mtu0", "apb_pclk"); + BUG_ON(IS_ERR(pclk0)); + BUG_ON(clk_prepare(pclk0) < 0); + BUG_ON(clk_enable(pclk0) < 0); + clk0 = clk_get_sys("mtu0", NULL); BUG_ON(IS_ERR(clk0)); BUG_ON(clk_prepare(clk0) < 0);