From patchwork Wed Oct 24 12:13:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12464 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 DAF0823EC8 for ; Wed, 24 Oct 2012 12:14:02 +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 80E1AA18C21 for ; Wed, 24 Oct 2012 12:14:02 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so498948iej.11 for ; Wed, 24 Oct 2012 05:14:02 -0700 (PDT) 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:in-reply-to:references :mime-version:content-type:x-gm-message-state; bh=apm4y1eDuvA7yt+cpEFeOKNVvCom7KtXU4JQffFNg/Y=; b=X7pcnQ9kLqX5PTUhgrHXrbK9Zw7+3bQx+B05izcMSxPxSi9NbArhPm73KZcm8kPI/j 5W/7D+NWKUqVHIszs0TCIdk6tOIbDPzmx3v6PAgJXB6+93KpV5f7BYYOs8vCjStyr6vu OwKl5SFhuwTFAzaAhcddW+i013hqaAT9YKdeGxI9EBqIStjcrBNa7TS7dn+viPybJyjN +2+esRXpPFk1QYlFPl9bxuw3V6atGMX+O1M2pCxeTARXNmuaOeeH5Wktk//mtWvzvh5y uNQDP/AGELDBUL/DVahhswwXcFzjOWPDe3WrbhpnzBD+rXwxl3kfPLi7xQ4X4xfbRec7 GeFg== Received: by 10.50.100.137 with SMTP id ey9mr2097082igb.57.1351080841895; Wed, 24 Oct 2012 05:14:01 -0700 (PDT) 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 n20csp604018igt; Wed, 24 Oct 2012 05:14:00 -0700 (PDT) Received: by 10.14.223.4 with SMTP id u4mr21013778eep.19.1351080840035; Wed, 24 Oct 2012 05:14:00 -0700 (PDT) Received: from eu1sys200aog104.obsmtp.com (eu1sys200aog104.obsmtp.com [207.126.144.117]) by mx.google.com with SMTP id e6si983284eem.36.2012.10.24.05.13.53 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 05:14:00 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.117 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) client-ip=207.126.144.117; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.117 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) smtp.mail=ulf.hansson@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob104.postini.com ([207.126.147.11]) with SMTP ID DSNKUIfbgTG9HlfJjICB8Ppc/lp1ilbV23t7@postini.com; Wed, 24 Oct 2012 12:13:59 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 1EE05EA; Wed, 24 Oct 2012 12:05:38 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 778FADDB; Wed, 24 Oct 2012 12:13:50 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 25B3124C07D; Wed, 24 Oct 2012 14:13:43 +0200 (CEST) Received: from steludxu1397.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 24 Oct 2012 14:13:49 +0200 From: Ulf Hansson To: , Mike Turquette Cc: STEricsson , Linus Walleij , Alessandro Rubini , Lee Jones , Philippe Begnic , Rickard Andersson , Ulf Hansson Subject: [PATCH 2/2] ARM: plat-nomadik: Use apb_pclock in mtu driver Date: Wed, 24 Oct 2012 14:13:41 +0200 Message-ID: <1351080821-18660-3-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1351080821-18660-1-git-send-email-ulf.hansson@stericsson.com> References: <1351080821-18660-1-git-send-email-ulf.hansson@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlx2hDLSDaOnomUED3EDODipFhiZ7jGIZY9Acvr4ljWoQjOECSo74QTu4TWqdM6BANvazA6 From: Ulf Hansson Signed-off-by: Ulf Hansson --- arch/arm/plat-nomadik/timer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/plat-nomadik/timer.c b/arch/arm/plat-nomadik/timer.c index 9222e55..17c690d 100644 --- a/arch/arm/plat-nomadik/timer.c +++ b/arch/arm/plat-nomadik/timer.c @@ -177,9 +177,15 @@ void nmdk_clksrc_reset(void) void __init nmdk_timer_init(void __iomem *base) { 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);