From patchwork Wed Jun 8 14:33:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 9164883 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 D589760572 for ; Wed, 8 Jun 2016 14:39:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1A3F27248 for ; Wed, 8 Jun 2016 14:39:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B64B02824F; Wed, 8 Jun 2016 14:39:37 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3513027248 for ; Wed, 8 Jun 2016 14:39:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426215AbcFHOjg (ORCPT ); Wed, 8 Jun 2016 10:39:36 -0400 Received: from mail-bn1bon0070.outbound.protection.outlook.com ([157.56.111.70]:23589 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1424511AbcFHOje (ORCPT ); Wed, 8 Jun 2016 10:39:34 -0400 Received: from DM2PR03CA0050.namprd03.prod.outlook.com (10.141.96.49) by CO2PR03MB2374.namprd03.prod.outlook.com (10.166.93.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.511.8; Wed, 8 Jun 2016 14:39:30 +0000 Received: from BN1AFFO11FD042.protection.gbl (2a01:111:f400:7c10::153) by DM2PR03CA0050.outlook.office365.com (2a01:111:e400:2428::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.511.8 via Frontend Transport; Wed, 8 Jun 2016 14:39:30 +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=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.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 BN1AFFO11FD042.mail.protection.outlook.com (10.58.52.253) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Wed, 8 Jun 2016 14:39:29 +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 u58EdPaN005456; Wed, 8 Jun 2016 07:39:25 -0700 From: Dong Aisheng To: CC: , , , , , , Subject: [PATCH 01/11] clk: imx: clk-pllv3: fix incorrect handle of enet powerdown bit Date: Wed, 8 Jun 2016 22:33:30 +0800 Message-ID: <1465396420-27064-1-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131098703699697094; (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)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(5003940100001)(86362001)(8666004)(50226002)(19580395003)(8676002)(50986999)(189998001)(77096005)(19580405001)(69596002)(8936002)(68736007)(85426001)(110136002)(97736004)(229853001)(11100500001)(5008740100001)(6806005)(586003)(2351001)(106466001)(92566002)(105606002)(104016004)(50466002)(81166006)(48376002)(33646002)(87936001)(4326007)(81156014)(47776003)(36756003)(2906002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2374; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD042; 1:3/0mz8+Ak6rDkPP70FM8CHEzuzu3YAX74micoktaa2wsIJn1ycFPhV2z9NHIBsbdX00iLeWjTJUHRUOvoiuktorDZioqtTWxgP4kkpsirYhAhfuR174qpBjYHZx4Wjgt0huO29k/96k73lVim1FWJRmfW605TDOKs7+2o9zUoF3AUvQ1kYJ+Rnjc+6Uww6n9ikAS+kTtSqyTRspL9hKf/va7QRjQh8MU/aLSfLy83CAwgwL+tg/RzV8NheLoKc1CdCBWIX6DuqBxE1Yr543OKzhJNscykxmlW7Vq6LYUCYVuyFqXsIrtB/WTsZQlTAvwk4JTueDEUyY9czWo9SJ5+JfHfjkAWSOj+ZpneOgbxi2St9LxsxB4PSppWF46u0qtFIGIReKKPl4jP1X/Ds71ZiG3/h7oEkFHwdpTMcNw/6pzLHDRhqjeltRzSB2hyU3WIP2yG5FB/uy8aLUvHEvCq3suOm6/uA2cvSy4zwjjM40rzTRRIirzJHpfHNDaAILBvXklZ3c4X0M0lOoVZgE8CDNalN5rI1Nu6u48b/p5Ou65DtB9oazqrMiFFRHCKPEgFkST3AUTtyUD21yb0UmE5p/VBAWd/MIiIpdgu0ld3YNzbsdEYnajQ/UZeMy2n67o/hUqy3L0c8NkBkflX7fISvP0ffzIasyWGHTOEwPfozYS8LGClDqxQC3necyVZCIY MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: eb4c02fd-72f3-42e7-7c65-08d38faab2fd X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2374; 2:Wv3/PLineK6TUf5zxCSsTdJhVIr1VMkKexTazvA9k7TEik+1YdvxR3xLNkBGkZOcw0JSqvO+3d1GtZjvSCyMTheOmAl5RUSaSvdKLqFmAd+UeL6qL8OwB+e1ZTg+/7YOE7dFNxUOryHr0tDHfnc+VOjowkn1M2xHBbmH5/tMpRyfqNvd5LfpZdCQWJoRLZ5D; 3:Y1rx7TVgXPfdcX9CNU8hzdguc59i5UIZlvqqGt1ct9bZoEvLw+y4TkcR7FRfgIwhGG111JErN6D2vpDaBFlqn46JPWK/P1XWpsMkqU5X5bDwZ3OMHmorT/2mLehp/E56a2enInPre3/q9KdrPlt1YBVSLKSziaMh2tOaY6XlpmS2/SjJxS4ocX0Srx9/QFoK3ByLXfOZkxl/lJzPDF1a5sVEaVjL7+nlxS1pqiPSGII=; 25:y5TwMypu1Ktked1yBykHAuPs0O52A4tBcLBbG7o9EJc6IlldCbLqAs4pCJcRIBoYhJRt+1OutQ/xD4pt0xcTK5lbAAcMM05SQ/gkSLGFYw8wimfzGHNVZdTxjL2soRyRHZr4gY6wCW2fElQWnW3yg645rowraRDILaOCDWar7OiRNBb9Xz1x/+6HgV1nt/gy8B36UQJUDtdAl/Zv4zaoexpjvQQfy/wrqGmqGpKzQTDbLKI7lIEJrDgxEcjnbA6MrSGgNgHavdzRjvzfyImIvYdD/Au/LNhglEnZea+hO8aFJmdxCIbOltEU1fu5x15xLo8m2JqP2c1icPoBLRzlgRsqNda4tkHH7VVpVZneu+Rq9Ws5mY0/cjn2iU2weg0Oq1cpV4ndOkUTbkbFcu0bQhAdriGjIC0CQUFPMsM+s6U= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR03MB2374; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(13023025)(13018025)(13015025)(5005006)(8121501046)(13017025)(10201501046)(3002001)(6055026); SRVR:CO2PR03MB2374; BCL:0; PCL:0; RULEID:(400006); SRVR:CO2PR03MB2374; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2374; 4:7A+FUUGUHEe/yLk0K/ybksuEzwRtYqPvyOvON9dDBvVvQtJvVWK6Wg/1PlqJpYvx1J9XkQRJk1d7h5/FraArQBQ+D3y8vdd/ft1ecJMYMqKtef96WnbButOLA2upzy3AhkQbFD0yU6wvKdgYQ0YCie6aOiJwUVcA4AGJNVQngEgU/lubzU0TQkvk/Gz2rhHk2WsoEYoX2fllgBNYsQtCjXu5pGmHJs2tauN9uy6VZgEiVmjAUSsGVnDiQWVUdgOKQmyOYyR1f0hZPTcXtHlIIr3TVHC+e/ITeUxJmBTLRlks2AwYKqoCPipOcGAFSP3EF77ctsIpe12RSsC0b/eilgajFlieMyOCnJgv4bEcvj+sLOSZynjuyVN9ZIChOAEGIcAr/iOWpNVeao6z4fv3dfE1Aoqpw0ZTRvL3wPWHn6+VYaJalQkYFUJv2vffO93eS27Z7SXu2tPcJT0yu9TKroht05xkbjnpFIUREZEAgrTlZWmUJG2RKVmnalIFHogxJpMPH3xQuSPWVTYAhNEDrw== X-Forefront-PRVS: 0967749BC1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2374; 23:m2Ux8hJUG1On06IAJoDnyshXdWhKiQ/vaYnJSUeH+?= =?us-ascii?Q?KCTKcYSLZMP5WSHLkc5BaWZjxcKToCNYOeedpnxFFnBB5ZKC4NfJOxoiEZyb?= =?us-ascii?Q?OjOSvmObMROE+O5W9ijw2Csw9FGj0MA/cBIGhEKAazx5L7CAukmWEifnM+i+?= =?us-ascii?Q?Gt07HwwmRsmdKcap0ItfZ3kWf3+/lqfoGrlEZIl8fA1RY56zYpdy19dtyCaF?= =?us-ascii?Q?2saKeOhXAjZMh0qlNYBAu6cVjHOz4sKqlxGtLzuRmU+43wcj6Y411YJqlqX/?= =?us-ascii?Q?e3kuB+HrEPhdTqeIFvNv4g2ozVdd23hjkR57TOnLpi2wGptC5O5a7GD6RQrZ?= =?us-ascii?Q?Vq67F50Om5ZUhhzeYKhoLkIJQkzPtt7dhRE6hUlYCml7LhTLNL//RFUXgAfW?= =?us-ascii?Q?ahBaMrMS5it6xgQR9L9v2hpP5EkYlX5I2ezH1eIavunVqLpOhWvb2bag6Bes?= =?us-ascii?Q?ASP2nk+BSw2d7q47pD0lg7ev1dS67b4gFnugGUvpDo2hB9BhpE4BV/pz2ddT?= =?us-ascii?Q?9nzX8zsls0PdjDWSyBhNdlHq/95XcMvGqyDur0WkXE4ONr63qawKHkypJw7t?= =?us-ascii?Q?CB6WhtWe26L68HY2WY0AHDI9jIAj+v2Yt6lLTA2xwqCaCYasYiuAsXaOpob0?= =?us-ascii?Q?+Zf7xQ/b+Gnk1lRBQHVffHyjdH1b2mqIjnmS/6BLipoid3AyImOLV7RuFRxI?= =?us-ascii?Q?KZhNbnKX708MdvPvQwsKhIzpCoYp3V+NZfrBM1Cez01QGMiUUTpsgCtkq4U5?= =?us-ascii?Q?WpF2ghK8rhY0AvluT/S9JrCHVzGV0TPBw0+PV6Y40NKPZjT3aesAL7cc9zux?= =?us-ascii?Q?GDYOuJ1hfY6a1hGiHaemcpvtt5xxMD8xi9x6PZNQaGxi9wOWgghFL22DdYTu?= =?us-ascii?Q?zHSDj5SFocdxVMXnuHeHiggUbMnfWDYsCfz9xmwWcW0+efSsHa8yUeiL9Wsv?= =?us-ascii?Q?0/u44FEh/Qyt4HHWEh7KZ/9jnlJf8HwQA/rBuwwrGaS95Q5DTgBEm1YO4ayA?= =?us-ascii?Q?74HQOZzgdxwdQt6DrT07VmfyId2DkrT94iLcS/MFtHK5tuM1sGk6XQSqU7BQ?= =?us-ascii?Q?RmB5e6lNtgM72x4AUn33qtcNX2T0ksp4mpvcF6MHwMPEzVPNI9VUl+A/inwV?= =?us-ascii?Q?SkEHIhI7f8=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2374; 5:oh6qzX4vZjVvVSRgtSYEir/p0tiuTSWx34sT+o/aC4MkgWpmV5e9w1HU5EG5IAu20s3hEKzvmUppb0QxgQrZOgxV8nnyhaOYRZKgmuqr0a1EZHKvc4qmvC2SAcEBVzA6/qaWHeeNxyKusI6F9XpAFch6v9grAlvdinYh1QddXSY=; 24:njnuImeG/afsGk2ewCY/PByGNuiUULdenfMXV7j3ONmM1u3lo35YqRt/tB2cA9cPC+sI2XfGTiY91St6fqc+D3S64BIgwq86PtAjjC4+6As=; 7:SNgN23hCi4nENPZL7mKjFHTLAmAnJCS6q+mCzT5OrS+ozd5uRctqC6HwtT8Gi3whZ6RiKVKpopcynnJsW3UfSUg/jhogPF4tNEWigpzbkYwsIrsleITokaFywsL9NJAWl+UWA8yszt1hdEbCmh4OghEsFdMcCe8ltnkKAu52iFwk0aCkfFxKBRjfSO8df3j/qn62c43OdgPGXCOjt5KrQIdbeXUjQchE/wvEbu6PYZY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2016 14:39:29.7357 (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: CO2PR03MB2374 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After commit f53947456f98 ("ARM: clk: imx: update pllv3 to support imx7"), the former used BM_PLL_POWER bit is not correct anymore for IMX7 ENET. Instead, pll->powerdown holds the correct bit, so using powerdown bit in clk_pllv3_{prepare | unprepare} functions. Fixes: f53947456f98 ("ARM: clk: imx: update pllv3 to support imx7") Signed-off-by: Dong Aisheng --- drivers/clk/imx/clk-pllv3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index 4826b3c9e19e..44d294a336f0 100644 --- a/drivers/clk/imx/clk-pllv3.c +++ b/drivers/clk/imx/clk-pllv3.c @@ -77,9 +77,9 @@ static int clk_pllv3_prepare(struct clk_hw *hw) val = readl_relaxed(pll->base); if (pll->powerup_set) - val |= BM_PLL_POWER; + val |= pll->powerdown; else - val &= ~BM_PLL_POWER; + val &= ~pll->powerdown; 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 &= ~BM_PLL_POWER; + val &= ~pll->powerdown; else - val |= BM_PLL_POWER; + val |= pll->powerdown; writel_relaxed(val, pll->base); }