From patchwork Thu Nov 15 13:55:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12870 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 1AB6F4C177F for ; Thu, 15 Nov 2012 13:55:45 +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 C2D0DA18FC1 for ; Thu, 15 Nov 2012 13:55:44 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so2088042iej.11 for ; Thu, 15 Nov 2012 05:55:44 -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=FH5pSdx4mLWltv0MspVsFgeYQebeO/pf2ZiduVsTd2k=; b=AQeMMOTfLF98KgHitGbYrjazBMOuup4NbyphwP81KXWLP+la6H6hwwqBArGFIdZnXb 0xbxTX0k6Pv+9J0fArFWNHoOl74lQGtTxB/3ae92chRpUNDrvcNjr/eQ7esYYGKwvDCD 3jsLsJomnzoi7D0tdNs3iDGawmnpU5OdNPmG4CqCGeJDCf3W5slx9kG4zpFNtdFuGN6u vwVjBe/d1n8y9sJRL1ruHRNZZKpkiBnutqL+Q55aDcjI4Xrhe2lh0NYgvFNoVIeCjNqc bHH/Kifjjw/0gO4/nq71MurxUqJXrKoRtppc6/jAGgYLCEB5fRydLlrbXuhPCDOp5bXY gvmw== Received: by 10.43.125.133 with SMTP id gs5mr767050icc.54.1352987744099; Thu, 15 Nov 2012 05:55:44 -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 n20csp827407igt; Thu, 15 Nov 2012 05:55:43 -0800 (PST) Received: by 10.14.179.69 with SMTP id g45mr3875652eem.42.1352987742945; Thu, 15 Nov 2012 05:55:42 -0800 (PST) Received: from eu1sys200aog105.obsmtp.com (eu1sys200aog105.obsmtp.com [207.126.144.119]) by mx.google.com with SMTP id c2si6368584eeo.107.2012.11.15.05.55.38 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Nov 2012 05:55:42 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.119 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.119; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.119 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-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob105.postini.com ([207.126.147.11]) with SMTP ID DSNKUKT0WHTkY80Sy7uJPsCDAsdrRoJmL+tn@postini.com; Thu, 15 Nov 2012 13:55:42 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 043924D; Thu, 15 Nov 2012 13:54:58 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 1A3ED54; Thu, 15 Nov 2012 09:06:27 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 316AFA8065; Thu, 15 Nov 2012 14:55:29 +0100 (CET) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Thu, 15 Nov 2012 14:55:34 +0100 From: Linus Walleij To: Cc: , Anmar Oueja , Ulf Hansson , Linus Walleij Subject: [PATCH 1/2] clk: ux500: Register mtu apb_pclocks Date: Thu, 15 Nov 2012 14:55:29 +0100 Message-ID: <1352987729-9387-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: ALoCoQklq1GQDvIs+oElXCEmYKi4XujVE5Hl0f93OdQMTd2sZCTk2lgn+Ob+p01oNA9IrWN42K4z From: Ulf Hansson Signed-off-by: Ulf Hansson Acked-by: Mike Turquette Signed-off-by: Linus Walleij --- drivers/clk/ux500/u8500_clk.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c index ab30ce8..1f6bfb8 100644 --- a/drivers/clk/ux500/u8500_clk.c +++ b/drivers/clk/ux500/u8500_clk.c @@ -160,12 +160,6 @@ void u8500_clk_init(void) clk = clk_reg_prcmu_gate("uiccclk", NULL, PRCMU_UICCCLK, CLK_IS_ROOT); clk_register_clkdev(clk, NULL, "uicc"); - /* - * FIXME: The MTU clocks might need some kind of "parent muxed join" - * and these have no K-clocks. For now, we ignore the missing - * connection to the corresponding P-clocks, p6_mtu0_clk and - * p6_mtu1_clk. Instead timclk is used which is the valid parent. - */ clk = clk_reg_prcmu_gate("timclk", NULL, PRCMU_TIMCLK, CLK_IS_ROOT); clk_register_clkdev(clk, NULL, "mtu0"); clk_register_clkdev(clk, NULL, "mtu1"); @@ -379,8 +373,11 @@ void u8500_clk_init(void) clk = clk_reg_prcc_pclk("p6_pclk6", "per6clk", U8500_CLKRST6_BASE, BIT(6), 0); + clk_register_clkdev(clk, "apb_pclk", "mtu0"); + clk = clk_reg_prcc_pclk("p6_pclk7", "per6clk", U8500_CLKRST6_BASE, BIT(7), 0); + clk_register_clkdev(clk, "apb_pclk", "mtu1"); /* PRCC K-clocks *