From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965159AbcFMH6h (ORCPT ); Mon, 13 Jun 2016 03:58:37 -0400 Received: from mail-bl2on0067.outbound.protection.outlook.com ([65.55.169.67]:12064 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964793AbcFMH6e (ORCPT ); Mon, 13 Jun 2016 03:58:34 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; From: Dong Aisheng To: CC: , , , , , , Subject: [PATCH V2 1/1] clk: imx: refine the powerdown bit of clk-pllv3 Date: Mon, 13 Jun 2016 15:37:14 +0800 Message-ID: <1465803434-31507-1-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: X-EOPAttributedMessage: 0 X-Matching-Connectors: 131102774082666527;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(2906002)(189998001)(356003)(19580395003)(2950100001)(76176999)(19580405001)(5008740100001)(48376002)(6806005)(104016004)(586003)(105606002)(8936002)(36756003)(97736004)(50986999)(110136002)(92566002)(8666004)(5003940100001)(86362001)(106466001)(8676002)(81156014)(81166006)(4326007)(2351001)(11100500001)(229853001)(47776003)(33646002)(68736007)(87936001)(50226002)(85426001)(77096005)(50466002)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:BN3PR03MB2371;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;CAT:NONE;LANG:en;CAT:NONE; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD036;1:YLNPA+QG6Fp/gbE7R92x/iM7L65ztM76cGzQbbto+fj6HNc1OXWieKY+OGz0z3uOekwc4dCh3vnLTJLvgT2sMZR8wXiAlzh4qhSYWvTyY8kPf6nDAVk/SHrZhoJtIW5sDbmcd68pZy3LvulrgN/vi9j7q09KBt7HEljnU9oA9uEb7aKj0TPYvRL4kqeBRxeugtb0Fn+yVaz0RUI4yiUPWKuIW3nXwe11Bt1dOzOz7z695sBoArHtGClkglpTq0zN1IS631fanXr88Ky75eqriZnZ2jGZGlVRNMsYQhjw5tGm95MRfClodckpvpu+YMkpvRGqICFSRVoqJLuxoeqKynmcB7XE9m3rnT2qWTuMGaA+i4OLnxFSgZVtbl5LLwoxNhSWC++3zWeGW6P+ROe97/1FZ6FzbLKMfnluHCQhE2jcvowwag2Mge89dYPZZsLWUeXFu5vuDPp97o4qDgd3d5eWds0DjSCL8A1d4de1hcVgCmEjogto/zwRPNVmB/rPc2jYwWPoo+XSf/skmP+7xgXSubG/s4z3wweYbiHaO7pqD5o6qIVYTjUzJF4WUuRYUdSgG6fliHS2JiUzOoA0OEjRSbWab/ZRVx14snJYO3qQVhXuitHzx1d5Ps6aB3Yo+lCaRGowLcdbkR86CErnK6yjelRAHhLE+Ua2j9RPNznw9S1ZvkSWSMiZQuKBDMu5 MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 12262a93-9f24-4d57-9ebd-08d3935e68b8 X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2371;2:NLJyd5lBITTBm8nSuu2s/49u8k7/Rbnq5mKLjZgxO3XQWjOsJEVGbiPU9SANHhDc3F7/7KfjDE/AfWUWvQ/4KOJRO04DS+vL7h2+Y96sZ0D5FQMQlISX6mMDAmDIg/2pZV2K/ghDdoGpnh1KfSyQtcn9aqboyDecISgb2igLy5UE4xw7C+VYX5Iee8RsnjnV;3:j7UnCqG7Ar92COrEKYDSIcEITy+J9ozuQ3jMgprHEBNokReIbgz+22RCCWqSacJOOT1x3gMs6x4pU3kj6botQ0MobYQ4DfmAbPUbGPpJVXEy/dbWE+rs6qRb8cp2sVxCDjOlGI2HitCe8LNEU5tHOprK4uBshmf6vZk0qUWwGoXKlmng7PgKCfjh4Z5cVAtHmc1Xo4sXlJpvBk6a8pQECdz7nHqayHqohTxGiKpJ1aI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB2371; X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2371;25:qY7X9xN9ntiOGOZvtA+gt767qTQClQIRKXHw8cBq4c38dV13k3TUWxiOpub5tjMWsoWZxjeCf7lBPOaoio872Sl/z60YtMGPCCC2HdxbsNSQfENB+uESvI7pZL8RuAFXsFfKZJNuaXmkk+URxlGVYPwaQVvgA3DlCh012raQUE70nEqpw5WBkOI6rznYeihmiNxo1oipIqZKd/rZMW/BJ67RxTVCJ1OYiT79A3J2VMFli+EhjTDOOjtXE4KjhVFkKqzs0/7uJDCqZnQYXomwtw/AeN++qGp0o3ky23vhKKxa3kEFGe9+OeNM8Gnb6uJCl0sfEM40fJTvLwwiJr9BYgVVVOL2Dp76IjobI7Z6+FJtTPy4RKJcJu9S7hqR4yESMCMgtO/fdbgiVMmkgGIXABkvB8DJt/4R+HDjM9Gd733wB6zkDhBC4az1M/8t3k5brlKdDB8fOG/ixgeK3fSm2+GUCxxlWEB7eKt3IzKpEfZ7QwODXubi/OQVTayL7bCQQ/sqfH4CbumqJRTfPBoc0N/mUbczzYbtakNZD+2/+Moiq3YLZ9DaMfkh/QBj2bJdqCw/7j74SOJrMSWNbwBKjCQUOJe00ujZ+8g0fFkqX76jbvjkpIed6SEXiUx7e/4oRGp6I1oPIZ8F41OGWtrAmWuISHrFaX89fumP2GpwscIG3/vNMPMtn1GBTX/csjn+2gw5MkbT3xQJ68jeWQpQ0w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13017025)(13015025)(13023025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026);SRVR:BN3PR03MB2371;BCL:0;PCL:0;RULEID:(400006);SRVR:BN3PR03MB2371; X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2371;4:85bCY8T+S/PS55nzdT/1MDTHZqRraq/l6PPTDA5TuFngQ5OpfSbbQk9OW4flEDX1uq9XQT2WpRcBkWgtJVXpH9rTLrChyrbe5LrCPfIA8h4fJ+pZ9wq7BlUyUANdqOsQeDmKGbsajFIKBjOhol7d90RRB3Fq0wKX87WLVtVCmTIG7V3DSmaL2ozaDc1LFL5K4Ep1yJeKI/8Xf7J9sBCXT7SNk9F8ni0CDoxkN4ZXR2AlSTcR9ZMdxFak6KyguCDJuv7DcfBvJA4VuQz25SYV4goz9ARKM3M0VnDg9xoMAr5+xEdDJdEqziG5wz5jDVxmo9zHjGLOEK/U3oXfWl28JITFgcp6S46iBt2xS6AGkGyQ9xY59TNp7owXxBwULGU6YS8Y9JxH/8naOH6LnL0JE1COkiH+ZtwHtOS+vAH/1kevadrt5Ua+iwrQwjkAsrrtjGvCBeBc58PcL6MYABgGnWJoF6yQ3ZYR00+/AKi4d2anu/f+o9fSa51JyLIMyY+ZVa06OZlwQxfM7SHE30sfng== X-Forefront-PRVS: 0972DEC1D9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN3PR03MB2371;23:SwtbQ1Z+9Mf2kPf5vIHhfTYOoABf8OJtLYrgfLU4D?= =?us-ascii?Q?a5CM5jp2yuBR48ri4v7itHS1gD0iG53oPwBiz5JqPx76su2P30j6VRL3HDXu?= =?us-ascii?Q?87j6gCqKdK+b+sRKx22PvNHiE+zHaFMGZNJVVuJfMpMHdvYEJaty71fQ/OLC?= =?us-ascii?Q?3ZQNRL4OeU0IRVTCi81c980kMvtBQOsw89lNG/xkU17KlI8VzHcxvwqfcmti?= =?us-ascii?Q?08jPzZ3anMlqO88+RWZ6AfbM9X70fqapo97/aUOe7tOPsE0WyRLAfmJJmNw1?= =?us-ascii?Q?1OTV22snKGCWruyRMorTs4wDzEDqKX5I3sCNE7bzglv9m7LtS0gJgF/jdI1+?= =?us-ascii?Q?MbmKHwKehU2BP4q++bTHQUlLxwpZ6utKcWHCQk4HUrMHMeIrSP4nptkwf8PU?= =?us-ascii?Q?svkI3rFMdYK6zZiqK7zq8t51cpWjDrCTmVKan3QqCB/R3fzJ4GJiln7vYGCl?= =?us-ascii?Q?506ZJNUhsBLKC9jOfDKGYyeNksyPWr+yJ4Cg5OJWcerMl+ugAwzO4qieca5u?= =?us-ascii?Q?KzFpqBELe+u4cN9u4EN3j/1gvBm9NlTFgawwErVYEQutUQ0rd0mhQw4QLI/v?= =?us-ascii?Q?qhLrziEBz5dJ7sOaWZMHFVn3is2GjORJJPs5fqX+fXpenw6HLbi1Hh79P4GB?= =?us-ascii?Q?WDInXWPuqQyKL59jN/YiIL+5FK8YZxlsMadO7NTDwOvAM41R9lC1tl+ivQE7?= =?us-ascii?Q?XyvGQUChPriGnWnlLpD9uzY2LwuMZNt5vVkGPXddrq2P5PoTVQcMhPT1P0H5?= =?us-ascii?Q?9G9XwaTDWTdEctDz+NSa/gFqgCwpiMrcCGjywa99LTb+r6A0WCH04quXwZaH?= =?us-ascii?Q?uNN5fbemBE+qZJahYZxR3Ef98LHKFulH/0XlofomicSMH/Af385cTZOH23nJ?= =?us-ascii?Q?CBwvrxv+KFEEBL4/13VHxYKRx4EB2C+FX9Eh93Gu3xFFhF7OJkB25fP9KFHF?= =?us-ascii?Q?QwsG6oiIGVl67d/v6DhjT+XK8b4waitCd4m9iosL+m477m4bDXeFgQ/LfaKb?= =?us-ascii?Q?ibLlBjRy5j/mDSk7R9MCUS/khuaZYDIcRhT0FbBdl9bRSTXWxbDOjbOpbmJo?= =?us-ascii?Q?VXekea3Me7V4U0MytLuxh8qJxZ7ILaJ37+xkydsFEKGjDsCyUR+NYi3bs82V?= =?us-ascii?Q?roR1VABbFSnMgpds9VaA/hjrPl0TcKETKf0O/0CcfMTW66+GWravPB+LdmuF?= =?us-ascii?Q?esdApRwpJGyj9A=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2371;6:lRhn71It7wjMHzpS9TTnAWvlriQ3d7zCjh3njaBamYqk/UtIKVuKPctg6lw2TH75brawXXpI+4leGEavfOdDCE5ql//5xeixpSZh5K/woEUckwqQwLH9YArQ93m/57yAswQf4txLeUG5mx07F53Izgey6fmOyu0z7tOPl8tKCPw49410kCjGRlPgsRjqSnWseawT5detbEYCkVOe0lmNeS8lFGbWo4K3J4zDFLVFvd6mrY55wmkf5+8qkTWsdguFQds8Tip6whxdxRm+u8RqHg==;5:izrxkMezE9XSlC2Amav4Jp6yILvuSPjI1A3N1miNweXDUuib0O6NGuGdN2qGnzigtKRoup933DnQd0SAs1D3V+QcukylQ44KtWs/3xpkU3UK1mrZanoWueVU6CAD0KkuLCBYsvk9lsE1sA1HxAs2o0ne6DQHPwpV2ztXG8Qm22U=;24:gl57FnaozG0Jqgv7j3H+RzPLZOfvOSb/pON61as3YavxTeYmt1j43BD2qsYj3175ga0wcuy/sNRlsI1m+Nn7c3d150DBCP5rIGz1zO9ubm0=;7:dKcCFQknUWxTlN7QQXOZeKaHaglTAMDsGlFBwljb1Cg8KR3Cw7BuPmZrkcN2pZOKpXHaLFoNzBT/UYatmeYJQoRw5cwzwopZcfPjMIImpHCP/HNtpH6cVGseZw71bUmQBeF2lXhkky5okxMi9ElP5yF4pSOJZPcm78OtTudzTCkNYfLn1zINC5GVL4rn9+4GsHXttQyz+CoIJZ9MivzeAA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2016 07:43:28.0794 (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.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2371 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The powerdown bit is a bit confused, let's change it to power_bit to relfect both powerdown and powerup case according to different plls. Signed-off-by: Dong Aisheng --- drivers/clk/imx/clk-pllv3.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index eea2b1b3791e..379ec133fab2 100644 --- a/drivers/clk/imx/clk-pllv3.c +++ b/drivers/clk/imx/clk-pllv3.c @@ -29,8 +29,8 @@ * struct clk_pllv3 - IMX PLL clock version 3 * @clk_hw: clock source * @base: base address of PLL registers - * @powerup_set: set POWER bit to power up the PLL - * @powerdown: pll powerdown offset bit + * @power_bit: pll power bit mask + * @powerup_set: set power_bit to power up the PLL * @div_mask: mask of divider bits * @div_shift: shift of divider bits * @@ -40,8 +40,8 @@ struct clk_pllv3 { struct clk_hw hw; void __iomem *base; + u32 power_bit; bool powerup_set; - u32 powerdown; u32 div_mask; u32 div_shift; unsigned long ref_clock; @@ -52,7 +52,7 @@ struct clk_pllv3 { static int clk_pllv3_wait_lock(struct clk_pllv3 *pll) { unsigned long timeout = jiffies + msecs_to_jiffies(10); - u32 val = readl_relaxed(pll->base) & pll->powerdown; + u32 val = readl_relaxed(pll->base) & pll->power_bit; /* No need to wait for lock when pll is not powered up */ if ((pll->powerup_set && !val) || (!pll->powerup_set && val)) @@ -77,7 +77,7 @@ static int clk_pllv3_prepare(struct clk_hw *hw) val = readl_relaxed(pll->base); if (pll->powerup_set) - val |= pll->powerdown; + val |= pll->power_bit; else val &= ~pll->powerdown; writel_relaxed(val, pll->base); @@ -92,7 +92,7 @@ static void clk_pllv3_unprepare(struct clk_hw *hw) val = readl_relaxed(pll->base); if (pll->powerup_set) - val &= ~pll->powerdown; + val &= ~pll->power_bit; else val |= pll->powerdown; writel_relaxed(val, pll->base); @@ -316,7 +316,7 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, if (!pll) return ERR_PTR(-ENOMEM); - pll->powerdown = BM_PLL_POWER; + pll->power_bit = BM_PLL_POWER; switch (type) { case IMX_PLLV3_SYS: @@ -332,7 +332,7 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, ops = &clk_pllv3_av_ops; break; case IMX_PLLV3_ENET_IMX7: - pll->powerdown = IMX7_ENET_PLL_POWER; + pll->power_bit = IMX7_ENET_PLL_POWER; pll->ref_clock = 1000000000; ops = &clk_pllv3_enet_ops; break; -- 1.9.1