From patchwork Mon Jan 20 10:44:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 3511491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 31C739F2D6 for ; Mon, 20 Jan 2014 10:45:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 20AD220160 for ; Mon, 20 Jan 2014 10:45:53 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A97ED2015D for ; Mon, 20 Jan 2014 10:45:51 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W5CMR-00038i-AM; Mon, 20 Jan 2014 10:45:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W5CMO-00012b-Sq; Mon, 20 Jan 2014 10:45:40 +0000 Received: from co1ehsobe001.messaging.microsoft.com ([216.32.180.184] helo=co1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W5CMM-00011W-2a for linux-arm-kernel@lists.infradead.org; Mon, 20 Jan 2014 10:45:38 +0000 Received: from mail155-co1-R.bigfish.com (10.243.78.242) by CO1EHSOBE014.bigfish.com (10.243.66.77) with Microsoft SMTP Server id 14.1.225.22; Mon, 20 Jan 2014 10:45:14 +0000 Received: from mail155-co1 (localhost [127.0.0.1]) by mail155-co1-R.bigfish.com (Postfix) with ESMTP id CE7A080274; Mon, 20 Jan 2014 10:45:14 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 3 X-BigFish: VS3(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah1fc6h1082kzz1de098h8275bh1de097hz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h1155h) Received: from mail155-co1 (localhost.localdomain [127.0.0.1]) by mail155-co1 (MessageSwitch) id 1390214711942538_8715; Mon, 20 Jan 2014 10:45:11 +0000 (UTC) Received: from CO1EHSMHS011.bigfish.com (unknown [10.243.78.233]) by mail155-co1.bigfish.com (Postfix) with ESMTP id 3083198006C; Mon, 20 Jan 2014 10:45:07 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS011.bigfish.com (10.243.66.21) with Microsoft SMTP Server (TLS) id 14.16.227.3; Mon, 20 Jan 2014 10:45:06 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.3.158.2; Mon, 20 Jan 2014 10:45:04 +0000 Received: from ubuntu.ap.freescale.net (ubuntu-010192242118.ap.freescale.net [10.192.242.118]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s0KAj2WY023227; Mon, 20 Jan 2014 03:45:03 -0700 From: Anson Huang To: , Subject: [PATCH] ARM: imx: correct usecount of IPG, ARM and MMDC clk on i.mx6sl Date: Mon, 20 Jan 2014 18:44:50 +0800 Message-ID: <1390214690-13564-1-git-send-email-b20788@freescale.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140120_054538_272387_C4E0118D X-CRM114-Status: UNSURE ( 8.87 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP IPG, ARM and MMDC's clock should be enabled during kernel boot up, so we need to maintain their use count, otherwise, they may be disabled unexpectedly if their children's clock are turned off, which is not allowed. Signed-off-by: Anson Huang --- arch/arm/mach-imx/clk-imx6sl.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm/mach-imx/clk-imx6sl.c b/arch/arm/mach-imx/clk-imx6sl.c index 78f3bd6..8d720f9 100644 --- a/arch/arm/mach-imx/clk-imx6sl.c +++ b/arch/arm/mach-imx/clk-imx6sl.c @@ -291,6 +291,21 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) pr_warn("%s: failed to set AHB clock rate %d!\n", __func__, ret); + /* Correct usecount of IPG clk */ + ret = clk_prepare_enable(clks[IMX6SL_CLK_IPG]); + if (ret) + pr_warn("%s: failed to enable IPG clock %d\n", __func__, ret); + + /* Correct usecount of ARM clk */ + ret = clk_prepare_enable(clks[IMX6SL_CLK_ARM]); + if (ret) + pr_warn("%s: failed to enable ARM clock %d\n", __func__, ret); + + /* Correct usecount of MMDC clk */ + ret = clk_prepare_enable(clks[IMX6SL_CLK_MMDC_ROOT]); + if (ret) + pr_warn("%s: failed to enable MMDC clock %d\n", __func__, ret); + if (IS_ENABLED(CONFIG_USB_MXS_PHY)) { clk_prepare_enable(clks[IMX6SL_CLK_USBPHY1_GATE]); clk_prepare_enable(clks[IMX6SL_CLK_USBPHY2_GATE]);