From patchwork Mon Jan 16 06:45:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9518149 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 039D6601B7 for ; Mon, 16 Jan 2017 06:45:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1C4128386 for ; Mon, 16 Jan 2017 06:45:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6C5E2838C; Mon, 16 Jan 2017 06:45:54 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CCBA283CB for ; Mon, 16 Jan 2017 06:45:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751360AbdAPGpx (ORCPT ); Mon, 16 Jan 2017 01:45:53 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:59749 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751402AbdAPGpe (ORCPT ); Mon, 16 Jan 2017 01:45:34 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OJV007R81FUAI50@mailout1.w1.samsung.com>; Mon, 16 Jan 2017 06:45:30 +0000 (GMT) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170116064529eucas1p16019d23f76c5fc4845422fc01fb65593~aLZFxjc_30708307083eucas1p14; Mon, 16 Jan 2017 06:45:29 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1.samsung.com (EUCPMTA) with SMTP id A2.87.16908.C0C6C785; Mon, 16 Jan 2017 06:45:32 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170116064529eucas1p15b04f901b17dfa2b02fd04745cbe3f17~aLZFOE5s01339613396eucas1p1I; Mon, 16 Jan 2017 06:45:29 +0000 (GMT) X-AuditID: cbfec7ef-f79d26d00000420c-b6-587c6c0ca52f Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id B9.9B.06687.14C6C785; Mon, 16 Jan 2017 06:46:25 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OJV00BS81FJUN70@eusync2.samsung.com>; Mon, 16 Jan 2017 06:45:29 +0000 (GMT) From: Marek Szyprowski To: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Krzysztof Kozlowski , Linus Walleij , Tomasz Figa , Bartlomiej Zolnierkiewicz Subject: [PATCH 12/12] pinctrl: samsung: Replace syscore ops with standard platform device pm_ops Date: Mon, 16 Jan 2017 07:45:07 +0100 Message-id: <1484549107-5957-13-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1484549107-5957-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLIsWRmVeSWpSXmKPExsWy7djP87o8OTURBjsec1tsnLGe1eL8+Q3s FlP+LGey2PT4GqvF5vl/GC0+9x5htJhxfh+Txdojd9ktDr9pZ7VYtesPowOXx85Zd9k9Nq3q ZPO4c20Pm8fmJfUefVtWMXp83iQXwBbFZZOSmpNZllqkb5fAlXHwaBt7Qb96xZ17y1kaGM8p dDFyckgImEg87pzFBmGLSVy4tx7I5uIQEljGKPHp2AkWCOczo8T9L0fYYTrW7b/MCFfVefQK E4TTwCRx5fgBsCo2AUOJrrddYLNEBJoZJWbe3csO4jAL9DFJfN68lxGkSlggWeLU+j4mEJtF QFVi7f+XzF2MHBy8Ah4S/yd7Q6yTkzh5bDIriM0JFJ64rxXsJgmBfnaJJ9NnsoHUSwjISmw6 wAxR7yLReG0LlC0s8er4FqizZSQ6Ow4yQdj9jBJNrdoQ9gxGiXNveSFsa4nDxy+C7WIW4JOY tG06M8R4XomONiGIEg+JHW+3s0DYjhLLTm9gh3h+NqPErYbvzBMYZRYwMqxiFEktLc5NTy02 1CtOzC0uzUvXS87P3cQIjPTT/46/38H4tDnkEKMAB6MSD++CHdURQqyJZcWVuYcYJTiYlUR4 3TJrIoR4UxIrq1KL8uOLSnNSiw8xSnOwKInz7l1wJVxIID2xJDU7NbUgtQgmy8TBKdXAOPm6 OVe6xNrJLy5+bVy4t4DR5Y/j767TKS6ua+K+uV5k0s0U8f60wO3blJcuH2evTDJJyO1cn1M5 P6ndImpdz++nthuUnXd18d7TbONoP9v07IvF0Yhg7ykyswKf/bnMM3VH3TpBDkXGcvcwlxWG douVtF5qak/ZeLRXfPvdStO+nM+v5E1ClViKMxINtZiLihMB85le6/ACAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRmVeSWpSXmKPExsVy+t/xK7qOOTURBgfWsVpsnLGe1eL8+Q3s FlP+LGey2PT4GqvF5vl/GC0+9x5htJhxfh+Txdojd9ktDr9pZ7VYtesPowOXx85Zd9k9Nq3q ZPO4c20Pm8fmJfUefVtWMXp83iQXwBblZpORmpiSWqSQmpecn5KZl26rFBripmuhpJCXmJtq qxSh6xsSpKRQlphTCuQZGaABB+cA92AlfbsEt4yDR9vYC/rVK+7cW87SwHhOoYuRk0NCwERi 3f7LjBC2mMSFe+vZuhi5OIQEljBKtD3vYoZwmpgkunavYgapYhMwlOh62wVWJSLQzCjRsKQX zGEWmMAkMfNTAxNIlbBAssSp9X1gNouAqsTa/y+Bujk4eAU8JP5P9oZYJydx8thkVhCbEyg8 cV8rC4gtJOAuMePVVOYJjLwLGBlWMYqklhbnpucWG+oVJ+YWl+al6yXn525iBAb9tmM/N+9g vLQx+BCjAAejEg/vj13VEUKsiWXFlbmHGCU4mJVEeN0yayKEeFMSK6tSi/Lji0pzUosPMZoC 3TSRWUo0OR8YkXkl8YYmhuaWhkbGFhbmRkZK4rwlH66ECwmkJ5akZqemFqQWwfQxcXBKNTBO +KS4NSMy6na+4IeN1xKv2D2bfUHw9e1JxlvC7Rq7F02pPvJrzcEKjkt8YvkPkgQaVgYITy/8 rj3VxeHSqiyenBOH0rvXcf/UDcnr4G+uKvh69KiwlUd12kbhha4Mhkv/7g8K81TW1Ki4s7BC foFd0P3p6UtreBL2q0T8NG/dx218V8RLv0CJpTgj0VCLuag4EQC5nBShkAIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170116064529eucas1p15b04f901b17dfa2b02fd04745cbe3f17 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170116064529eucas1p15b04f901b17dfa2b02fd04745cbe3f17 X-RootMTR: 20170116064529eucas1p15b04f901b17dfa2b02fd04745cbe3f17 References: <1484549107-5957-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Once the dependency on PMU driver (for pad retention control) has been removed, there is no reason to use syscore_ops based suspend/resume. This patch replaces it with standard platform device pm_ops based solution. Signed-off-by: Marek Szyprowski Reviewed-by: Krzysztof Kozlowski --- drivers/pinctrl/samsung/pinctrl-samsung.c | 72 ++++++------------------------- 1 file changed, 13 insertions(+), 59 deletions(-) diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index 95a84086a2e9..48acf5908b84 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -29,7 +29,6 @@ #include #include #include -#include #include "../core.h" #include "pinctrl-samsung.h" @@ -49,9 +48,6 @@ { "samsung,pin-val", PINCFG_TYPE_DAT }, }; -/* Global list of devices (struct samsung_pinctrl_drv_data) */ -static LIST_HEAD(drvdata_list); - static unsigned int pin_base; static int samsung_get_group_count(struct pinctrl_dev *pctldev) @@ -1081,22 +1077,18 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) platform_set_drvdata(pdev, drvdata); - /* Add to the global list */ - list_add_tail(&drvdata->node, &drvdata_list); - return 0; } #ifdef CONFIG_PM - /** - * samsung_pinctrl_suspend_dev - save pinctrl state for suspend for a device + * samsung_pinctrl_suspend - save pinctrl state for suspend * * Save data for all banks handled by this device. */ -static void samsung_pinctrl_suspend_dev( - struct samsung_pinctrl_drv_data *drvdata) +static int samsung_pinctrl_suspend(struct device *dev) { + struct samsung_pinctrl_drv_data *drvdata = dev_get_drvdata(dev); int i; for (i = 0; i < drvdata->nr_banks; i++) { @@ -1133,15 +1125,17 @@ static void samsung_pinctrl_suspend_dev( if (drvdata->retention_ctrl && drvdata->retention_ctrl->on) drvdata->retention_ctrl->on(drvdata); + return 0; } /** - * samsung_pinctrl_resume_dev - restore pinctrl state from suspend for a device + * samsung_pinctrl_resume - restore pinctrl state from suspend * * Restore one of the banks that was saved during suspend. */ -static void samsung_pinctrl_resume_dev(struct samsung_pinctrl_drv_data *drvdata) +static int samsung_pinctrl_resume(struct device *dev) { + struct samsung_pinctrl_drv_data *drvdata = dev_get_drvdata(dev); int i; if (drvdata->resume) @@ -1180,48 +1174,10 @@ static void samsung_pinctrl_resume_dev(struct samsung_pinctrl_drv_data *drvdata) if (drvdata->retention_ctrl && drvdata->retention_ctrl->off) drvdata->retention_ctrl->off(drvdata); -} - -/** - * samsung_pinctrl_suspend - save pinctrl state for suspend - * - * Save data for all banks across all devices. - */ -static int samsung_pinctrl_suspend(void) -{ - struct samsung_pinctrl_drv_data *drvdata; - - list_for_each_entry(drvdata, &drvdata_list, node) { - samsung_pinctrl_suspend_dev(drvdata); - } - return 0; } - -/** - * samsung_pinctrl_resume - restore pinctrl state for suspend - * - * Restore data for all banks across all devices. - */ -static void samsung_pinctrl_resume(void) -{ - struct samsung_pinctrl_drv_data *drvdata; - - list_for_each_entry_reverse(drvdata, &drvdata_list, node) { - samsung_pinctrl_resume_dev(drvdata); - } -} - -#else -#define samsung_pinctrl_suspend NULL -#define samsung_pinctrl_resume NULL #endif -static struct syscore_ops samsung_pinctrl_syscore_ops = { - .suspend = samsung_pinctrl_suspend, - .resume = samsung_pinctrl_resume, -}; - static const struct of_device_id samsung_pinctrl_dt_match[] = { #ifdef CONFIG_PINCTRL_EXYNOS { .compatible = "samsung,exynos3250-pinctrl", @@ -1263,25 +1219,23 @@ static void samsung_pinctrl_resume(void) }; MODULE_DEVICE_TABLE(of, samsung_pinctrl_dt_match); +static const struct dev_pm_ops samsung_pinctrl_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(samsung_pinctrl_suspend, + samsung_pinctrl_resume) +}; + static struct platform_driver samsung_pinctrl_driver = { .probe = samsung_pinctrl_probe, .driver = { .name = "samsung-pinctrl", .of_match_table = samsung_pinctrl_dt_match, .suppress_bind_attrs = true, + .pm = &samsung_pinctrl_pm_ops, }, }; static int __init samsung_pinctrl_drv_register(void) { - /* - * Register syscore ops for save/restore of registers across suspend. - * It's important to ensure that this driver is running at an earlier - * initcall level than any arch-specific init calls that install syscore - * ops that turn off pad retention (like exynos_pm_resume). - */ - register_syscore_ops(&samsung_pinctrl_syscore_ops); - return platform_driver_register(&samsung_pinctrl_driver); } postcore_initcall(samsung_pinctrl_drv_register);