From patchwork Thu Mar 23 04:53:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 9638751 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 C4E71602CB for ; Wed, 22 Mar 2017 12:59:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B65322842C for ; Wed, 22 Mar 2017 12:59:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AAF022846B; Wed, 22 Mar 2017 12:59:51 +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=1.3 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DATE_IN_FUTURE_12_24, DKIM_SIGNED, DKIM_VALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 538A12842C for ; Wed, 22 Mar 2017 12:59:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=R8dkgV2hI8W9rW0E6G/jP9D4LFvG19fiX9KLFpXMbC4=; b=irSWXLqGeg5Bht Fc1w+cxqb5AcpaYpvFGZAzzJHGB7ons/uOdc3VOEux284c5as8J9BzYncZ3fhSuzxNUF8ttvyg0KP Nwo0A9qKqzx39jcEGZ2kYohViEd5i5RYoJS28IYGQ+K2Iw0QIMHj1Wve4JMd4tmb7p+lLKBfjPnzQ ARlj/SUcAfH6EmyxHdvq1JuaVOX8t88l064Zg2Rw3BBdTvaH+8b9A6ticaO4nQeyQOrmYqN76tniW 7ywZ+oWLMxSz3Q+xr47OS+WNSAZ/jwBNOa7uqMfQkXW0C8uxaapsVL63j8Z9PYskY/J6tQTKGDOxo Gjlju9y1nsn9EY1kK5KA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqfri-0004fg-G0; Wed, 22 Mar 2017 12:59:50 +0000 Received: from mail-bl2nam02on0050.outbound.protection.outlook.com ([104.47.38.50] helo=NAM02-BL2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cqfpG-0002MQ-W9 for linux-arm-kernel@lists.infradead.org; Wed, 22 Mar 2017 12:57:21 +0000 Received: from CY4PR03CA0013.namprd03.prod.outlook.com (10.168.162.23) by DM5PR03MB2794.namprd03.prod.outlook.com (10.168.198.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Wed, 22 Mar 2017 12:57:01 +0000 Received: from BL2FFO11FD026.protection.gbl (2a01:111:f400:7c09::179) by CY4PR03CA0013.outlook.office365.com (2603:10b6:903:33::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.977.11 via Frontend Transport; Wed, 22 Mar 2017 12:57:01 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=fail action=none header.from=nxp.com; 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 BL2FFO11FD026.mail.protection.outlook.com (10.173.161.105) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Wed, 22 Mar 2017 12:57:00 +0000 Received: from b29396-OptiPlex-7040.ap.freescale.net (b29396-OptiPlex-7040.ap.freescale.net [10.192.242.182]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2MCueKf017027; Wed, 22 Mar 2017 05:56:56 -0700 From: Dong Aisheng To: Subject: [PATCH v2 6/8] soc: imx: gpc: keep PGC_X_CTRL name align with reference manual Date: Thu, 23 Mar 2017 12:53:23 +0800 Message-ID: <1490244805-3921-7-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490244805-3921-1-git-send-email-aisheng.dong@nxp.com> References: <1490244805-3921-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131346610208317188; (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)(336005)(39860400002)(39850400002)(39380400002)(39840400002)(39400400002)(39450400003)(39410400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(77096006)(356003)(305945005)(33646002)(5660300001)(2351001)(106466001)(105606002)(76176999)(50986999)(48376002)(50466002)(36756003)(47776003)(189998001)(81166006)(4326008)(110136004)(8936002)(38730400002)(8676002)(39060400002)(50226002)(2906002)(104016004)(2950100002)(5003940100001)(53936002)(6916009)(6666003)(8656002)(86362001)(85426001)(54906002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2794; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD026; 1:RwHI1cAqFA1d4RBV/caR7QVozeBYCZrhE0I5Tl+C3jqDjDS36iX097b02uUPNficjCOf8mA/ujO4l0UYQj/3lclKwf4pg5YbI71jlNws/6U9BzySKduEF08nXRWout5QG1rqJBZG5XOPUHEgkpbd37MPjg9lG1+Tud/kBvpln885KO1p/y/8H8R9fH54C74afdipwWH7WS4felOOlER5vxNS46uruXpFFnwEqg9AwfBVccCa2uG2hXdi6nTEHwBqJXdyz8XZRoZataFVczUA+EAj+yufVP2K4ISyLyzm60kQ3qEIs+ej49QY4DvL0KE+EyfwIwcC334Tet7XTgIw85DzzvXnS8LqOmifKDGCv40STaPXs36lMvXAXBjRWeq52CfCqyJ7L+gKObK5djvrpuMzmGfjoHRzJR1V98fvv21wyg5gIRd+GmXIKNcUiL6jtaoa0voYO2Bp0P//rMBjxS5JS8pOFrZKUnzh9TPFOMz6YBQhta/xvKXZWGD8suhI/+B7o82TTA/LLTONAUjj84G/ZYXJimbZrIGyvGIwj2VVQq/6U9G8RRw0mYlYk1ozYwje00yAey/yMq4s4gLmmOuKVVdBocEWa9/UgZLqSqc= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 3f043f26-b329-48f2-5c42-08d47122ee5d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2794; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2794; 3:3X3R24Y9MgA4Ad0EACdeNhTzP4NM65kU53dMAIxMK9yQo21oRuHwBXaaZPI6bPp4MywaAcAq1cuYNzYZWJeaZSWdL4T0LMVgzdBkwxfTvrJ9wPp5rlGOQLrKcpm8U5M2od+bdZ5Fe21M1sPvYVCFRbtEKFthSh5svpjZvahAW2uW10W54yjTuMInP42OmLuNi+9KnLAwIQ/8l+j99I77gE4GlCiRRjKLxHSBWmFhm4ogf43P4uBfSl+JtE9L4dzLXBPUj3j/UUpQmFVVRP9/1TiKIyUDhNw+duE6oQ9NYu55IZ703yD2kOBANl1/3A4EftsgXXLZCJkdXzpPUcIaQZDc3TJRqTQ47sUQF06+nuEQ/6IAz1Dr4V3BL+NG3fbd; 25:1QvNGirQmwazGkOE+We5dRA6+MVGH0AulZXMyqIRRtQNrwsFFMh5MbHoo06/mQugPhlNSf6dQzt37JBYdt9TR3RL3GcDS3m+c/vjA2S1+XDBLGFYW2GowR+PUIf14DEOW2wRnBZyVM+lD65zvs6pVMXG3AEZCM5Wl1IqQV6e75Tpe71HKsi3XDef48f3f32f74W7iK4hQ0StiQ4Hu0j36tQsceyT2TFIPdLbHAYxf8O5jWeVsBW96Vmwewguz7feB0Ywux//xHC6RZ0/e/XXKLuS3Rw8XA9Rqqz4oJ6BNajQu4yLRHBG7MhMG5G1PUbCa+6UlNvqJYT0ary4NF5VLTg3z4Vs/1tDEO7HTnPcQcoiBpJi9npymjVly4rVnPijd2I1KFSjl6PFHKUqVsFYh5ihXsmaEGQ89bcWce3A6joBiatVkKJP4s5wxQ+a/k2TQOud79+9QKZ07rP5WNkDYA== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2794; 31:vc/XPZqFv/6Wn8ZNoz8Q0D23TcP0dxTeSnUsVEqGywNOMqoKda1UIqe7SEnzzwuOlnfz3xsfxiA/g3CuRPebb6Cpog5Xt/lxH85fLv7JRB4sEMR8C8tnQmcbvhoxJNSwqI5LODON+q6WKI5M+baKuXqTv6hm4JXcEDcvRAThPer8vRICLudBVuhOR2Q+SYdD3j42O6Az4/bKm9JRUOZxlW8XqngupTTPulgsFqi/7qNmbaEtlXs30HrqB+r400zO3ACDPqqyqGGrG9IAxLY7+uQQ5rruTAIkFjfzEiCtor4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13018025)(13023025)(8121501046)(13024025)(13015025)(13017025)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123556025)(20161123559025)(20161123563025)(20161123565025); SRVR:DM5PR03MB2794; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2794; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2794; 4:lOTJXfigoiTz3TxcWjfI8qR6HZcAyoCd0cEs7U9Bt6wo4T6UN5Z3xgMgzmvP9F6GbvQKAOsqP0tM/VwfZyJxDIOES6NKsY8S249+ZZGVbmyj8IU2WleWG+bRk4n1bTNAN2O+hU9Cq2B2ZnsSTf08wZn8arYcHo0FoDAvk2ZBrfZ4eZ5cGqmUFT0LTPYdIFyGNHCCCBA0+Z4FLuMxJXRZfzq7tq2Yk79KZ/rdB1oiDUvtvfOUWTtGRgRyr6sVnsVEHhsJT/KqVkOwifrDNvxTn6cDH6pyGdS48RlyYnWPmn5BTA5qY9ZaXKU91CBpeXl1uwEVhkmIcw5khflJQEmZW/xe2dUYDbBoNVEbzoSNCDbv/5Ji0hJgTxYivQc+ElFSonwrOcfHezj0rxTNWTdSio2GGgNbewuTPGMYtoEZMUD/9pSJgzeLCU7kgQWf+kVCtvb5QDxvnZjaU6nwp7hRWrelEX90xyQkuP74Fq66FhYGSMP1wPauAU73EHzZRVfhLNSD1I7JgMDlCUK2R3PdBCt4I/Uu307DPlHjYsfMsrtVqCGCoCM0L8RjnOL8WQy+vYLhP4385A/mVroErIX+Mum8QFYEOTGoUt9sCf+L6mtZiQzdz4ZJ7moQn3uv925ej5uLhhjBa2jy4iZM8PPSt+yFP10lwS3XllbvevLapuFX1/EwbTphdiudD7pyISF/k2Dipug4cMqCgrIG0uCBehl1sxJr9H25q8fj3SzdkZTaieAsv+8Gvv6LyGL1qrUB X-Forefront-PRVS: 02543CD7CD X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2794; 23:kF0mgSJKAAkwFUVheG7/e9rSgJT6fagFRd/cIA0iy?= =?us-ascii?Q?gn6TMO1QfaPw/UfrI6T0D+0eeCD9Z3g08KpQD+QstdvEvhNnoclpFRLLK2UM?= =?us-ascii?Q?aP92f0cPj4pl6sE9kiznGaxyLhFXkhFJ9ENEIhd0kqHsx0pGWYUCuj4rrnN4?= =?us-ascii?Q?GWRtcLV8eeS7lJhLNKwqOiiCt2vl+AXqQVvA2DRfEQBsoChVfDKKNEouXoRF?= =?us-ascii?Q?2tphF9YNy4YSvSo4WndSkOzXNsWZUCf8hCLo1NXATMLUwnSjxxgrdAngvJ1r?= =?us-ascii?Q?54Ca51Ur7MLDig2bgHUry25EnUH9qAkZ5/kqKcJZQqW4qcGNl92KmnEFZ2Zg?= =?us-ascii?Q?naJeoLZ7s/lP0C1+lQhK9iUTcNxaXyy2mLiiXps3QpXStAhhcJ4UjO9/xdG8?= =?us-ascii?Q?G9ko26h3ZQo8g21U1qSLKCgIfxiQUd3WYJxYDa49ukgb1e0avhpJ5JOVgakK?= =?us-ascii?Q?gZkewdduMz6sIrWAERwgJWSsgfff4VyVQc1lIsYoExkXH0DZKrAP4qK31NoI?= =?us-ascii?Q?irJiStjsxVBAzQNLYH+VUpYW4AQRptLBzkCPjueZbWxiOt6h6vFoYXS5Cj3X?= =?us-ascii?Q?KCRWDuESl+m6iBavmSFp3ovoSr6qILPdloiXGRjiyy8APLvKiL0YA41lEUyy?= =?us-ascii?Q?Wlq7DsaK4hQ8SY83iA9v4KHgvgatotjDBeDDp07LFJOxk0gGoIqrgnzfXQ92?= =?us-ascii?Q?ZEuzWeLcqzzMBhZWYMA9D3+DRtz8vFkptavIfiylT7fvxX2kScCTgA9aSACA?= =?us-ascii?Q?RdHpGPFoK+rK+Tl8PPAJGmPHhJir6WqG7qbp+yRd4CmY4d+PpkXaCuATBcZR?= =?us-ascii?Q?b6Dof9ffglwCTIjJ9g+F1yNRWExnZn3Sdmg8YvckL0CeaYxUnsLINqw7hjgZ?= =?us-ascii?Q?fAe5L/VO0S9JqLg7WW5CyPV+/o5yEtXvdpbZe/R2My9PVK3ekINB5Jb50fxm?= =?us-ascii?Q?lnEisih/NJT4u2uHGsZxKGs+eLXT2LOzKKLkJIRIug61F+DnTc/wSTfrd9ob?= =?us-ascii?Q?eXLipNB0GaaEf+JK0JP4ucNUbm/+9IOozRqPG1hR1jqEUlZfl0QKeEgIBf9d?= =?us-ascii?Q?oLhyyxO2M+76t3skI3SzUFjNxPefQHRDRMZ6Z1XcxyZHsj6rMH76A6gSJrcC?= =?us-ascii?Q?tA5JXq3w38mFBsUK43+38XTft9LPTnRTQPE9PYC2xA82QZGpBjIXY29vWkdP?= =?us-ascii?Q?Xxyx+bk6jwR6M2XS+K1UwaIwXKc7ZI7S4brj42viTzuB9JjgkIhIiUZHwROf?= =?us-ascii?Q?VkRM0sbK+2fDMU/UAI=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2794; 6:aUpQNSaPHmh2IyNayy40u+khLXPRE7oJ5XW8ZDxhd+0/k48BY8oQkx2mnwy2abPEQ2cJAssdc3oNU34rSzzSgvza3PAQnqffZO0I/zZNvK3zaJNgavU3F6rCZg3Wd41l0GFpaCClQPxnKxkw1D0Jalmu2INkIp02LmspF0Fleb1LBQiwdu9p69pgbn8w0m3buX5croayHfgm0me7q4OYLYu52Ick7CBpGjyfD+EbGGofvyJA+grXJ5zl1w9qGkwcpZdbImvZ6yMyYn5XMiRJKlUR/fg8XtoezcynWRpdSH2LsjFJhoOYH4GLS+OIXDh95Jgn/twsU5Gj4KYjasKoTJ3c0xIdYXGRP9u/Hya9hpWD28bJJNmJbLy1hCDoU2zJ4JyIO4okVGA/EjP94MH0/N838QoZvDk4m+GZ1Tjlja8=; 5:3iKIOlMaBn0M8FczCX4IdwCEhHJWpJfdEsOU1C0M3R4VvQ/i2g6RvEoHpEC0K/A/wO4zbjsuRJDg+yETEMIl43Owl92WnAM2mG9wuYugMQil7fWsMuikYRrvhTixiOHmEa+z69E6OkcMu6B+xws5vs20cOnaCN2dFvd0gLcyDDgkdHgE+DfiM8Z2N5t3nwVA; 24:buIbanDsolxE5Hl9ZfHG2K+QGo68pc7c2L5sjZccOU4O4RVCBdjL8gulyjIso4XK9xH/0cEZIffF8ot0NvcXW2mjWSJUJP5FjJ8ncVm1+Fg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2794; 7:yqtHnxjJ5pdhaZvgvYUyzCCreM2h8M6nCJKbbm2gWb2a8433UTKwArxJaBicL2EQP+3Bh+eEm0lxHBi/6jgewXMvAmr4DUJcFtSWTV0AXLXsHzktbfTGP/pSI9l6Ta8DcqPt8dG5AlUcDqI6oPtOJcfzM+3oSsIR29UoIafv/+mR9kkmqMxHx6yPQtCBFZb49xjqCKIGScVX2U78vEE+Nj98AgVfuceGxKe2zKptKuCMKgcOItMESEK7/rFnd9AEWZQAVlsfO+OCqGVYDvNAaTFuSzjxFg0/nVu+ThBSBCIUfgTq8tJWWxVSoLbWG5tboMUNaROzaKdIJpFHmNa4Fw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2017 12:57:00.6445 (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: DM5PR03MB2794 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170322_055719_514007_A055FA95 X-CRM114-Status: GOOD ( 11.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aisheng.dong@nxp.com, dongas86@gmail.com, andrew.smirnov@gmail.com, fabio.estevam@nxp.com, shawnguo@kernel.org, l.stach@pengutronix.de 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 Instead of GPC_PGC_PDN_OFFS, naming it as GPC_PGC_CTRL_OFFS which is defined in reference manual for better reading. Cc: Shawn Guo Reviewed-by: Lucas Stach Signed-off-by: Dong Aisheng --- drivers/soc/imx/gpc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c index afb02f9..3c61248 100644 --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c @@ -21,7 +21,7 @@ #define GPC_CNTR 0x000 -#define GPC_PGC_PDN_OFFS 0x0 +#define GPC_PGC_CTRL_OFFS 0x0 #define GPC_PGC_PUPSCR_OFFS 0x4 #define GPC_PGC_PDNSCR_OFFS 0x8 #define GPC_PGC_SW2ISO_SHIFT 0x8 @@ -65,7 +65,7 @@ static int imx6_pm_domain_power_off(struct generic_pm_domain *genpd) iso2sw = (val >> 8) & 0x3f; /* Gate off domain when powered down */ - regmap_update_bits(pd->regmap, pd->reg_offs + GPC_PGC_PDN_OFFS, + regmap_update_bits(pd->regmap, pd->reg_offs + GPC_PGC_CTRL_OFFS, 0x1, 0x1); /* Request GPC to power down domain */ @@ -101,7 +101,7 @@ static int imx6_pm_domain_power_on(struct generic_pm_domain *genpd) clk_prepare_enable(pd->clk[i]); /* Gate off domain when powered down */ - regmap_update_bits(pd->regmap, pd->reg_offs + GPC_PGC_PDN_OFFS, + regmap_update_bits(pd->regmap, pd->reg_offs + GPC_PGC_CTRL_OFFS, 0x1, 0x1); /* Read ISO and ISO2SW power up delays */