From patchwork Mon Mar 20 06:15:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 9632585 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 5E1576020B for ; Sun, 19 Mar 2017 14:21:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D116284CE for ; Sun, 19 Mar 2017 14:21:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3FC66284D3; Sun, 19 Mar 2017 14:21:52 +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 4A28E284CE for ; Sun, 19 Mar 2017 14:21: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=dIzvIio3bbFn/Cd42iNzDYUripKaY2MSyXTL7zQ4nK8=; b=kE7MnPVkPVYDy9 pggBXjOt+R1HhQYC5/zHv2suumiWhyHjHcT+fcdvZGZG3DSldOyrcwmdNSvV2S2MeJpP/oVmFx4xt zCevBFoe2Ehn5r3VsudneRhLwKuvGJXLkHUNEXo+dXzG8fGYD/ENplLLoo8wfsTrhWDcwNroEUNBe EecqjdexujWNQiZiDtAeIclu3iGAfYpxCesRp9GImk4zsEiz4uUgNL6nyMBvHZ8CRuUBh2rOS6pcd JoDR9nz4soAYFx0qHBkF0S+9Zqj3XC0ZUZx9fwEDosArWKx1oO/EOSkHiKD/qQW7el94zdqNcUMz2 z6C0toOgB1sVo0HSMVbQ==; 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 1cpbiQ-0007Co-Uj; Sun, 19 Mar 2017 14:21:50 +0000 Received: from mail-bl2nam02on0059.outbound.protection.outlook.com ([104.47.38.59] helo=NAM02-BL2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cpbgP-0003wN-Ap for linux-arm-kernel@lists.infradead.org; Sun, 19 Mar 2017 14:19:48 +0000 Received: from BN3PR0301CA0065.namprd03.prod.outlook.com (10.160.152.161) by MWHPR03MB2798.namprd03.prod.outlook.com (10.168.208.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Sun, 19 Mar 2017 14:19:22 +0000 Received: from BY2FFO11OLC004.protection.gbl (2a01:111:f400:7c0c::101) by BN3PR0301CA0065.outlook.office365.com (2a01:111:e400:401e::33) 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; Sun, 19 Mar 2017 14:19:22 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) 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.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 BY2FFO11OLC004.mail.protection.outlook.com (10.1.15.184) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Sun, 19 Mar 2017 14:19:21 +0000 Received: from b29396-OptiPlex-7040.ap.freescale.net (b29396-OptiPlex-7040.ap.freescale.net [10.192.242.182]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v2JEJ18k024445; Sun, 19 Mar 2017 07:19:18 -0700 From: Dong Aisheng To: Subject: [PATCH 6/8] soc: imx: gpc: keep PGC_X_CTRL name align with reference manual Date: Mon, 20 Mar 2017 14:15:45 +0800 Message-ID: <1489990547-1510-7-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489990547-1510-1-git-send-email-aisheng.dong@nxp.com> References: <1489990547-1510-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131344067622270706; (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)(336005)(39380400002)(39840400002)(39450400003)(39410400002)(39400400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(53936002)(81156014)(110136004)(47776003)(8936002)(5660300001)(104016004)(8676002)(50226002)(6916009)(5003940100001)(48376002)(4326008)(54906002)(76176999)(305945005)(81166006)(50466002)(2906002)(356003)(36756003)(105606002)(86362001)(106466001)(50986999)(33646002)(6666003)(38730400002)(8656002)(77096006)(189998001)(85426001)(2351001)(2950100002)(39060400002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2798; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC004; 1:DM8KbR588XfPcCBwrybvkIXup1TjEyQmaugCzRUsjc0kdtY2zOIr549pqV1nxGGYRdns95HUlZKwpkfK7at3/dd3/MmzirbQ8NDBBgH9JvLq1kTrc1m4tsfq22X3tefQGNrj4g2PxcxghQ7oC3O9Loqmy+SDCxwIZoxtDPjOJIaWKIbTGfYF3VA9n51OC3SO44TZzb5HaBxSScjSNbflgemhYNCP3P5tBaT3w4uigtAXN+kVd9oIzMkhoHh9sk2d1JnGLPeS1MXrTELfWtlBQCAPVfhWi/1x70b07XXMQF2FoVcErjvSNsnCu8bcRuVJJl3pJSC2e6NvIyb5bjpnOdqV6713tQa49MQMqKAZWx0TCQxzkjyQoKYJ90h0z1DROaCXr1+OrTaezKEuGURAprh+KU1SHEAKXkFkhU3N/Tg4Uyk7xyUk20qzGbbtkmKk+BgsqjY1CUyvBCQ/AIBXqmZmcYhk1lu8lxg9AS5QCFPW3VbTJa8v0UYoD6YDCVS8qFJVI7A/49DRvdkm2bOJ7dFSsjkdjhP1/FzquSqlf9iNxJpAuRx1F4TAO0dP0WNB8CUiTlyKSWIrtINut6TYiBSk9b9YHv91HBSVi4nN8/g= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 233435e7-a7e7-4d2b-8aad-08d46ed2f05c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR03MB2798; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2798; 3:lhPoi1Agx6y/PGGDNobFiKSq916P3Hg4Ra6pUO5Z88lLbbPdUfiF4njrsE2Mo0CORFEGHRiXavy8flKmuod/laQhT67Wo73R4mwoWxaPa2GUm1z8zNkXZfHOBEUnPwDGsfKuJQ6wTxM4tlvCHOkwcfuf7pHuk+xVm6xf/Ut4lho0dimvytx4ph9RcqIsVj2KjLLshuRfy97O3D+YlcE7c7MyOxirQ1batUJihN8zSZ0rKxj4PyQ85EnXZklv2qqO7Z9VxyM6q+vjpa+GFUwZCzI+QKYgey7bCY1YnNhocRUUtg7Eams0c8zxK6iEMD4ilJ4UdawUd17XZEGVn7OtsuIPTnHiSfPXX9vlurGGK3h9TGAjS44YyKSuZSozkHQu; 25:xIATooNGxicVg4CK/oVsgYkVa1RvZvpne3HOihUXH7jGXvsrdOrSWy2qSZU/nSQgJ+dg7oAJn9HsAvPAwGqRQ0pyuRoiETyftQcC6nu4cCQ1Vzj+UY4VOQ1SvP7DoCoxc08bI89bPGFCM1795A6UyzeSABE66Yz2Y3LsuYVFGFzkuNKTBLThURg6IL/WmYGyKVwFw7nHGlvYsl/uBmIIslUvJA+bpjje9D7GCPLjf+1iSDZb2XN8cmF3ZuQ89YAgsQePI/1eMD3659iTKmsD3rhLjTY9HxRFAlxmiPe9+w2mMPpIX4XHeoj/PFijVwfeigdupazy4K69KVCbsFpDtL3JD7A9FQKXZFHLDoSbP340DkYcJfNI+OfgDEofWyI8rAe8WsjiW3wg/5I+gycgyVJJIE5o8VaylogJVMlAbfHolhTdjSJxUDxxquWObf0TQvSsSahP9qTSRXbaeA0HhQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2798; 31:6UYMFaCcbAuO+1YkhlveeQ6nfQL5xygjx75YuBHG9u1sPkZgP8niWLWp5ytTWHnpsC9ZNWWf1oBSCAYQhLDyXpG3vSSh1NPhdUu8xhsLM9oEVdETYumpnAdXdfpfxjW/nSv/fSnwmoiKzU6x+ieEBLZl6uNmS85zzOMUSa04dcVP29suWVQ4tSdKUvMnSHD1kMdv4vye14/XHNAeDCKHu9R92V99dzqr515CmCxLGokUTa3ju54r/qfveYwWAQb52XJY8ZOxVhh5lWNHwjRD9g== 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)(13024025)(5005006)(13018025)(13023025)(13015025)(13017025)(8121501046)(10201501046)(3002001)(6055026)(6096035)(20161123563025)(20161123565025)(20161123561025)(20161123556025)(20161123559025); SRVR:MWHPR03MB2798; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2798; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2798; 4:dz2iFzbafQXyxo3t0GJp8YU/uzu1i8qYZTDxqrB+m8TjrE+sOHR+HDItngo7dbndf+iadHXOu8iorQE9+QjsLyHCsz9MQ1qln5jvwFAzj4GWNlBHO29ocaSPWDAZ6HpnfxSqRe902AsHo1+cWhbrMBLMS0VU1czgkVI2fd9sW3qSHfzsZOpDlEhuVv19jkz1RSX9474YaJ770dO12lB0o3wCHOjxq2A1DH0iWUDPDncSIflBe14wPPs90d/URpbSHkq1fvEjdJGu/sJgMCkfCswzUcmUKj+GDjILRz6/pnF1RdVVm2MyxdyKQc20ncCp12M37nphn2w0dry4Vp1VVNYYHo7TVPnfZJVpzIckPpC6XGwniTX9BVtUYxoVfg7N5cNJm9/537zhpvRrU6gqdOX7b57hOU0k+W7FOU90i8+hBiYIkvjOHVe2BI7PsgC/YFHTJEeO/uIOn6zFnNN2YYC7o6XlliReEe35Z9UGniA9fBL0h2SnX4xQeiBe1zAjOqV00flZjzN/ceXamoy4sfprycl2iWHUwbYKBFvmVfLClZ7OSMSKOOlYpaqdT5etdqKzLnOFpvwSM8an92s5pT35NrRUraMX5KYZ+Q76W+raTadZWNMxAvZ+ujhnyFtNYOywWZ45/bL5zT9QK+KD94lXJ4jWkncNteogmtank2LjQ5bkko6SgZCs02NtBIq2Mq+4hYys+fMU+JuXZMdrjP707jfWXxCbKfJUoqmwlw5DL4sbVMAVtmy2Kt1Xf17O X-Forefront-PRVS: 025100C802 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2798; 23:lEamxUyXNLQ13TXf6t/7ZU9pDkv/zsFEi1IsulawB?= =?us-ascii?Q?b8HzEfCfLm1VPGFlzLP6vzWpFyB0LeGO2CeT59xkTH/9Df7boRrGeRsTvWPT?= =?us-ascii?Q?mE+k1LivSs5ug9N+g6pDGBnssr8MxXnjO8VyPm7nRBY0THkYNnehWGFAt8VY?= =?us-ascii?Q?+QCnck5QiKSilSw2r9sAVZvlL9/R13nq6HL7mn7wL1g1Q+D8RV3tlM/iQ2uA?= =?us-ascii?Q?sAHoJ3CIcCZSa3BwoADD/P8iR4s7y+wsVIT0TflBiufGNqpvFuPTrGnzUnnc?= =?us-ascii?Q?qe2IhgiK8Rde0+N49fTI59xWiE4EVg9/HXc78f2Wybkbxm/s2j5bi8KPVdtW?= =?us-ascii?Q?/attkbwq8BUxS1tP8cwkgs8uReItgTvzpAnYXaM7pp/4Lk/hUG8RlT64CNsH?= =?us-ascii?Q?CQZ6MW9Og+40LkQuUyejT0Qd75m+FvYQZkPTeWaGy67r6QQQuvVhJQ8wWB7V?= =?us-ascii?Q?MpQmd/bVpthTsWxto1L1mg6sOBjjTlRIe+ixH8KwjNXHy2m0BjeFPIiHGDc5?= =?us-ascii?Q?y8ABKnqeQWs3QN49WlCE4DuHWhQ9FOBqMzW0aPNwdCpRcjB4BBQaS1jzOjs9?= =?us-ascii?Q?lmZo9P038LrNmrqPiIL96zONeqn+BvfeDfBNseJ7Pqgh84WGhVZKDZ0JmKW3?= =?us-ascii?Q?CwiaR8tZ8r9Otz7GolR+wCtkmwC9WQp8Uy61f1MqLyNRO5DJ6JDhCcdtALam?= =?us-ascii?Q?1fvD3ePNVfLZwJZZHdZOeYs2OZiuzXrPaLYFdYrezk/uHhsCU1KGrfQwo0OY?= =?us-ascii?Q?JjRY9srJQpK02TCGeRhHEudeTyHBamILLVmmo0LBjzHPwMHqGIqNW78qowTG?= =?us-ascii?Q?HhJDD8FXEwu4Ig2PGgFP7mPB6z/0WxHxc1DvEEGiGFGzzirrv5Ng34saAOUx?= =?us-ascii?Q?siKXIdU+0W5zVKhzI4t7siGlw0VH9snMCl6DHYHtoH8UWOvpCw+4jbWQouvS?= =?us-ascii?Q?p1a1Nd1g3cnLg1R46u+gmlgbII0D8bl05kzvI/W6dP4185ePMWnTPztrJt1L?= =?us-ascii?Q?0qGmhlSGAkEUBg8WVOxOz1Y29xYyNFneGFAGRB1fYxiRUQQwmpGwBWktktUa?= =?us-ascii?Q?0j1Etf4nG9f19+4CEb8IrjTWFZcuf+TQ6k2AMc3ZGPQMkDmGYm/Jz23Q+dR0?= =?us-ascii?Q?p3oeUpyCaWU481ekpg6e2YarIwKUX/9o7WFi8gbqBskMdQ20OOLxzGMoBIg3?= =?us-ascii?Q?YsobseBRMt66NHlmPT/DMJ/pkq1QWzAohhqqmCdQ2KoJQ+f32jYs5jzrw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2798; 6:CGKMemqRjuzK8ECIov+X3maYkJmC1SNPhnOEZzl29ZvsiE1Zi4OoPXoVzLD+9IU1O7O3VqI6GTbneGTRCyN9lSK52IjVVmpc9pzQBKdb+TpAnhFp4hc721HUj0a00RFrrg1jHwAwJIeL54CyJ9jHEiBDH7XD4trYbrTfTRa29YI7Xrl+5hJDXQEkomEj6+7JI52VBBttQ+3e1V4Y+d+HgPMSUcXMAdoVccjL1Fe5wi1l1OsEu48EhFHIefyl6QteQE8D8oeX458xQ8uXvid4nKX2s1kiryAIupYq/CzKZ5F69WUuEl+RU7PlM47qp/rN73YP6pqhaD0zTPNQBEo0sqZw5lB1JDnB85ydJNXhe56tIegrSqFFAXb9gzshtFfkO6aaqPn/eQnQTumx0vNmQgyoM/gZkp3blOw9UTAHHzA=; 5:27+Lk3cT4HrdJoXFuiJBy99CAWLjaoZ+w4or52cjsikNfmGyO+MRPut459oRiZyprJUki/wHL0t9LEXKU0v89jUvowg2CU36K5ctkoGRM4x+GdBVHgst0Eu6wvXbpP2pxQS+QCqHQEbnpnNLyFab5mzB68I+QaVqNb3fZ00bCvhu4OEslVw9g/GE+x5hOv3L; 24:WWuPKkpXo1YBxGWd5BL+aB01xWFQ3xzNa5PSn0LkFtKMI26woScoaK9/02SbkG44JrXdAFnCmnbKsUd7Y8Q/g/xM30gdkHu8Y7Y8+2wz7A8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2798; 7:9WM6JRQKmN7DcQxzwCbv8pd+dA1x6QmbG6Jgbj3dQ03s6ZGBKLnkqQjbKZ9k8SnBTQz13wlw1ZvKPMwcdumQxE6AT7cVSgk6tuOD7btFZ2aL7PQffVmmFvljU3A1K7uid1qaD08S5d4dE2H5UuKMxdUoRBJuv2c/QtIHyRm1BSPWdk4VZo/Vux4EX4g41DQZlLOB7Q65kgVNfsHc9vY25SFh+CSGssVqcbA8Y+5Lhznw0HsaZol6eXzwAdC6caPcupWC1RIzBnFWO/qLduZ8OoPTG3ixh3AV5fIrXrOlM/72BGBmXgtUdnM0Y26U1NUtfZ46HIb1sGfbGBHSy7mmuw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2017 14:19:21.8994 (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: MWHPR03MB2798 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170319_071945_682111_99CBF6F0 X-CRM114-Status: UNSURE ( 8.49 ) X-CRM114-Notice: Please train this message. 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: Lucas Stach Cc: Shawn Guo Signed-off-by: Dong Aisheng Reviewed-by: Lucas Stach --- 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 19f4e6b..a744f7e 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 */