From patchwork Mon Aug 22 15:53:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 9293109 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 B325A60574 for ; Mon, 22 Aug 2016 08:06:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A388428843 for ; Mon, 22 Aug 2016 08:06:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9876F28870; Mon, 22 Aug 2016 08:06:33 +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=-2.3 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DATE_IN_FUTURE_06_12,RCVD_IN_DNSWL_MED 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 109DD28843 for ; Mon, 22 Aug 2016 08:06:33 +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 1bbkEU-0001dH-BY; Mon, 22 Aug 2016 08:05:22 +0000 Received: from mail-co1nam03on0071.outbound.protection.outlook.com ([104.47.40.71] helo=NAM03-CO1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bbkEO-0000f2-Fw for linux-arm-kernel@lists.infradead.org; Mon, 22 Aug 2016 08:05:18 +0000 Received: from BN3PR0301CA0016.namprd03.prod.outlook.com (10.160.180.154) by CY1PR0301MB0841.namprd03.prod.outlook.com (10.160.163.147) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.549.15; Mon, 22 Aug 2016 08:04:52 +0000 Received: from BY2FFO11OLC004.protection.gbl (2a01:111:f400:7c0c::187) by BN3PR0301CA0016.outlook.office365.com (2a01:111:e400:4000::26) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.9 via Frontend Transport; Mon, 22 Aug 2016 08:04:52 +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=fail 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 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.577.8 via Frontend Transport; Mon, 22 Aug 2016 08:04:52 +0000 Received: from anson-OptiPlex-790.ap.freescale.net (anson-OptiPlex-790.ap.freescale.net [10.192.242.177]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u7M84nC3026597; Mon, 22 Aug 2016 01:04:50 -0700 From: Anson Huang To: Subject: [PATCH] ARM: imx6: add missing BM_CLPCR_BYPASS_PMIC_READY setting for imx6sx Date: Mon, 22 Aug 2016 23:53:25 +0800 Message-ID: <1471881205-6389-1-git-send-email-Anson.Huang@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131163266929438896; (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)(77096005)(7846002)(81156014)(81166006)(8676002)(104016004)(11100500001)(106466001)(189998001)(50466002)(87936001)(626004)(356003)(2906002)(47776003)(8936002)(305945005)(50226002)(4326007)(50986999)(105606002)(19580395003)(19580405001)(68736007)(586003)(8666005)(36756003)(229853001)(5003940100001)(48376002)(92566002)(86362001)(2351001)(85426001)(97736004)(110136002)(5660300001)(7059030)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0841; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC004; 1:S3Stedo0XPnd/KyI5pv7KgzJhQMM+6KUS1vmQOsgvfj00+oUuQMm6OmY9VPUkJxxpB1/hBJHa6pEIZf9tbMB2lTMon3bnwOvPgKTaCkN2NAnKm+8CGOZVQMkzjsSUVCVZNzJYr9NalW6UyARx7zhSdVE6YNklKg4V82ForabFk/bVZHQBv0E1OAmw4ukeREO68kXY74O4gveuEFMXQefYEZwAHp2qBhtxOr1Zl7prV+Cr0k5JngCI+rZ6muHS/EiKn/to+h9NdHh4yfdQPRY1jZQDmduOwwl6zuSuqFQ+73aetayqI7fu8CZ8XrO2WXawxPkf4lmzYQST47wtOg7Tq4lkASSGbMiRcoUE7yZ8RePhTq/Oyf0P+W3vOoXOBGGOSlPSMIGGTCNYsI4BJ36DmROdBfMCpKIb5die3pddZpF/yapNcimdAEIlMDUflA9gZFL/s2Q+wcIUuerg4B2/8PzcV88e2DQBobgLsbCIvSEMnaQVj3ng8t9tK4xTuhss4VEXZnFejYPibkasvIZUFrULj3q3/oB1CMorqdJGQfqXIdz1FQslCNZB9vnFoXbbhW2vnPrYuZQmgKxl8XibPKHSUlH5GEj82uSekMzuxBlCbe6N2GhVpfgI1nuNPiF70dYVvG9E/6E7S4QTVD0sSFylabjckpUEoTSMrnV3jNcKjD3678d0kvYTdQcjSLwZIN6xSeGhV6AYF2g18xx4p35hBCZ4xSsKhpat84WgDg= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 56c33de8-3850-4dbe-4f52-08d3ca62ff5d X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0841; 2:pZ+RQ4JLeaGNDj9Nx7zTXWYvAGLTvh9GEEOaYLDLsUR+xEMNvMuswmTv52EGBLwO+a6Mqfcq4VzrK02ojJ0NDfUXsHvYUbdYy2EPTw60XxN0tI9qWBgSSsEzyb5z3heg2HM8iFwzZK51Fqk7mSRCZGEK4FKDCNFXBmslNjYsv4AyeSJb0pCG0cT0YbRNHNdS; 3:XvUXa7tlKjffEiDPwraMd0LLms/d3FJ49PFjXB91u/Bhh0oXbQBosH2JVrIG6UoOeRgAWdrk0Vk2lytEtMFK39t/1pUZqgAaZrJUpILPvA3Q1ajzepy+AuJ8UkPIdnjzKZsrTwtDcVgCdsMSWzbH7RPJyuRYSGz6pcsG8YqmlUyauEiWNLRY8OP2huA5m/feJ7CDgxBNowcdFc3PSGouL47/WWa2O521QxDhQOtKq5k=; 25:nRCLrNjFpeNgQ8LBW6yv26O424svZlQtXpDvc0V2EvnbzKw44mQ2qjClwXA+Dyem88eTk83gwK6mRTLXT941Irl8FDRD85ZaZ7wLVUE3qKcMkYUNHT2CVePqN2OWQq6Bk1vLJh2s1YN415oY4FXDh+H5x8Vz7IMdn1zpY4f+pJQYW0bm+WEW7Tb2zkJvWJ4EZU/7yMsVREelihHRXAYVfNQfaFMl+tlCXCfIGM7FbHziD82p2SoYH2ibwxJBDWpj4LQsEtMdmgicgkTs0OSSgZGYCZEB4QRQRzqgO/0X+LreQL8U7j0o4znjtZ2imSXVFMXElEW11SLQ6pM1h1qFf8Wcm1ese77kifhTebwcq9ck202kGfK4tko7IAnRxgBBUejuakR80eunyc7GIsYTTiRWkVBcHMxmYzaold+y/H0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0841; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0841; 31:WWYraMKosHjlV2AGoK3KLsp9kgnFnovUo+8FglDxnbpJhgbOTak6eDIXZ81OQNoHqK2Qkv2yY256Z/Jb4epe6bmy58FEktiN7uE0ECJQgzyTdIaswMOHSadZiSp3QNQ4e1f6xiBitvePt2/dJY4YZMwGNH5DvQFLQMIDZHvkt+zwB//O6WxfJN3b3i/TJrAuEFdYzBkf6zy+ppdanudpsmKOXBL0XOaDrC+gtB9keXM=; 4:SLKYA252fVN/PvmhW3Zv/DulNL50876lbVRDrk+ax1x3aLr5NpiNn4mQNYcZJuKSdYhqJulOU6U/HDvtvd/3gNcsYTgz12rudkhReMyRHcQ0NW67h6FFGuYJkczg4H0TCDli5LMy/U7YyZDXx2NsY3D+qi01Qra0JfUzcPuE6au1KxNPK+mOhqqM6CAo5V5l1ywy7UNRCl3SLZlUN9CmIduhnyOPpLsbtkbp+VkyF82cmRNpWI/7OoDYFI0iXeWykkeIr84Lj03ghpw7s3s1yMXPCeLSjEvSKvvf44vUfR8y/QEhfOYKoUKwsi/MukC5RUA30sXjnyIne9/eJnHNe/zpU+HDe7CmNvQdSsl3dGJTnFTORr4tj+Dhc398veV5FXAG0nrHl+B7XiX+s1ZbrAM4bHCrITCeGJ0OKEM/eVC1aD5x8OMFDSqalBSYKjdGxwgSnDxcTx5zwnr301dfWyc6iEA3owGZogD+PZG1PbL1n4ZLMnE/QQ0mETwc448Vf0q1+OOkkJA73D+ZHHWwfyBStq6yuYRWAW0h2jWPsSQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(8121501046)(5005006)(13018025)(3002001)(10201501046)(6055026); SRVR:CY1PR0301MB0841; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0841; X-Forefront-PRVS: 00429279BA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0841; 23:5ZOyfI2N3xqJFURuLMQs+PM8MJYtK4+WuMgO3w+?= =?us-ascii?Q?0mZi6XT8xVri2u9BNzoT98S0CzRKuHDITSHQPLDJhpxLy2lnkTibS2Y/zQSZ?= =?us-ascii?Q?GdsNlD+Q2lBlU2yHgOib1Yd7U84piHvmys3txMFZLdOhxyFJCzLcqaXxYlxH?= =?us-ascii?Q?fwCLqqiPtkoqC3yCJQfw1vrKAvLXiMxB4B64C4sRuGrf+QPBgcpVmxy9/gkz?= =?us-ascii?Q?wMDdpQbLQSXhlKJ2fDpDwJWiEA4FoVPy9ZN4eepQw/MQvNauxyyW+hk6SCL3?= =?us-ascii?Q?IduquNwM8XTfrCcTEstLOta3G+xvXW/sBzn7VZaj9wbOC0yCIRBqPIo+lCm2?= =?us-ascii?Q?HzZyi6YO7UoXrCVDm9kEgvoDSmM/dxGaYq7SPZx05+exIt6V5LKm8d8dLe+n?= =?us-ascii?Q?bcVxOQjeLo5AXU6SUaMahoW4Ft0lzxd2furaXqFiHQvxhryfKioH0ES4t6qB?= =?us-ascii?Q?BXySvUvAiI5qqnHU5J4RhLfWokck+sGcrom4CGlVD4a5+b7zvuvKif9RHaIS?= =?us-ascii?Q?w5Icf6svY4fxyvmeYY/STiNkgnYi9uYorO1Yn4meIcRxfm625d/B62TY4cDc?= =?us-ascii?Q?kUVf54VZTE3PAcRxMUW/RWwsYFFxFbeq68ZRSK+lGw7eyYChhWeQZ0rVhHfj?= =?us-ascii?Q?u6/LTgasiDfqkCPDuUuuZ3xhFu1hPCYdxt+qI2eXRgSDCC3D+AtRsMPqlzWT?= =?us-ascii?Q?e0u8luGHF/IDum97ppSw0uZVyoDRzfDij5xXWOv7kckiajxNrWL1LugfU40n?= =?us-ascii?Q?T2wPcOBYqXSXhAf6Nd6LTU7FEZF7a5q6JeMRGYpUY2CNrnItFSnumfapXXVq?= =?us-ascii?Q?oE2/7Qv/QEIVe7UlU4OUrBaTCDC6jbYiTKAHMXwbfiBHL/OZbkF+yOUgEuBz?= =?us-ascii?Q?CYjXA79qcWjPr0Ch2LLURdjlUsuqAZeNmBa3UwR7oG27SNAX3TR0ot2KTTB2?= =?us-ascii?Q?a2H/Tlew6E7hyoG5e95CPfCt2RyrnagOD/TjRFrEymxRSUWzg1DDQt+Yn14a?= =?us-ascii?Q?BOxUGFefyFjii7I2zehIKw4wyFk2v6shWoZo9rdPMbvn96KNMnfqWFWHiZpT?= =?us-ascii?Q?lBcPb7DSYB2hnUE5GHiWhuAy3JQtdX9bVJPdOoLhCcrFQ1EOLxJCnB7rMxTA?= =?us-ascii?Q?CMzsnUvfygH4=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0841; 6:pl1SlWR+eZ5j6UgrRXRecIbcy5fhT6hRiRsvYyH54DLMtiF5FA+q4+LAebH/ZuDR7TSR6q8bpWm/2JVaLZr9qtAMrKUjEaMc1oyHHBV7CqyPMg4R8AQUXI4JG8qQ/9pN2u/BibZj6e3PyRWaKNL6f/XyFCqQkAP48QZZhU41bx0UwA5XzV+aUZwapRV8Vz92fKW4C0GR+u4Vpw5QJySbjxRBkHhgR5JW+rT5cffnDj8VBfyqNgNLUl+do9mXyRkRw1pZ4+HqAnX6x9T3GgFUul6UnXCy6EIKrKwH7pCHkLE=; 5:CYrYJUdVk9rgodICPJK/wGSvGLIvHmfkAKnYPB+38lPT7+P4aquGwvPny8c3wPaL0UkYOLBPvRQBOrCbyI71Uy/37vfvx8dfLXA59n+kjw5BfqWuxUkCcyGOE+qaSftTxdNpYU7pCi615jutjj0Vj0Iynug5ojycSeWRO0xcUl8=; 24:GRE2ZAtD7ScGnvFY+18KSQCS/PflVYZlXRcUTnCzOYlvsptJx5Xt9Skt2jEKmSi0r1b5n+zwfbQlkgLpzK6zeFKwC8IsIs03utxFdSBB66Q=; 7:t7chIyPUkHZIlP2ct9Bb3CRcboiK9qq7qvavdZrHvm5/b0quSKyuZLdLJVvNwXx24h/BbAixLW0+o+HrRaaaTxUpPWiEqAs+WQxjHiocbtT8FbCLxgMn2OXL09qaTmMyDHd7ZS8Dnod7gCM8KwzQ09iJBZZAktJKjwe0Yzcn9Og0lFJM0i8buEzNcNJFhx9LtjOftPvL+Q+aC3DV9McQGWMDRl8nYXrrT6Z3DjYRfHVHR+/SA0DK/UF4P8QfW37L SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2016 08:04:52.7410 (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: CY1PR0301MB0841 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160822_010516_902334_D047FC50 X-CRM114-Status: GOOD ( 12.25 ) 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: fabio.estevam@nxp.com, peter.chen@nxp.com, shawnguo@kernel.org, kernel@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 i.MX6SX has bypass PMIC ready function, as this function is normally NOT enabled on the board design, so we need to bypass the PMIC ready pin check during DSM mode resume flow, otherwise, the internal DSM resume logic will be waiting for this signal to be ready forever and cause resume fail. Signed-off-by: Anson Huang Tested-by: Peter Chen --- arch/arm/mach-imx/pm-imx6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index 67bab74..fe708e2 100644 --- a/arch/arm/mach-imx/pm-imx6.c +++ b/arch/arm/mach-imx/pm-imx6.c @@ -310,7 +310,7 @@ 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()) + if (cpu_is_imx6sl() || cpu_is_imx6sx()) val |= BM_CLPCR_BYPASS_PMIC_READY; if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul()) val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS;