From patchwork Tue Dec 27 09:47:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacky Bai X-Patchwork-Id: 9489139 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 89CE262AAF for ; Tue, 27 Dec 2016 09:52:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78AD51FF26 for ; Tue, 27 Dec 2016 09:52:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D6C520951; Tue, 27 Dec 2016 09:52:14 +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.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham 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 12E8D1FF26 for ; Tue, 27 Dec 2016 09:52:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cLoPA-0006Ef-DS; Tue, 27 Dec 2016 09:50:48 +0000 Received: from mail-ve1eur01on0077.outbound.protection.outlook.com ([104.47.1.77] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cLoO6-0003y8-CF for linux-arm-kernel@lists.infradead.org; Tue, 27 Dec 2016 09:49:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=gjXxRtwOs1Za6G0lM0OkOttO3B3YvHF3vIQeHEE5KW0=; b=yCmrr4uiOUzL/YDP/seRf8Mew15v4Qnz5vq6S3tA1jRxiXTE6PgZxaYBiagG4+6+9k5angwTpLaRWp9Q+GPJ/ckhsiGb9yx6Ldo8GskD1LU0K10QenKtCiD0PRKQHszcGWc/3kByP1ul+HY3pMDVzONnHuERMYIBWrcAkJRR1sc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ping.bai@nxp.com; Received: from b51503-01.ap.freescale.net (192.158.241.86) by DB4PR04MB538.eurprd04.prod.outlook.com (10.141.237.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11; Tue, 27 Dec 2016 09:49:19 +0000 From: Bai Ping To: , , , , , Subject: [PATCH v2 10/12] ARM: imx: Add suspend/resume support for imx6sll Date: Tue, 27 Dec 2016 17:47:48 +0800 Message-ID: <1482832070-22668-11-git-send-email-ping.bai@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1482832070-22668-1-git-send-email-ping.bai@nxp.com> References: <1482832070-22668-1-git-send-email-ping.bai@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.158.241.86] X-ClientProxiedBy: KL1PR03CA0008.apcprd03.prod.outlook.com (10.165.63.18) To DB4PR04MB538.eurprd04.prod.outlook.com (10.141.237.28) X-MS-Office365-Filtering-Correlation-Id: d34e1c83-2c0c-4b61-2037-08d42e3da44f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DB4PR04MB538; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB538; 3:bp2gttWWRV9SXPfFfupLCHpogpTGtLq3rCq8k9nDClEhQwIVzWnmRVnpv1dWUGgKAjYasb3iwq08SS0vlz8UvzX9+ykPewU4xNv4a+HB+tDvF3Wy7MvE5SGFC56w9JSYbRZHfwojTzBf4DTKjcDgPaaOqqSpPUSpFk7uLrfsDNMk+w2YB/7ZLmWnjNuWNxCD1UrL8BgH41QS7bbII/c7LhegAXhft5rMyaiC9xpoCMYHx64SDDlorIhh0N4eJ0e19OAW0svsumK7g/VoXY7dXA== X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB538; 25:m8wkoiLpFidaCWvxBXHJ6y5EXVmpCjqjS7sBs0MjfmqKo/BqOP7xVGdv1grk+9+YeuJ8YfZf84XC3arcBd9RHYbpYJSKfjdBo7vFTr8ZualCnqfFvwHQT5ihyhqdiXiS4XqCTZ1CQH64nAI86rV4p4zeH6aOlL7JlaHkNP+ZZmm1mvMss/CcpxVflyQWcvZZAPoJS2mLNQR8OJRnabQjug5z2N+eloQ9QZVsgKUeIdfoXsx/K86xT/GN6zaD16ofOYBpCI2wVlVjmVqL1blvt12tTlQzhg0jLVZR4oOsPTyCLJJr7hnISMRK7ncG+gV4vvw2YAo6CAtb7OFawnSj86NDv0eDsHKwqaEpQSuAKQ6v3kICIVkJIeRU3uTT3+R2Am03S2AU4aSImbhCLmewASROSU+Sh/LZijwRF5xr5A7+s1I2ZL4zmkZ2M/YEmg8EP9RKwykCmn6yufEjoocjFnmyNQthqWdXVEIZvF59YNRNXgcL+/pXLmFI640XdUVCUZasmjskK8w+iQ64i9EsYLJS8xyeiwwQxmFSzMucC26i9hWk/6mkTCccSHJ+EA19Pz26Mkp+w3R8ZFRcT0QuMXoBNalpnmhKKKcGfUrl8cSgLZ984NQQGOURj0zqq/aqq7c9o3xYMIBvDtkghtetO1njTRs0R7R1A7wqOUqDNHnYyB/um76kGSViYbafzTxihQqLHTiBnsVm+jrHBIJqhlQPl4jg5nLwfA4K7mDnJDGC2AuInoFyiQQUO0yTEkaC7zkkaB1p6fvPGatemNYkTb5bPs/vy14eerHm5aZnL8A= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB538; 31:Dsm8neOAimUNPAHu5hCZnqVbXLl5a2fQE/9Ma3kx4FYOujQSxwBLT/m2Kh3Khrmiil67goHFiuONHpusb8J5RHwmdnVmEUPXE3o8QwZFoBVyz8NDCKyQ1TXnNvtu6Xnaok4k7q+QP4Oo1EZNXDvJ0tCarVv/9cMZgX8J2LrdC3uQtlAJgCM8QPCswGUC5/ix9Cyh2xFQsjpaUN514W7U1PZbAy1YQwq11v73pcdAz8nT5W5ntj9UC0+xg18XSa306fa0Ol5LgCxcf28uIWrOIg==; 20:wQ8LGXgDwr8UHolrBaIryJH2bmOLBBz+oaGEzXu+1pK9a64/eUOFnUemZFoT61UrifboKGBA7sMbY6m3hI8NRjB0Zjy4C7L5VkrSZlrAmCAh7yUv/qTI5tXYJ9ZjrH9aaLNMrSmUwCZeTJXMuT7NJLlsxVaW2Xk83wgMdmg1CAeOwmOm6FUzbJT/JF5C7fZG3tJYVvshN7I1Zc0quRF7+qKiJnZ+9TdLgImbJHTenvzQKRXexyPdUIN6oK4wCZCLh+o0rcgOEbku+bbItw3ujLmSxAVjbJnF1/Bp3nA66UKENrXXIHWonB1ehdRoISlL99T3SjUz+sCVhnHSZycl0i//65ROWOFrz0ZEqq2Vq0hInk2Smbpz8wPcAbGw++49fYiAdqTPwib5E0uGECdfRr4xX7VakW3REZqIa0HXdm7J0yDhSIF9a7LGTZPTFMou5Ft3NRODZzO2Yq/kMv7fxZ343TW2WSJbvY5ByfHLgjJWSNpxjeCNnKJ8A982iCb0 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148)(6047074); SRVR:DB4PR04MB538; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB538; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB538; 4:6LWUIgvow7buX3fasESSo9dRkNVqyauDof8l3R/BKG4DSJ2oc1+gmPk1YybUoDHC/3ruKSghepbEUKcdqHMmfjEz83SIVd1r+LSGaGB2UlvuMzElT8Q8qRbv9L1U/nLPGdg83sTMI7vchav0wV835hoG2B0JdSbXmneuHO6u2liCwANOr0148+iPIygIJV/yQM+b5diD6m6z0cSk+GS+4/cc0fPkrehSWTlRrYKtKIl0d6ja0cgck8zhR8OKdgiw8dvY7X3Kwd9rwBww5+6SvY7BvxacNDpa8xLgPV97QRQvc/PcDAUn5OAqf2Ja4IE+mngj3/Q4/Azi09rBMSmmBobVcP7+9GcqfI+J1mY+BtGBBTEwx/z0a1ZsAWAX+VZ3DT0OsG7p4WS8xVA6eLw9Mv6DGWA0GZq8VGZvuEFRSoCIfzaczZrTitBCSUGCQQnM+Q67mf0XPQtGDNHwFV+/yjr+mmdoGecn6i7/P1OgUGwlVnc6hYUgfT+c89zShEJCpwOEXMumHpMQAqGCt95Bl/Y1urZWM4iaEz4WjwYtvu1sAXI41Kakgh8QrnSmFaeWL0kluwo/Xr8Stf/h2uRiC3z8gF2g1M1lwCYYmKcTx66oaMgmIhMJRwvXIOJY4QVt1CutBpXI7KbslnRuCpT9/A== X-Forefront-PRVS: 0169092318 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39410400002)(39850400002)(39450400003)(39860400002)(39840400002)(199003)(189002)(7416002)(5003940100001)(81156014)(106356001)(86362001)(575784001)(2201001)(105586002)(5660300001)(7736002)(25786008)(68736007)(15650500001)(39060400001)(81166006)(6666003)(305945005)(6486002)(6506006)(6512006)(38730400001)(50226002)(2950100002)(8676002)(6116002)(5001770100001)(97736004)(92566002)(3846002)(33646002)(2906002)(4326007)(50466002)(189998001)(48376002)(42186005)(36756003)(101416001)(50986999)(76176999)(47776003)(66066001)(7099028)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB538; H:b51503-01.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB538; 23:T6wJm25LbWPR95GEkPuWjsVHI2rpEi3e79tddqzbsI?= =?us-ascii?Q?EkZ53FjoyzjXUjkhh+tyqLzoBxwWgt0b5xSbaT+ScG7DY1uReiTdw+1IEFoL?= =?us-ascii?Q?f95qNl43X9fiDutKVII1XFZmpg5ervXlUE1MvVm9htaUQ44PVuqNQGyBw1at?= =?us-ascii?Q?m0466uANaVispUkK0ldNw+syFqYSkgcNx0f4997aRBj33ViSxh4PvEz9mXp6?= =?us-ascii?Q?BtPBZFa7QBnAOBHVNpplhj9mt2i09LPfEmlFD4jCahq1OBYsUG9dW2Xz9Kfp?= =?us-ascii?Q?U25nZOL+yujUz/jHR7v6fo+HmTlq6x0a8akjwAeVXWLwm5JGGW7fvXXtREZW?= =?us-ascii?Q?qNtiBu0eWdGn6kzgWYmxA3kjIYjCVNCBTDu12aeTrNq5YaDJkT5JGCK4IcdF?= =?us-ascii?Q?7AsKVdxcSQQTTVx1x7IrsDzpqz54gPvg+fUAT4/hPpkbZIU3414GikhIDrQ4?= =?us-ascii?Q?QihzTGMRtQPlGhBbexRxY4EAhls6tTnK0ajIQ81h9zgyYZEJPXHoNmCX5HfE?= =?us-ascii?Q?mEjV5G1UdfTQ4KC+fJBfzjd3FzxaUnZkyivV5cT/Jh5Jvq6CITpoOTaXuKVc?= =?us-ascii?Q?19T2WvARrHQEAHUkDQWY6dL1jtt1f1hEtWDjrvhsZrUCO4533cD6d9iWAabZ?= =?us-ascii?Q?sVK8KXgoOJtU8Ft9CK4x4ouGJOI2dUKH1ETIMwUcSaW8lHUMWO8CKDWnlrK3?= =?us-ascii?Q?wdEXWcCsTpDNONgBi64maUBQwBhdgQelBIvw9osll3OAnuRJ9sbegOG7Mgjr?= =?us-ascii?Q?sFbUtl6crEglgTMsKHLAnmuxM3/Gc0WV/2ALCIuOvd3TYoU11kX2fMEgELzG?= =?us-ascii?Q?sZezY/Dj4PlrJCuVp9u+H1Shz1h5Zj6wTxJH/Hnbg1xBgublnrBXgW5UTUdd?= =?us-ascii?Q?HrcMe1z7RIq7kQXwfAgKIiFV/k9s/PfzyR4N57cPfR6Ay2OsX1fUunC92W50?= =?us-ascii?Q?l2PeVEiBLJk6A1sF6KGxjvLzgvR4nmnzYRyEq1t6F+lWsMiawrlN4LS7BNYK?= =?us-ascii?Q?8CcJ0HOgihKK4Zl9Jlp1Guu4iqv+UJRtuHnWPx2vwyTjPWttklITeDDUUNP6?= =?us-ascii?Q?qJIJ5/L+sN1ZDsABDkJxZ87YQanfr3+D+AC3BPsO53cqbtxVvn+mJnOJqSSO?= =?us-ascii?Q?D9Y+z7U9RC7lex1v3tBp5rIJJXOViHz8i4QlkajkBi9CtOvowzJooQPdrCQj?= =?us-ascii?Q?d7KcD9joAAEu3mUJPBKVgx+bsmTgHf2fK40Pbp6B7pb1AWlFWb9Rx40oVzbP?= =?us-ascii?Q?6tYOApuN50zPMjK5azNFJMG3SJjhOFj2mq5kdR62G4DFX/gPTzt/Lz+zqLwm?= =?us-ascii?Q?68hmGJ/5HIGOtpxNCBZNA2aSBN/OmLeIibzW/q9h44?= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB538; 6:+mJgZXYRamTQVQnDcyKFvMnJ30xLkC7b48V6EXhyVeGRrR+eo0p1gwn6LxJ6scxmZbIpmJ4I6FW6onbKnuBf7D9ybxRwR+9bPJy1X+wl3lGQ/Bt0NYxkCteZ/S0Ytiuj6VubZNVMizwDKAk01MhZfE+JRVU/uiRmP/7Im/dCynmUDMMrOW+5ckfA4nFALcFBDwKvCBFIo632i/cC4nipaRjWEZYYNY2f4LmFi6lSO/z4c5FhT9Bad8FYlQlLU+RsNpfNlXyUOI5DSVCuQ9fVBbB+/CWycdZzeioKzlry3DP+Qfesylrjt5Ov70tXzeEVTAWNNYrcAx6cShKlKgydyR79cyETWuwd276eEhbnW+1yG9UMZUfyblCr+kvqjawSnInEx7OXKdgRR6v9nrfYgdiGJhmu3vxP02qXGkALSFYJkEYxf2a/uQ/rTBGo6w49/AY3BxeT0SegHlAITcvAWQ==; 5:EWvqSkZVpTHPF+1azZ+AZGymnxEJBO5BI3kONPGFsHxhYCu1QMKAzy7P49Gqauw50WXH43aEyTr1kdQvyAyweftpVbEIW41MT/Hp10wcCyyroOKKou9dUGNPU39I2wexEvjiOpHKoLBAgqhSS9hXjQ==; 24:1FngwpgPhsIENbEaOo88/GfX/ozuWHuCxG3aPiA9buSM+PEeyeSJnJsxINoiMzg0ml+e7MDy9paKO5aNEeS/GR0wVrDMJgIkKessoaxBtYg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB538; 7:07zbSSpMitjMNdGzYoblye3TSrGXq/AxA0M9FeKFpuE14BSQImLDsV9A0N0/BwrkM/rKc3zsOHay8I/lYuODi9mL1GWxutB7bNXHJEMQa2t65SDKg6jU3Svoj8Dl0UmA6lLWD2w5pEfp4YKUHuRRvYtcvCHm/Woro+x5IhQaj5iwDDtMXjILs9E/7vuB5T1jwA2GUdjwWOb/90JFmY9RGtqyeBdM1Cm58Hd4Kpaoo2Vmw1qN2Vt0um96cRn/Y4W1LWSN6a3t7d0OtQJsv0g46rcg6NxpmiRCTuUCf3sr2FJrmQhgdfnLgnUWVibK0AvT8BTjcf4U0sEWQhGEAPDI0dFhQIqqnQGWYjA5Zs0qOQKIBZTpOt/hhU/qKKw2WHxZCm2Dnqrpuat5cRzEpi1KQlfGbOqColx0xBRrJS7stTIkscM08o1sND6gNTKomQndGv18+guZeUL9AU6OxyU/Mw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2016 09:49:19.1817 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB538 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161227_014942_910160_B92F2406 X-CRM114-Status: GOOD ( 10.66 ) 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: devicetree@vger.kernel.org, kernel@pengutronix.de, daniel.lezcano@linaro.org, linux-gpio@vger.kernel.org, p.zabel@pengutronix.de, jacky.baip@gmail.com, fabio.estevam@nxp.com, tglx@linutronix.de, linux-clk@vger.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 Add suspend/resume support for imx6sll. Signed-off-by: Bai Ping --- arch/arm/mach-imx/pm-imx6.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index 1515e49..2ed4316 100644 --- a/arch/arm/mach-imx/pm-imx6.c +++ b/arch/arm/mach-imx/pm-imx6.c @@ -145,6 +145,13 @@ struct imx6_pm_socdata { 0x494, 0x4b0, /* MODE_CTL, MODE, */ }; +static const u32 imx6sll_mmdc_io_offset[] __initconst = { + 0x294, 0x298, 0x29c, 0x2a0, /* DQM0 ~ DQM3 */ + 0x544, 0x54c, 0x554, 0x558, /* GPR_B0DS ~ GPR_B3DS */ + 0x530, 0x540, 0x2ac, 0x52c, /* MODE_CTL, MODE, SDCLK_0, GPR_ADDDS */ + 0x2a4, 0x2a8, /* SDCKE0, SDCKE1*/ +}; + static const struct imx6_pm_socdata imx6q_pm_data __initconst = { .mmdc_compat = "fsl,imx6q-mmdc", .src_compat = "fsl,imx6q-src", @@ -195,6 +202,15 @@ struct imx6_pm_socdata { .mmdc_io_offset = imx6ul_mmdc_io_offset, }; +static const struct imx6_pm_socdata imx6sll_pm_data __initconst = { + .mmdc_compat = "fsl,imx6sll-mmdc", + .src_compat = "fsl,imx6sll-src", + .iomuxc_compat = "fsl,imx6sll-iomuxc", + .gpc_compat = "fsl,imx6sll-gpc", + .pl310_compat = "arm,pl310-cache", + .mmdc_io_num = ARRAY_SIZE(imx6sll_mmdc_io_offset), + .mmdc_io_offset = imx6sll_mmdc_io_offset, +}; /* * This structure is for passing necessary data for low level ocram * suspend code(arch/arm/mach-imx/suspend-imx6.S), if this struct @@ -293,9 +309,10 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) val |= 0x2 << BP_CLPCR_LPM; val &= ~BM_CLPCR_VSTBY; val &= ~BM_CLPCR_SBYOS; - if (cpu_is_imx6sl()) + if (cpu_is_imx6sl() || cpu_is_imx6sll()) val |= BM_CLPCR_BYPASS_PMIC_READY; - if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul()) + if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul() || + cpu_is_imx6sll()) val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS; else val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS; @@ -310,9 +327,10 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) val |= 0x3 << BP_CLPCR_STBY_COUNT; val |= BM_CLPCR_VSTBY; val |= BM_CLPCR_SBYOS; - if (cpu_is_imx6sl() || cpu_is_imx6sx()) + if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6sll()) val |= BM_CLPCR_BYPASS_PMIC_READY; - if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul()) + if (cpu_is_imx6sl() || cpu_is_imx6sx() || + cpu_is_imx6ul() || cpu_is_imx6sll()) val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS; else val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS; @@ -373,6 +391,7 @@ static int imx6q_pm_enter(suspend_state_t state) imx6sl_set_wait_clk(true); /* Zzz ... */ cpu_do_idle(); + if (cpu_is_imx6sl()) imx6sl_set_wait_clk(false); imx_gpc_post_resume(); @@ -632,7 +651,10 @@ void __init imx6dl_pm_init(void) void __init imx6sl_pm_init(void) { - imx6_pm_common_init(&imx6sl_pm_data); + if (cpu_is_imx6sl()) + imx6_pm_common_init(&imx6sl_pm_data); + else + imx6_pm_common_init(&imx6sll_pm_data); } void __init imx6sx_pm_init(void)