From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751085AbdE3QLa (ORCPT ); Tue, 30 May 2017 12:11:30 -0400 Received: from mail-dm3nam03on0048.outbound.protection.outlook.com ([104.47.41.48]:7239 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750922AbdE3QL2 (ORCPT ); Tue, 30 May 2017 12:11:28 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=nxp.com; From: Leonard Crestez To: Shawn Guo CC: Anson Huang , Peter Chen , Lucas Stach , Fabio Estevam , , Subject: [PATCH] ARM: imx6ull: Make suspend/resume work like on 6ul Date: Tue, 30 May 2017 19:11:19 +0300 Message-ID: X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131406342871788885;(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)(39410400002)(39400400002)(39860400002)(39450400003)(39850400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(47776003)(110136004)(36756003)(498600001)(53936002)(5003940100001)(8676002)(189998001)(356003)(50226002)(77096006)(105606002)(5660300001)(106466001)(50986999)(33646002)(8936002)(4326008)(48376002)(54906002)(50466002)(6916009)(6666003)(104016004)(305945005)(2906002)(81166006)(8656002)(38730400002)(85426001)(118296001)(15650500001)(86362001)(32563001);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR03MB2813;H:az84smr01.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;A:1;MX:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD037;1:pOmNP5uNmcfWNMU1o1zLehgV8nsRdyLMyE5XmXOjimyOWnxT7KemgSvazQKn1cuCwGCRaGY0Wlx2TLmleWGwsA43yFngoRTI6DngpO5Gxj59wlvPyTIp3MvxEejq7PVAkN9wfQ0uajaLLSEMtXRnyLU2ok0LYhf6JibAHZ828O4aYGYj9DF/mp5MxeMb2UOr0an36AhNuyq5F2NZijGRRm10jsYWaUt96y2do56ixyus0hM5c1CgrxrlRx8yCfRrtSiRuFtvw2l6ZqxKO1YduNsQdM4H7CJgPDL8L8eRD87zWIgtOTL3VVmu0y/M4BkEAJqo3rirXWGFqwJ5wgf7FdYiex2uVajAbed1H01tp/MTfVpRzl/3hbFlKI972F4RkWzrjkhvKRcdUotKpFULPP0ozaXicfFlhS0/gGu4e+Es4E0rPXI7mlptf4iD98onC9xB+cL2b970J/tSu5mXmO8tzzlK/j3+7CAPpYQDCYrnhrGfVQCouw7f8DTPhlKnEVYpI/rzzlnDgZsiwP897uhHeDs4VJ4Sq9JKx1dVnctiJgMCrnQWly1gBq2C3v0w MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR03MB2813: X-MS-Office365-Filtering-Correlation-Id: b27dc66f-6855-46ca-cbf6-08d4a776868f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131430075)(201703131517081);SRVR:MWHPR03MB2813; X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB2813;3:moi3fi6UUuKBbTV8CAFz4u6gQxzxdtcsBC5RPxYdaMt6pTkqL1k9+7Wqc5t60JdwI4Kbwe6uNhwlqXGwYxNvwbSMlmELSCbw+w8TNQXemd2JnRsSuRJnjTiuEK+nlGDhK2waZ6OlloLOwVWNPkc3Ey2cDg8Vw27mEpgHY+FNQ7xLDyT2Unf+UMt5fipspAV8I0j5rC9ilCQAB/1BzDs06+zc9EUyTVGtt3zrODA9gSxwf7kWkSZ37Xl0h+BIGIRVcUu16gII3g9qHm6oqM0E2zq7BS+Eqp+E/qMselw180GiwGwbWLGtyzl3vzJBaA7RJgo0Gssqf6V9McYZG4lfla/59uzs3R2qQp+IwJeZ7TXn0uXwJRf0hAfs2JyYGErAscKJlJ9EdatH7zAq+/L8P1Pz3ULwBmKPuxEVnDuycvWFy3oX3lZoQQdYhBMfg4LM;25:YTiYn4iMn670Dndst+dnA9twumq5Iqn5Wz9Ml2FJ3ntkal0c5jHyfoR/4K1a5xJUNDfu24YUbWk2yPneLywXZDHh6i5WcAqoHSHgg4mRF4lsN6iLzUbNddf32Kkfvl/ag8U2A5Cl9H+gTIXMvEkEHq5+exxFlYae3/i9wlV3K7l1ycy6coFVTMaMYpDc+JS2X2HcTqFbVrGmcW74Y3C4APBQzo2kaj7CNFMWc+hkp10Dt2AiLUsOmod3NJ3S5oCzJqFQU1qJVKXrvsxIqf6KDHnHHWQ6Q+0/ZUSaWPIfSnbnlZKI4ok2/WQUf6GArr7QbiN1/k4rHt/KGVmQtr0bWfbgwc1ajV20g8hir3TOa0hrCRNLVf/Hx7vTdPF2giAj/gneHajhlAiuPNpdLGXakzBi9MQVTMun10+/r+clU2GbN/SoAT1jzRpu+vrl+t8iK/Xhko8TBvLOePKTnzw3IiDQQH1kCu3X3ssUfhiZ+tI= X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB2813;31:cit38VGFZ5ZWArvGilABIOsUoguoFqdaP9lErOEbM/6SJXF8pd9Z+1ztD9PiF7C7rLNbDLm7HYBli4T0KcNZJqPeyrNsEaRc2UJiVJJEtBURF4faONobecsZmQgbrRUs+vRkmTa5nWgh70LfNs3Wtw2HPP5JB0mvndRluWE+D0g2E4PxWGVfqa+p1v3yE1JqI8RlNX3KrZsPsNFM3sEYip2d6tKVq41ZKPngnqn2wjQa++Rzcfjt8ssqSNN8/YEL X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6095135)(601004)(2401047)(13018025)(13016025)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123559100)(20161123565025)(20161123563025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123561025)(20161123556025);SRVR:MWHPR03MB2813;BCL:0;PCL:0;RULEID:(400006);SRVR:MWHPR03MB2813; X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB2813;4:PDh6T+yCJGL7+P5A1gbWN9SqYC4Keb4kb5g+ovX1H9HuLLrhP6P8P9BchT6RzPfc1+XySDAQmeXcY5IkwSeGKepDUbYX22Q6LYdUpWjBnireL9nehLBG5PUg4JgtuCZPhvDzrJ7G5S9pSmYOe7lOMe43ce5wcUlQVf3pN0ES4cWpupwlDtrl1SnArHFKLMUDyFVMgm/3lkN/YD2sWvvv/6BAqu9v38xEa2CxmDjdESbbp8q/XQh0Akmnc4T3nmi2BgBPOEyzVfDd2UOzjxHKAptKvrr5FmkP3jRrJeoVc9LHSnZc+sQ9xPUuhYJaYJJeWpSHl+kd9UuEuWhfCMP+17dGcgBvvoh6oDTKAnz5C4Yj8jBJYGXGh8jigtW93q5GjLoA6p+/IJg9BjnBn0Cj52Ec8mlRZGOUHjp4CmT+b/8gX9+huHAYUNSsSA3Nu8LWNFO+Bo3r/ZwZZjnz7s8+P9ciZFZqbVVihTP5fUE3ffjtoEnysSn0W1e0QqDagy+jVzY9JXp7aCJzyQl5rFvdVmM7RhgsNmvm0YrwKh+BB2YnViFQEI5Dxzxw5mNfH5WAvchkpAWz78PkgRXyFS2H/3AyTTBUfZrJHSOi4jN4KH2DdNAGbcXcQ3VlF2B4PoGjVSFquSp8OlWwO7eqAuxcqH0TMJQ7OSHT4ustn+8MwV6+sOdt0B8xpvIncr9+kthPx/L+3i/TY49ebv+IESI/wiw0e4Of0I6BRAF9DT3A1OskPsNenIicdabMz3FtBEQvtVNxYODxyxk19yPXAof0fAZFbfhgjoVM3Nh/3alw7Z9wB6bO+fBnh30GwQ1HW8PKzud71b+32q2MjHtJ38MZKGVGDplZcQPx+fG8ludD1YOne0fIInygNVzXJmQ5VMH5azYG1aKFMhnnzApFA2Y7jA== X-Forefront-PRVS: 032334F434 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR03MB2813;23:s2POvLrKsp6Kz3Y87VYsA2cU1FLbMnyiJw5h8VPHU?= =?us-ascii?Q?uOXTOt2AF16bhq3b73pyq0nQuDJdoNzB2v+GfJbtcqhXOu8FFQYIc30flDFS?= =?us-ascii?Q?T/7OQSxYBvv8v9LvzlRidwAyuQXbHB+we2oQA5rWh1WiS8mCJPZfUxgPifsR?= =?us-ascii?Q?nzBzWnhI2/l8bStaI88PqKdws1jKnXUJZnTIiiwAedPnb/yDBOgBNZUkT5TQ?= =?us-ascii?Q?KaWJ1zSkzXyYqxjaHR0lxTRyzKPZMkzAhhgDZDiKcB/hN0Yk4UOvoGxs6fAl?= =?us-ascii?Q?rBgsWKrTSsi2z0/LUBjMKEq1Ga35rPmoLoUeYa8kGfZimyVN3AnJHwF718La?= =?us-ascii?Q?1sHcAKAVgkDCBDyECHztKEczNUQFWlBfMU0oypnQ8l6+OREswpi1jOyIT/mQ?= =?us-ascii?Q?qEZAQYBGHpTDqaXoFxZ97YkO71EAVrE/HVxvfqU1sfc7EKDxZB/npL7ZSQTo?= =?us-ascii?Q?PbqwanFX1ST5OLXi6/b7bDFQB0+zxUoA7Ac8PhrL1Mmfb3ffc8NnLu08BqyJ?= =?us-ascii?Q?3fkfonIfKk9+QI2RcZN1iwnHrNenjMtq9hYna3DPDfMQlZXcZNN0mT4d1i8w?= =?us-ascii?Q?xEbBEdcfaqGQu3Hff2JUhsELzW5UueBgROXbeVsEhvpmw+G2FdvFv5xrYNEX?= =?us-ascii?Q?MzDJYg6w5gAZ3F3HTimVtfUOA+2Zav4OkZbBVFryVqNA6h9x51Xf8lp0c/LD?= =?us-ascii?Q?+NPKW9bVGbwOhUzzM+C/WWRQJ5cKqLHQoRAgyYNCUqSF8DGKAOUk28naABqo?= =?us-ascii?Q?dyZdYg3co1SQFM6C7/7BLm9SPHMQmjcQClQTN30eY2wzaPseMKJOypp5CwgC?= =?us-ascii?Q?ukTA0SHTSlQGw4ajB/TyMn+dGsjd3GB/TvNJREELOsgLR7IzuFwJbD+tcI63?= =?us-ascii?Q?4Mscoxkd/yddWZQtFcoA/z4TujJ7zVlXABkeEgFzQwgNeUXu3VmvUGB//ybF?= =?us-ascii?Q?3wtfIIeh+5ZF+2o8QOWknSGeqOgF19eftu2wn/7ETnsPQ8xZURgh4XKPmBqx?= =?us-ascii?Q?k1fCQCJShHu5y73B7hVFj7kpxX0yc+p+WvfNYakJwus91foEPe+NxrR7L0f6?= =?us-ascii?Q?LxICEYqeKUQnHsXWmIIPYEuK3AChPUeVL4T9c1mCxQG2+L/b85v8T26+Ed+r?= =?us-ascii?Q?p0gzFURPAEtPBt3B8OQAAAhTd2VgyHBgLfffx7q/HJxa2whWXKK/uig/gDOP?= =?us-ascii?Q?izTsanJI7T6vVvcSvJ16igLmI30KqwWKq3zchxZ9Q1bBePfc0mMoQBBsjBjh?= =?us-ascii?Q?vyIG0uv0p16Lt2/zRw=3D?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB2813;6:PiTqzNi+iodqkTUH6/oarC1xqN7ze0fSZ2QfIHFdIUp5iOa503V2B8C6dBZNRyQmJFh2C+w2vShUmLMOW0X7PblRX1B0sC8EnU1nODYPeMfanhffPhN5E25TJ9IkPenwSaBQn2TVV7H9+IpyK2faF524WVwIzaCNiIMr/B2o57HL9eR7jmjVqUeRhPTw4FMLq0SigCdJcx5Am3M9bUkpHt05twBXZP8rSCeMczHazL5bdrECDwYeYttRJwZNofh7gGpKi+20uWf0Hd49tu7lWdVTeCpwrSa0bYW9yVxgdKlkREJ6pBa7dEAN46iYrtHjLdpb6G0drKYqUQR9EhD3iXDnfxebpo+H3GejF2x2l3q7zGBoOmnvtWsfgzsgrmedLvHXOxnbuPfNf1/yIL3qmEPfGpLIsiW7+fteNajO4GI93ABd3NMjyJqbxiXCvjCP3VCq7J1zHt4bIup4+HfsEEbvTqYiu/4WKQJZSrWklm6nSFpeUEbSHs7wbbt1OcuOGxe5iQm2axrubjwTSSARhQ==;5:L3F1xNB9VJ73WcxyT75hPAri0UPGDixF0h6Eq40tmBBykSF6yC+E+AxZNz4RmAao5GdLvrL5mggjTh6ULbeO0p/vw/x+3ibQHx9qGklzqfaT1dAmEvWZ06urTkKhNQXPxyAto0ObElEohYthE3BDdzQRISFkp8Elm1H5bHdGyijqbw4Esg167ZQxIkh4Za2P;24:r/s2C/4kStD1j275hA6cbpglPc/8V6+m8FCOYvo/5CmJbKp2KB6LopGhRpHrCUfs5JWGX52Z6TKpZ7uRuEvGtLjhyK1tqof0/xd25khfEwk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB2813;7:iDuMEo2dnRvz0wNM59oDvBJMOw9Cyh5VOLov5mT6+9N2O+V1w158G46TqnvKrw86PTu+m9am8HGhFWVvA0bpQr37HxGgAjSt280Ug4e01g1Snohxd8IsI8YsOu1IGUZljKW/cKGqKDY85GJzRFGy60fZlKcht+LuQVmlbIVlL+P3CllRx9Xw/r87FmABl2L/cYU+SFMepbHVe5HKuAfAvLVLBjTfKGdM3jdvwjQfbU+0755c6j6AazDmm9UChq2L1K+4jkRf1TaUcaUxykbKbn4JjwWG/9v96wKdPfV9nor6MwgwyiBiGuExxFtWlvGd6J83kMcMwBfHnkzQ6JQ5uQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2017 16:11:26.9448 (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: MWHPR03MB2813 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Suspend and resume on imx6ull is currenty not working because of some missed checks where behavior should match imx6ul. Signed-off-by: Leonard Crestez --- arch/arm/mach-imx/mxc.h | 6 ++++++ arch/arm/mach-imx/pm-imx6.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h index 34f2ff6..e00d626 100644 --- a/arch/arm/mach-imx/mxc.h +++ b/arch/arm/mach-imx/mxc.h @@ -39,6 +39,7 @@ #define MXC_CPU_IMX6SX 0x62 #define MXC_CPU_IMX6Q 0x63 #define MXC_CPU_IMX6UL 0x64 +#define MXC_CPU_IMX6ULL 0x65 #define MXC_CPU_IMX7D 0x72 #define IMX_DDR_TYPE_LPDDR2 1 @@ -73,6 +74,11 @@ static inline bool cpu_is_imx6ul(void) return __mxc_cpu_type == MXC_CPU_IMX6UL; } +static inline bool cpu_is_imx6ull(void) +{ + return __mxc_cpu_type == MXC_CPU_IMX6ULL; +} + static inline bool cpu_is_imx6q(void) { return __mxc_cpu_type == MXC_CPU_IMX6Q; diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index e61b1d1..ecdf071 100644 --- a/arch/arm/mach-imx/pm-imx6.c +++ b/arch/arm/mach-imx/pm-imx6.c @@ -295,7 +295,8 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) val &= ~BM_CLPCR_SBYOS; if (cpu_is_imx6sl()) 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_imx6ull()) val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS; else val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS; @@ -312,7 +313,8 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) val |= BM_CLPCR_SBYOS; if (cpu_is_imx6sl() || cpu_is_imx6sx()) 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_imx6ull()) val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS; else val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS; -- 2.7.4