From patchwork Mon Aug 29 13:49:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 9303093 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 B7B906077C for ; Mon, 29 Aug 2016 06:03:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93D80287CB for ; Mon, 29 Aug 2016 06:03:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 88B6B287CF; Mon, 29 Aug 2016 06:03: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=unavailable 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 07951287CB for ; Mon, 29 Aug 2016 06:03:32 +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 1beFdx-0001Si-NE; Mon, 29 Aug 2016 06:02:01 +0000 Received: from mail-by2nam03on0068.outbound.protection.outlook.com ([104.47.42.68] helo=NAM03-BY2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1beFdt-0001JO-GO for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2016 06:01:58 +0000 Received: from DM5PR03CA0021.namprd03.prod.outlook.com (10.175.104.31) by DM5PR03MB2444.namprd03.prod.outlook.com (10.168.233.14) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9; Mon, 29 Aug 2016 06:01:35 +0000 Received: from BN1BFFO11FD054.protection.gbl (2a01:111:f400:7c10::1:183) by DM5PR03CA0021.outlook.office365.com (2603:10b6:3:118::31) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9 via Frontend Transport; Mon, 29 Aug 2016 06:01:35 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; armlinux.org.uk; dkim=none (message not signed) header.d=none; armlinux.org.uk; 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 BN1BFFO11FD054.mail.protection.outlook.com (10.58.145.9) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.587.6 via Frontend Transport; Mon, 29 Aug 2016 06:01:35 +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 u7T61V0Z029873; Sun, 28 Aug 2016 23:01:32 -0700 From: Anson Huang To: , Subject: [PATCH V2 1/2] ARM: imx: rename imx6q_set_int_mem_clk_lpm() function Date: Mon, 29 Aug 2016 21:49:56 +0800 Message-ID: <1472478597-6731-1-git-send-email-Anson.Huang@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131169240952815445; (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)(1109001)(1110001)(339900001)(189002)(199003)(43544003)(4326007)(85426001)(8676002)(81156014)(68736007)(5001770100001)(97736004)(8666005)(305945005)(189998001)(7846002)(50226002)(36756003)(50466002)(626004)(81166006)(5003940100001)(11100500001)(50986999)(104016004)(48376002)(106466001)(77096005)(8936002)(47776003)(586003)(105606002)(2906002)(229853001)(5660300001)(356003)(19580395003)(87936001)(19580405001)(86362001)(92566002)(575784001)(7059030)(15760500001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2444; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD054; 1:SSMjNASWnlK0kuKh7F0wmL8+w70sZSCIu5+Ypk4OcVQoSID5qpbJgHVSaRM29D6sbWqDa1P5cQTerWiB7c3WJGv6h3AiJ4u6U9kqY2N0qqfMMLwr5i8MHaOPp59pcD7SZ02dQFG0XDLRoZYZcu/gsvNTWifzwFhDZuYVj3wGi/kE0FAzP+2FXlkzOpZRc5tlveJ9NBcj+JFwh83ZnrbIG/wSysWey9TarwyseMnw7fWDolOBKLVGtL3Y3qsACpErI+de2c8SVfQ9YHJ0poTaZmWaMoVGID+3ih4NvZV560J5h+cfb22I4/BTvRsr6SRE889fDSS9HeO+2bF85XyxgOY+ybn83xwJ+iqei4YqXW+m0FV5P3+oQ9pvYnHEdm5Cvqez708iNndkDtIhRma+FRp8M1oz0uk4ZcP66lw61qSEB42xQP4e+UoyGRrHIlRYrDmjFhwIMCSttn70p3Uq9XEBBuOjOpdnU2fk0ykr3/9QMhQjgw5ifKANiE4+B6AZdRIH7z40/5n/ke0ajqaFAwGPhspGnJPKJWGwdshV7mK0CzmBieGOn+uasNnuIR1ZMsoaSOksjS39MC9lF5QDRhu3Jr8bHhY3JMT4H3m8Md5+dTfQtIr6m8Ve6Gyi+uEB MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 199c3b0f-cf54-4e1c-3f55-08d3cfd1eeea X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2444; 2:YoLOvYRwHEa5+CAzpKpQxT9aqzvnGxE8e9AJgOyHa2P5uwMvdz5R6DWCE9O6nfD8uzW+TesbTEzZXH+/Bg1hck3uKziI4w4UAWVIlctThT/bU0eJUmG1FjpxYtvHvZzXRGaelXswjrYJZMWvi/DW6YqYWoxuSlKm0VUAwsk8kQs50L1Vjut8eGJuZUFZP9qA; 3:VhROPb5LrNm1/Usx+iULnco/Ni58FcuUBZlo2qlUo7HmJKqXtDPePZd7dbdW4DwBwi2MlNYcjQ6Eo9AJoGBgYAjb7XtWl3/XVQ/hYr6YQvEloPQqtwRxAaNS5YUUftMl6QOZBGjUqt8spq7O5DjSwwN0VpyUpYPMAIHyTzayW70+Eayn7KJxe60A8/y+pbSoItIy/cczBMMHyV1WmMDxOZIzdyKsU0MmNqpCLARSqMg=; 25:2Y3mntNMzqifNOJTj1cdRgzdO+XFzOOg0kgBwdg6LqvFpDJBdGPnQYtAjKftMHqZEF/WhmckTIWP5PyIDiEq3HF+X9+BLC07P7Rec/6diozK5cVMKW5jsSpBy7JaOwQcTxFhTt7kDLA03GBKDI260MpcILiFDzIINgt8n7CsBkHfFrhJVxgbiyBHiJ8LMAVpgoMY/VfDCooCXzBn/6udB5ZZVMP1I0GzpBNofFutR5z8h9iVGeJx06pEi2T0P4SfCIMv5IvXrQbiOuzl3ghWFnzq4piQTUbLoTx837zI+XbKjR8Bk8hNBghwLbejEKwTtU1Xpb+FohLG3a0akJawnORGy5dRx5lYhnn6d1n/ftEjOSE2qNjCPqndLCjROD4BzYv8gFTHQ9nNe9M7wQnWrF/x72jyJuRAswrGtpiuTo8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM5PR03MB2444; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2444; 31:SDrVOB8y+UHn33AwDtFivgHDSmoHkRaTXgD2HJaOWIoRcrIBwl1p8xAGwXRO9MIR5sCRU3w5XIC7UnSdD84O0Cg0Ou+SL6lv54t6xuug2hsWMVg5k5twWJnlTBCyMCj12pvdbpK02+dvcJjXEhE2RTeI5oH3VFRL71BmzTZKERDK9gOaDu3Ks6Wiv/gQkNwqkZNKFRDnJlkWxAe1HOgoVKoqRWoc5ma1Sc/AYEDO5P0=; 4:uo3PXsJny87XzFV56Izxfrs9jBBuP3Ex6BCBqcd/UE+9isPpb+lv8wNQS9aCvfYiNXq/gwjZka5S4TE+ksqHxY6NIdZniMyNclMMipaCRpyI7HUk9UQcT+uD32MDVnslrpx7n/w67BG5TiBwGyxchGOEJipee8xgiWpOuAF+JhQsP6mKcmBFhdLGhhSpt2OSaexrcJex47yYR7HRajSFkfmxuoh5zEQtoWlOtqD/nFzzb47FmevZX65VlrSacvZ5NvalzQZzDYaBjhgtTbjQ4H5AOHSrSP1p5hkvcLIUl3Br0DdwPrGNLsKtu4CyjNqeg6Hc/UFX5CXUQgpv1Ul58T6EH8Xj7GJlpAiCGpi1YIn6nBVI+cFzPnG1IVFY6ojusVEn8/mQoInM34KrOvFi7jrjjzTdrW+kOuAmTWiLB4XlNy9yE37KuFwiropZQuVCHfLD1n+j3znjrs6tzVmqi/sqjV2Nc4hOh32JkBpm3BaJLoghGIOqk4oRPSfN8FDsDEyARo0RawKZQ7aiPGAza6qhM3BdgYYNufBnyIkxMpo= 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)(8121501046)(5005006)(13015025)(13017025)(13024025)(13023025)(13018025)(10201501046)(3002001)(6055026); SRVR:DM5PR03MB2444; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2444; X-Forefront-PRVS: 0049B3F387 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2444; 23:Hshwp85sQIjRNFwrd5fiCQ//iaMvfE/8pFz53imx5?= =?us-ascii?Q?uvlIwbarhAOSG9oXlFSWlH53U3tsydvilHWvUTbWmuMXZZ4voy5ZyKU61PhG?= =?us-ascii?Q?DWOB8EF0/+1s/b3HniPBMzkLUQwg5XzMrnDJTf8IyeWkPdthetcKTZKyqCj0?= =?us-ascii?Q?ZcX3eC7W2ILQ4Uj/uT3e5GKUws5qIyxpdMjlRtHK614euHjRKxmMwmdTISze?= =?us-ascii?Q?GZQma9Kx8Swdjy8xHDwsi0F/OHqR1Pfn69Q6k0PNJIKGurio5NKfxt4avMRC?= =?us-ascii?Q?Br0JlN971COcyRueefYkIPAJVgDCvO0TwLbrvTg1Qe6JigQr0g1QWo8dseUg?= =?us-ascii?Q?2kwKw1Z4DkTG7ORchxXfeg7TspQwINx2GDQB/DcurLTJCBBj/rNKq/qJAirR?= =?us-ascii?Q?NH+HUNU2BKD36Sc2EEadFl6ownq27cGkSEh+XvzRo2KAgtpq994YbSrmrOrV?= =?us-ascii?Q?LBxkgbJLI+83z5fHifl1p0sZUWGGYKhT38mS2ZokFEKl0/C4WDzo5dorkhKt?= =?us-ascii?Q?ZXEYYzZJnuOEY7tDRl1XD0btZJaUJOHZMNsiFWmVYc8YVKRKiUkABapsfeFE?= =?us-ascii?Q?jNyPGIMgFMZalL0OI9XuLKig0ZqmrKBuUOqA7/5ZBLOYquK54tKodlkFexKO?= =?us-ascii?Q?vkKhCiOFOzN4ee9hMWK5eI8iv37NVYn+PpGifrKCAAEUMmTGFy2pReI4ze0J?= =?us-ascii?Q?bQw3O0TOv3iLiI4zvk1xjLnS+p5D3ZbyWOd7hR4tht/abNh+eJZ1O0Rwtoec?= =?us-ascii?Q?qjaMJb6EsdqV5Yl3S08wGwApKmHG0/+KLuEibr0SQCHnZwG3Cd4cX28CLtTT?= =?us-ascii?Q?9pO1STfJe8BfQ1FmWXBLpBOlMoXirRT4cW8AfUUbaMr7CkC++jGdHDyeFuqQ?= =?us-ascii?Q?Gowc/5hPGUEU7J+ftLxgL1+gpOyOuX6Lz5VhGWxIOXqKYlKULBz8wtfLDSDg?= =?us-ascii?Q?m3Qhh5LO+5xYpJxCk5lSKqdcxEk1GZztHW1jkEy0Bw8Kidq1443dchGjrT/t?= =?us-ascii?Q?SWKmUjCgX1lAN7HH+4B2iCOH+mB3Jrrk3uwNhtZwbZqPD1UzgAx4oxPRaQ16?= =?us-ascii?Q?Vy3pRq9R+dCZiqkR7t7lL5TTfwehs0KRKGdSyrbnQ18DIcaVQRQ8IKWzcGlS?= =?us-ascii?Q?ogAfPQYbmKtFFLOzIKn3CpDADNGRRRMQDpc0/J7v/GPPwpblStOAbxMdl23g?= =?us-ascii?Q?TYbsqRZQRx/Crg=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2444; 6:kSAJQUFeuoDRq5OzBlh2dpL8Uii+ReU6xGI2t8etrJXPI71KpbGd58VV3zgkSbM6y0aIKFwXAD9oCeqO6YqAnqTq0oZEpxqetZnP7e6PI8sA215Lbs0Yt+c8RCuK73fM9k7qDQ6Bmi2bHi8J80GF/4lUMd8IyqmGSUqRl9cZZS9SKMEPHS/0NWPjG8WDj69/msFiyCez4pLoQY+L7A/uLEfxANnn0lMpFUrgmOQxqeT7KpMpAnZ/jbRp+VxMn87jJJvegM0mkuEVxmCvEOGKEYbiLcAvKuxyAYe7hW+Yh5Y=; 5:tuC7/toCsHuOPzn99lXmaqZbgtTJpxO4SGTKL2NHjeDlPWixhTkS4FmZwf27irpZ/9sCtNFUMF8r/lR2Cc0k9k+bySK5F+bi8tIUp5pMkVLqbtrtEi76QL9nja4CcCcxn1MO8B9L/aKvJdlpdsal67DPjttqY7cXEoTLiWd+tZc=; 24:Cnf5D6XBjKOZnm4VAtTkcPKNvGGYz2oL3+rr14KO0tE8fcrLQFABgr9F1CatEWQpyjAvUPNXMoeDIzEiCF+lZMxpAaWkA8t2eO/sF1OixmM=; 7:9MguDFtMjoiMesrjjUQNAPEcHHddqen8kUlxcSRJCIR2XngG8zBdyZ2BAkI9+k2yBYF/lvcq+0IpFUfOu/2RliSpB6/B7mvkm+n2DdOe/u6qvtNQZhBBRX26rHHmK5WZM9jTL5dVhEXSocwOLQMVueeacbxftXIvH87+0mxWSdJDFNeHhQ4w0gstREx8eQ/70/Q/4IJkjR+t5QLHVe8f/xTdhMJ4RSE0GlgI+d1rPcPuFMeSa6k4mGjccuzj1S2m SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2016 06:01:35.0007 (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: DM5PR03MB2444 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160828_230157_652209_7C7DCE27 X-CRM114-Status: GOOD ( 14.67 ) 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, shawnguo@kernel.org, linux@armlinux.org.uk, 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 Let's rename the function imx6q_set_int_mem_clk_lpm() to imx6_set_int_mem_clk_lpm() since it's actually common for all i.MX6 SoCs. Signed-off-by: Anson Huang --- changes since V1: This is a new add patch to improve function name. arch/arm/mach-imx/common.h | 2 +- arch/arm/mach-imx/cpuidle-imx6q.c | 2 +- arch/arm/mach-imx/pm-imx6.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index bcca481..c4436d9 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -104,7 +104,7 @@ void imx_anatop_init(void); void imx_anatop_pre_suspend(void); void imx_anatop_post_resume(void); int imx6_set_lpm(enum mxc_cpu_pwr_mode mode); -void imx6q_set_int_mem_clk_lpm(bool enable); +void imx6_set_int_mem_clk_lpm(bool enable); void imx6sl_set_wait_clk(bool enter); int imx_mmdc_get_ddr_type(void); diff --git a/arch/arm/mach-imx/cpuidle-imx6q.c b/arch/arm/mach-imx/cpuidle-imx6q.c index db0f48c..bfeb25a 100644 --- a/arch/arm/mach-imx/cpuidle-imx6q.c +++ b/arch/arm/mach-imx/cpuidle-imx6q.c @@ -85,7 +85,7 @@ EXPORT_SYMBOL_GPL(imx6q_cpuidle_fec_irqs_unused); int __init imx6q_cpuidle_init(void) { /* Set INT_MEM_CLK_LPM bit to get a reliable WAIT mode support */ - imx6q_set_int_mem_clk_lpm(true); + imx6_set_int_mem_clk_lpm(true); return cpuidle_register(&imx6q_cpuidle_driver, NULL); } diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index 67bab74..70e5bfb 100644 --- a/arch/arm/mach-imx/pm-imx6.c +++ b/arch/arm/mach-imx/pm-imx6.c @@ -217,7 +217,7 @@ struct imx6_cpu_pm_info { u32 mmdc_io_val[MX6_MAX_MMDC_IO_NUM][2]; /* To save offset and value */ } __aligned(8); -void imx6q_set_int_mem_clk_lpm(bool enable) +void imx6_set_int_mem_clk_lpm(bool enable) { u32 val = readl_relaxed(ccm_base + CGPR); @@ -367,7 +367,7 @@ static int imx6q_pm_enter(suspend_state_t state) switch (state) { case PM_SUSPEND_STANDBY: imx6_set_lpm(STOP_POWER_ON); - imx6q_set_int_mem_clk_lpm(true); + imx6_set_int_mem_clk_lpm(true); imx_gpc_pre_suspend(false); if (cpu_is_imx6sl()) imx6sl_set_wait_clk(true); @@ -380,7 +380,7 @@ static int imx6q_pm_enter(suspend_state_t state) break; case PM_SUSPEND_MEM: imx6_set_lpm(STOP_POWER_OFF); - imx6q_set_int_mem_clk_lpm(false); + imx6_set_int_mem_clk_lpm(false); imx6q_enable_wb(true); /* * For suspend into ocram, asm code already take care of @@ -398,7 +398,7 @@ static int imx6q_pm_enter(suspend_state_t state) imx_gpc_post_resume(); imx6_enable_rbc(false); imx6q_enable_wb(false); - imx6q_set_int_mem_clk_lpm(true); + imx6_set_int_mem_clk_lpm(true); imx6_set_lpm(WAIT_CLOCKED); break; default: