From patchwork Thu Jun 30 09:31:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 9207141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 991386075A for ; Thu, 30 Jun 2016 09:41:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8337E2845E for ; Thu, 30 Jun 2016 09:41:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7326828661; Thu, 30 Jun 2016 09:41:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A46C82845E for ; Thu, 30 Jun 2016 09:41:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bIYRr-0001uy-01; Thu, 30 Jun 2016 09:39:51 +0000 Received: from mail-bn1bon0092.outbound.protection.outlook.com ([157.56.111.92] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bIYQv-0001Af-TB for linux-arm-kernel@lists.infradead.org; Thu, 30 Jun 2016 09:38:54 +0000 Received: from BN3PR0301CA0024.namprd03.prod.outlook.com (10.160.180.162) by BY2PR03MB1926.namprd03.prod.outlook.com (10.164.114.30) with Microsoft SMTP Server (TLS) id 15.1.447.15; Thu, 30 Jun 2016 09:38:39 +0000 Received: from BL2FFO11FD039.protection.gbl (2a01:111:f400:7c09::123) by BN3PR0301CA0024.outlook.office365.com (2a01:111:e400:4000::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.528.16 via Frontend Transport; Thu, 30 Jun 2016 09:38:39 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD039.mail.protection.outlook.com (10.173.161.135) with Microsoft SMTP Server (TLS) id 15.1.523.9 via Frontend Transport; Thu, 30 Jun 2016 09:38:39 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u5U9cDxM010090; Thu, 30 Jun 2016 02:38:36 -0700 From: Dong Aisheng To: Subject: [PATCH V3 8/8] clk: imx7d: only enable minimum required clocks Date: Thu, 30 Jun 2016 17:31:18 +0800 Message-ID: <1467279078-2330-9-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467279078-2330-1-git-send-email-aisheng.dong@nxp.com> References: <1467279078-2330-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131117531194829564; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(77096005)(11100500001)(76176999)(8666005)(50986999)(50466002)(2906002)(48376002)(105606002)(4326007)(104016004)(69596002)(106466001)(19580395003)(81166006)(87936001)(5003940100001)(81156014)(2950100001)(47776003)(8936002)(2351001)(110136002)(86362001)(586003)(33646002)(6806005)(36756003)(68736007)(189998001)(229853001)(19580405001)(97736004)(356003)(92566002)(8676002)(305945005)(85426001)(7846002)(50226002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB1926; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD039; 1:ZX2VS8Ew7xlQ10RZgaXWCs7VBT4SnLecLLxgAZyO4Ga9J4cqOpiOJ6dWouPCxaLH6IN3r9xjysNCap4nFCLEt6lOF2kPxBpDGwrVpHR9p8rc/bx7holYWpxD1w4rEt7z+r+8L08k7IKSpfBUAn0e+yP1ORmYionn4Ra21ts7XArcbOTF52MCewQ6amFlOfp17EgNq1d9H8Nydq/QE5d3cR+Lr2xhFt4gDZrbEzSb8uDq2tF5Opg80x6mQ4zkChaOmpfOUOvivTbdfkX/tWAFIzAZLwwis4BdzVJUeL9EAXzgratI7TMzbmMp324TiHxZhZkkvcF/7tvBaUXwEvbjG9sH3swH+2qP5jd45PcW5YbYQhUswM40e+/fbDbnuCMkmQP1/CxrvYgPmFRHEOjmqu36X4Fy8RLWrVF0jz8+qtoE40/5zPv86Az87/CoHihMFGfLMRjI8zQxxIzpyrewHi91dvmuOPeG3T5PwPNFlUWDfj5GxjUWHsNPd1UDlhRyVkHuZuQ0U4BsRvJBK4x08KF8EDmcd6sDZ43SymIa73WM5wGrFfgk7nr6M0NAtRSW+4xT+GnA6T0VEgCQLfVJs365epQDCeRyRmWTSJiqFX0UFABH4o5N2M+xAtA0hddFXFdmH9Bi137tLuKjmZBd39n0l06gQbXQNmjYPDbVpXUQJlrwHuli7vhHe5+VkRfB4IjpacI8oXmdslEPg+0aU1//DQ19wIDDCTpd8EEN744kkxpVMFtmNaMcJLJBNHeA MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 630fea67-f808-4790-499d-08d3a0ca5126 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1926; 2:qU5plC07ovULq1v3W1SIgaFD/x0KnxKVDvt6xLsJ2ZYUfpwk9yAkGkGNZ8+75dzpvqMUuNUUan60oPYGHXG4jTGc+zKYVHatBcSdP4sOHjYWbrJ0cix1Sk2K8/38tN7gh4qphjGUMBLTT5p5de18r9dp3FkoQsuG7rLHIs28zBGr52Epf0tuUtKbA2hbMdyO; 3:AP9QZes6ZI/C+TehRdU+XmZtLXH20No9Mdv9AxLOTWBAHc2WGL0EMrt3TRC8zxTWnait+JsKxG2YlpRPmjkQHoGtnN0IhV00Ml6JiCFvZlQEICI87xCAjx8qBWB+5yDaZLytNheX3yZyMTmDz2CX3qu4xtN0igdQ4WZY28RmFlHNBsIufc4Ukt3koQBtLeIfa4wEgSqlB/npJ1ikjjLFE+Q9bqTmLcnki1pMuaw8rmc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB1926; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1926; 25:e56DIfHlbX33n+zXC1bocdB6vnVmH1U/GQsBbPPoAdupfqLFMrLGX/4ZD+ORjWdazwEitBJBV4rVzBS+5841fuJJhtrVdkuVuPZjnFK8fCXQdoGzuyTwlAfCrilGPZHLffS1y+CGdtHUx9TeH7FBlLr6MTHQ06GqgOPcZLio4wLQIR2pRcEMZ4r8kDzZdXHk+atoQa8gXJoDgImVnFb/im52LcUSn/D7OUCXCxsiBV/+ZYlD0tjPgwudEHK/1KsjFmsm/yt01fAmsN10GG1uKqV3LgMFfyefYe+rHqOKZ/bOpCak9WGP4sCPmRXlEGvhTZMvVjyyZ4WRtRje0LjQmdxAYw4iAj0kS6sisGOfiq+b1ytMIVe8uuF8u+eZWIoDhnhn4wWR887q0CifHvsfM5FtIPug2VU/IoWmoy0OD+oY3ku0pLNYkhvdIF6oo6b9kMGbtDspOF/3UsSKLi6upsUntQQla9dpOt7g5LfrcTn4r5gHJD4oXcjCNB4rAQioQPUZ8va8jrjd2/Oanl5Q/Spyo/3BHGjv6D5O/+2i3dEGSt3qwRVWOvMFwgunNkEK X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(13015025)(13018025)(13017025)(13024025)(13023025)(10201501046)(3002001)(6055026); SRVR:BY2PR03MB1926; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB1926; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1926; 4:Fy1be8D33p9PdGglHVgw9k0unlSAqcFXGL1RrN/erK1h7pwzH/dDABi1aJm/On+ZSOBm3C7SpC8H7uk99q0ztAjTUmbOtZWbiHOXTwfsdv9sQ4pddgwckgA8ogFVE8LdQkazpkXSScboBS70SFj/vC7Wz7mCJhTLI9oBIg56xpOBWokjT66lQjdPkYULEjW9w7ZCcqvo7TjT44OgKwZRvDyReQfgEX2m+PtDZeotF7ZwxMIVmgKnzeVIbTyQ1e84R1oixH00DbEfZk/PTclnLfQZ1Gi9avvzETEWc706WwU9/uPRE/59DAzOQwfNTalF4gkfafn9PHJl/dwtJS3VVvt06DKxVB69zc4LursI9bixphpzVBEyWA+T+ReJJb6XPNi418n2FV4KO1MxyFW75yNb4Ffn1j9ywRz05LppsOz2PQ689BkXb4a+jQlbfnlJ7v68tLEc/3sakUwScbpdOb+ggS+AwY2yu7dAk1ofL4Z38/HMo2XQb6KGpJFQrdQwPrvvjp/SFrwdHMDNAYk51Q== X-Forefront-PRVS: 0989A7979C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB1926; 23:bva1HOTyyVi9shvr3VmYPtuF4CBvQExz80/39K+jx?= =?us-ascii?Q?ZCSEfjCHSzKkBkMbNWZdOwd+SB3HorF9R1mmhesa/ROx/PxO5Qd+qlGVYx4M?= =?us-ascii?Q?10xWi1BmqwuGASZ5qFJYwwaK5Y/FHVHuIAeY/3ZIAG9Z3h8STTPGnH+tjFzq?= =?us-ascii?Q?DQttvXuSMjyTkRFyvwdfyZhNXUI/3nhu72JEydBS4uw+KrstWvUoOf43eAyG?= =?us-ascii?Q?cSy9ZTjqkDcGWJy99RQjLutplkYo97Mc1uwmZCRD6SxSeD6bv0SQ4B+Yfc6l?= =?us-ascii?Q?rp6B+R1xcA2Dmtdgy5g7iejiKUmwLu7N2WbY0ehKdPx0R+qQ330OROpZrrsr?= =?us-ascii?Q?XJvtUgEVz6doMvWrErd6eWvo8iAerMS0V77avUlTxHxYxkUkBH6I+EeQnsa/?= =?us-ascii?Q?kooS6IGrALivv5nWFhegKxArN7oKX4VF6qHqjm1PJgRoc1uyRPPgWhq8X745?= =?us-ascii?Q?NLG0Mh2zncLe2fnYlG9Hupq7Z++sNlPSvarX8zOFt0iVuEdyyPHXV10RkmAL?= =?us-ascii?Q?DtbfOPNtGUHuMQv44RvEsx7oZ9SeZLuy6kVz8qNnOX913wAVsmw0xPNo2VJR?= =?us-ascii?Q?tbbMhfGvTKNdmIzp9otIzJoOXpc2Yb3JjckSx9Dsblqz0KQWJ6RTYjYvdzaG?= =?us-ascii?Q?EicJvWsgxRXUlfq7dTQKw/gkbYkCQskcTYUXDTEqqHKrGGHBmu23xGynLCib?= =?us-ascii?Q?VuccW2HH8sMLFXEgbDYpwd/vvMEwJPme1x284QfMCg6vHt01p2FSjpi5Dp8G?= =?us-ascii?Q?rHZL4uZ9zS122uMuv6dKpoJsRtitU8nBzoB5mZLLEsSoZ4GPp7NZ5dtTfoCw?= =?us-ascii?Q?z9YPriJ3fSXjeZYB9PdtMCfWnCqpzmbHLho6jnZTMJXVNvDzAd/TyJ8z3/vF?= =?us-ascii?Q?7w+d1espUsmfDxRKiy+DPbt6I1xse7KlWowWAFd09LfzUEixocQpBvARf2ui?= =?us-ascii?Q?hjIMU+l7vh7+JA8QZcXlx4HqiOyAGLwbana/UajEQQZqsKLXy1zDP5+m1rO1?= =?us-ascii?Q?NeLZS8uYIBveqbKRrcTm/oM1D3h2cLjN9w/7HXuvKaZIExNbF6lDo6mVxR+E?= =?us-ascii?Q?/0prdwJAkUrvO4XZSPUTfUjeAB3h55YddeNgPKrTv4qmDL5svO1sBDZhDgNG?= =?us-ascii?Q?w/6w3jkV2E/lJOQraAVxAws6bD151JQJNGh2mt5lXdxynxQ2nIciLvtH/aKI?= =?us-ascii?Q?0Lt5PUjGsopcUzGFFeLW5kfwST2seID6hhP?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1926; 5:QbZ0zZ1+siii4IzggYcQMSlqug2eDYUhMxkngdpDwS1kkHntXsqJ/fA8yCdbnUxtgg+Z3u73tuiKWxHdrTducoWnBuEp2RaTzhVkW8tKFjgVEqBd8rSv/kovcuTnyrRn9Im+mB5Ez8JKEdzuDad6SlcbnBBDtQW3rtBBkPvNlks=; 24:yKNtZMnVKe1yhaTnn7+JuBQwcsfwFEsZ81rHAEyRh50B5Fn1gNesEdc//UbyypceFviUCMDgHo/XE4VzLRoQl/hYF9skRB3OQgcxg5RsU8s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2016 09:38:39.1709 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB1926 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160630_023854_135467_727414CB X-CRM114-Status: GOOD ( 11.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aisheng.dong@nxp.com, anson.huang@nxp.com, mturquette@baylibre.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Formerly clk core does not support imx7d clock type well that all its clock operations requires the parent clock on. Therefore we enabled all clocks by default in clock driver initialization for other module clocks operate well. After patch 'clk: imx7d: using api with flag CLK_OPS_PARENT_ENABLE', clk core can handle such clock type well, so we don't have to enable them all by default anymore. Instead, we only enable a minimum required set of clocks. Cc: Michael Turquette Cc: Stephen Boyd Cc: Shawn Guo Signed-off-by: Dong Aisheng --- drivers/clk/imx/clk-imx7d.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index bb5affae0850..7b46ed0677a5 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -361,6 +361,14 @@ static const char *pll_enet_bypass_sel[] = { "pll_enet_main", "pll_enet_main_src static const char *pll_audio_bypass_sel[] = { "pll_audio_main", "pll_audio_main_src", }; static const char *pll_video_bypass_sel[] = { "pll_video_main", "pll_video_main_src", }; +static int const clks_init_on[] __initconst = { + IMX7D_ARM_A7_ROOT_CLK, IMX7D_MAIN_AXI_ROOT_CLK, + IMX7D_PLL_SYS_MAIN_480M_CLK, IMX7D_NAND_USDHC_BUS_ROOT_CLK, + IMX7D_DRAM_PHYM_ROOT_CLK, IMX7D_DRAM_ROOT_CLK, + IMX7D_DRAM_PHYM_ALT_ROOT_CLK, IMX7D_DRAM_ALT_ROOT_CLK, + IMX7D_AHB_CHANNEL_ROOT_CLK, +}; + static struct clk_onecell_data clk_data; static struct clk ** const uart_clks[] __initconst = { @@ -846,14 +854,8 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clk_data.clk_num = ARRAY_SIZE(clks); of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); - /* TO BE FIXED LATER - * Enable all clock to bring up imx7, otherwise system will be halt and block - * the other part upstream Because imx7d clock design changed, clock framework - * need do a little modify. - * Dong Aisheng is working on this. After that, this part need be changed. - */ - for (i = 0; i < IMX7D_CLK_END; i++) - clk_prepare_enable(clks[i]); + for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) + clk_prepare_enable(clks[clks_init_on[i]]); /* use old gpt clk setting, gpt1 root clk must be twice as gpt counter freq */ clk_set_parent(clks[IMX7D_GPT1_ROOT_SRC], clks[IMX7D_OSC_24M_CLK]);