From patchwork Mon Jun 13 12:24:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 9172829 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 C8BD2604DB for ; Mon, 13 Jun 2016 12:33:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA65625404 for ; Mon, 13 Jun 2016 12:33:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE5DD27C0C; Mon, 13 Jun 2016 12:33:08 +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 381F825404 for ; Mon, 13 Jun 2016 12:33:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bCR1X-0002eL-Jw; Mon, 13 Jun 2016 12:31:23 +0000 Received: from mail-bl2on0086.outbound.protection.outlook.com ([65.55.169.86] helo=na01-bl2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bCR1U-0002WF-Kl for linux-arm-kernel@lists.infradead.org; Mon, 13 Jun 2016 12:31:21 +0000 Received: from CH1PR03CA008.namprd03.prod.outlook.com (10.255.156.153) by CY1PR03MB2380.namprd03.prod.outlook.com (10.167.8.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.517.8; Mon, 13 Jun 2016 12:30:58 +0000 Received: from BL2FFO11FD010.protection.gbl (10.255.156.132) by CH1PR03CA008.outlook.office365.com (10.255.156.153) with Microsoft SMTP Server (TLS) id 15.1.501.7 via Frontend Transport; Mon, 13 Jun 2016 12:30:57 +0000 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; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD010.mail.protection.outlook.com (10.173.161.16) with Microsoft SMTP Server (TLS) id 15.1.511.7 via Frontend Transport; Mon, 13 Jun 2016 12:30:57 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u5DCUqwM015400; Mon, 13 Jun 2016 05:30:54 -0700 From: Dong Aisheng To: Subject: [PATCH V3 1/1] clk: imx: refine the powerdown bit of clk-pllv3 Date: Mon, 13 Jun 2016 20:24:52 +0800 Message-ID: <1465820692-20055-1-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465803434-31507-1-git-send-email-aisheng.dong@nxp.com> References: <1465803434-31507-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131102946579544412; (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)(199003)(189002)(356003)(189998001)(8666004)(85426001)(86362001)(36756003)(50986999)(4326007)(2906002)(33646002)(68736007)(92566002)(6806005)(104016004)(5008740100001)(106466001)(97736004)(110136002)(2351001)(87936001)(229853001)(47776003)(11100500001)(5003940100001)(81166006)(81156014)(586003)(50226002)(8676002)(8936002)(105606002)(50466002)(77096005)(76176999)(19580395003)(2950100001)(48376002)(19580405001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2380; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; CAT:NONE; LANG:en; CAT:NONE; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD010; 1:Lmro3kgTMpKP/k1QTcDzCpt8voiDSj1wTh1WjiiLVr2LGjTZ5xpqec54GwwUi7XXHzeYenii1ZFO0e2RgP3JOS3oomS5TQAIaCk76I4VDIO44Fz5i3QY0HW7beiptDOWHM00VROlH9cu+pj2XYnxaroOLys0/6mSzDriisj1XHHFLxEDYk1w2LqYZZNrHa7uReQOl8FvthQSb53JzDBY8YOYRWOj1n1wVdaAeH7o2PzSmDid4A8sa4ud9hgy6sT96yoR6cEsdkaySQgdYY320bYNc/VXaovHlYWqjl99wwI5w7lI+fCug3mtYGXiu3mK4OSORiuxlzO7pdObVLLFXdSVcvmoe0omWaFMVNPV5ihMjBZROgw9eGxeBTicb1jf0b8/rKFIZETMO0qWOMZq+Z7F0E8iUE6EkxM86EDA0Go7PSRQGV9WJ/LaJ4tpAVjIxT6sxj1vFhae/h9vNmdJwtREH0a9kKPFJNlcOCr8Dy3Rn/YGuQLnVAEfLnbPFePitt8OOG5/oCXUKXFPMyDfZXRPi551Fd0sLHOTg/HPBMYAp7gCX46dTIYDwDtffs/S8Pf2mlHhb5qeDJxNBu2TtOzbSfcv8lfwlaqUp3J6gCKbk+queLIkh7EweEll4q1vv442WqgnXzxl2AVvvqeSHFaD2KRmYd8+iQU7+I8pNpOkR06MAmC2WHpjY1Q/p/8S MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 70411f59-a90b-46ff-795c-08d393869258 X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2380; 2:X+yQyACH2IfFtfb25eqoor09ukx8wToyacPdjgDeIxzsfQbSf05Drgf6OJcwr+BpXhAMkMVCDcWEuX+xej0BG4bfnJmcnNNC6aQRrk4cG9/vRK2qs7+yodkGIrQpOllDiy9cXXiAXgPxdX9Ryw3fRaDfy9W5FMxJJa1NtFazQyKswgO6z8QL0q6nQdNV56sD; 3:MRaFXsnX3jhjm6zEZIreHZ1unBHe9/ewEyRBUh+jUya90OKoCZVn2v/Lh7zblTcdtjYeDJ7mRm22dzvKgvC4OEnSMquHgovDb8Fl0CsNCUMl6MhsO2y0XfQ/9TQWk1dTE2WSBnEaQmed9l/ccFVRlpVjoAk2RLtfizHxRiJK43+BaOPobJ4CmA1WWLsNU3HT5ZZWvpKujE8hwCUVQxYqCnB9s/lUuzg5h1+UvypU8eA=; 25:ZQ2GUXmaPKM8gFz5DZwqVngrVoB7AxLqOUb8db1RtwCs3IQRDJb2eZmaqTIlXV2DzrCfmEpq6dvO6ISRWpYYM0uxiP9wZKdotb8UPlG4uxpkQZehIhLtb9m0RBbC9TUkx80QSmzu3H47tq6/6GZkUwys7p//fSqyQlCW67YA0Y2dbrZpHnuE341JEkdJtrFXgSc3b6KEH9goA5gnwaBaK+piwLcx2vPXL6a8y8FK3id06aN9ipH0liOyRoXmyZDaeeemM3nqz5NN8JsVvZQULj5XoY7SpkRzxauOeiCm05i6zQMJo2e4Vb04dyT93V+lYYSW7HttvDD6AGPK2EblRyTyxXLEb1vd4IvGJUq+iprvYqRHVa41bKOjf0H5alX5JIfF60Ddy7RV5Y/nuPwaEUdmhpkspeCSwDQtXwkq3/0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB2380; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(8121501046)(5005006)(13017025)(13018025)(13023025)(13024025)(3002001)(10201501046)(6055026); SRVR:CY1PR03MB2380; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR03MB2380; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2380; 4:f25NylT1LGSC2H1LsVYIfFuIjySpo4qHNx6Ao6aesDxzpbiP/rDpCwTVJf8irajb/UtN8IkXQs+JKI/+BYNF6DImkVsOvCJj3BCKy43IeC0PROWFsYsAKAwEroowvWcL9QBMcWk65Xlglix2FgagOR7TPW4wgfkwXxkf3PYzSgPy7H04BHlem7cfhAhHKQxReEC7mb0+XGquiTdVwq+BRrEO/g4Tk+AVqJ+TrYN3r9MGdhAe0YNIva/IJwvQr8S6+ZbeO/H4bbBjYDCpNPrR2ic1gsA0qY8STHvSgyTIZxWqCuoVPKhz9iBbyowSQXD5oodKUKAeZw7kTApy4qBJfnRqcsl3DItDNjZazopljNw2qkJrP0j49HJJfu4BaqfBVwZl37YqBsOU/HIVZpMpuNil3fAanzlFj1N9fHJ83G/EklolDOMR1www2zPjBEhpqbiS0eot5ZV536eXsnTjYE681J1N/rTsoyYvo2bjKPbc21VseEMvRRi+qjZPhakP1AWGq1/XyS+iJ3l1BUbeNQ== X-Forefront-PRVS: 0972DEC1D9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2380; 23:RLrtTgbCW+j/SXNc3mv1DzfAAege9xoq/JEcXH2lf?= =?us-ascii?Q?T2/qvdjGldRQV2WkkzfckDY5rtqNFc+9Y8zwoCnH7wIl1t9oZL/knv2uZEZE?= =?us-ascii?Q?rRRIMwQtzdZyfYPL3n1qVK1pF+0mbjMPXPwBqERVvg0y0gbHDB5PoHLIrQaS?= =?us-ascii?Q?RneXn0T0WHCV6iZfpYVEO262rwyTpRCB7NjIxbE6Td5RinRnhdoIp7TxZ557?= =?us-ascii?Q?688m2dGhzlhrMykUGez72JQ+yLkVIpNdKWt+7nVOS1EhnKy0Es7KRXARIxE6?= =?us-ascii?Q?X8lKsg2uNUQ9TjNoPexpA2KAVZRZjbeHPkgmfmbCuPSDEyjMbJhakiHqo/Fd?= =?us-ascii?Q?1MJhEj6S1h3wKB3luzaM0tMeO8VVGoNzERf+Ue8J8h4nhoRNA5A2L1Hl1Ibq?= =?us-ascii?Q?/3YJa1PZCbyqe4MZQ7xf7UEJoxRHQeVVdbuR81ZuyJbVfACH6HW84XAnK4TR?= =?us-ascii?Q?zDE3BU3yJ3FzCAbf+o0pvRCTReiNzgW/JA8JF0wweG8THJKTKEsq2ikH82B0?= =?us-ascii?Q?Anpu+OkR2aVcKfSNjVtY2RLjGLJ5b/FKvWaXJNRUIRGDEKi36S4jZYYn9RkK?= =?us-ascii?Q?8pMDl8Dw/aa2Xehox25rDEvm1lMnQobM4Yn1PTMnKZGX4h2aKciZMyJ+65UO?= =?us-ascii?Q?ZxNo8P3WaBmADUujJTzd644UoR6DKj0XrH0ccZ7yOd9C6ure8C9nGJWvPKwF?= =?us-ascii?Q?y9s8tu7lFCCPboAmjqtDsOX6SY3rIk79AFFR93VhrqRf3ECeJK+dMIktMQ4N?= =?us-ascii?Q?IjYEkJMV6vnQDMYwAC6nJiQAVV8Y2Bo4R9Dtb1+Jj26GCedoh17Qd3FJ5Irf?= =?us-ascii?Q?PES8AK1/gG6SQW/viaMF9LWITFNGskrh2tlRiCmyeF7O3VS/9ORohgnmxMa5?= =?us-ascii?Q?EDDSENJKFxGHRz4fyY4yAy2FNukr5nsfROIqAyqChn7Hjl/fiPjbrErxh6xR?= =?us-ascii?Q?tjfYPAOMxUtCYX+fJ6IN3jsohiVm97bOVJgQRY+xJcxD722ZUwspLXADv940?= =?us-ascii?Q?u927EuoUNIgzZuTO7baZECKDWPhVw40z6wg0KZpcK8oPGsNsliFaSO9/hgix?= =?us-ascii?Q?Jrg0VEqxT5q0Pa7ZVOUQq87PRiB0Aqzbu8S58VdE69uqSftt9czfYu8Ntft5?= =?us-ascii?Q?SpWeIDPdb43QE5k+PVodmumveQ6P5OZZahHRF7/Xq8c5EE4A4wIjLcfWZOje?= =?us-ascii?Q?R6kkxKRFNI4M3M=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2380; 6:ibQ4GYTBQS+XANlKdhGjeAu/zGyBewZtb006cS8MOlpxPRsPHiH7cMTSEuyW0yB4FleOGa6q17jlzVfN0uDYLUYkM0u6WA2Xt/+g4NB4P8AURwDFx5dnXjYoF/YbFDgrMam6xPijz9HZ5TBuuK49ynY9N34ypNujPojgaACzsKoYuO1sVP8xaVR+iNLuYeZUMLn1zA7bNzIW1yMdXZvwiWjuOHUpwe0oLkv63Cf7CROz1NO/1J969k3BCUzxbWYSfPgKyCgqRYag8PQpVRA6cA==; 5:4Av1AM5CPAVOgM8Mt5FuY+1C859fsAOui2l6jDSZUzz2DVXdgghqWZO539BVTinsvCemLienrsT4V8Z7b3GuDN/699AySMYl1tSAJ2v7lxbWxtM6iWMmHQn0M2gfRP0fntTn6Y0m/mb+/F3TTApZpiYNuZvx5hzUOh3vWaV4v+k=; 24:BHp9HgOWugcrlcCkOSICgofK5kr24G2/ccDbXUq2OP8xZXSgt05ODnQzauUdjc+FZZcZ75EsdQlm3e46km/1CpYrmPG1l7tgPhliK+zOsXo=; 7:GmH/NfXZngRbkD80H5+6yMByyOY5w6QreOC1UriH+B3xQ1ByELtgm380mbOH6AiUvMCqV6KyUgR5tSJv97aon23aB8SMzZvUowRE5/DxnKs/PyufIpXZz7lDjoXRblKLoHJ8KCahnI6PywCN6JpNsJSBX94esonfb1epNiMrrGuyUmfrQsKRLI/26eMQxMSG/1WCzDRj9MIxYmGu/0G8JQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2016 12:30:57.7828 (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: CY1PR03MB2380 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160613_053120_955358_3C3A50AB X-CRM114-Status: GOOD ( 15.87 ) 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 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 --- Changes from v2: Sorry for sending the patch too quickly. There's a rebase error in V2, fixed it. --- drivers/clk/imx/clk-pllv3.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index eea2b1b3791e..19f9b622981a 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,9 +77,9 @@ 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; + val &= ~pll->power_bit; writel_relaxed(val, pll->base); return clk_pllv3_wait_lock(pll); @@ -92,9 +92,9 @@ 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; + val |= pll->power_bit; 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;