From patchwork Tue Jan 17 12:44:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 91633 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp470470qgi; Tue, 17 Jan 2017 04:46:18 -0800 (PST) X-Received: by 10.98.211.220 with SMTP id z89mr42734386pfk.3.1484657178636; Tue, 17 Jan 2017 04:46:18 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k63si8497668pfj.144.2017.01.17.04.46.18; Tue, 17 Jan 2017 04:46:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751243AbdAQMqQ (ORCPT + 4 others); Tue, 17 Jan 2017 07:46:16 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:10134 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750995AbdAQMqE (ORCPT ); Tue, 17 Jan 2017 07:46:04 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OJX0042DCR08K70@mailout1.w1.samsung.com>; Tue, 17 Jan 2017 12:45:03 +0000 (GMT) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170117124502eucas1p13653b5e70e7b281465aea7dbed4acca0~aj8TJnhpR2980229802eucas1p1b; Tue, 17 Jan 2017 12:45:02 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges4.samsung.com (EUCPMTA) with SMTP id E8.EB.28517.EC11E785; Tue, 17 Jan 2017 12:45:02 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170117124501eucas1p2ab3ec2a1dee18486878733826037d071~aj8SkrloW2594725947eucas1p2R; Tue, 17 Jan 2017 12:45:01 +0000 (GMT) X-AuditID: cbfec7f4-f79716d000006f65-cb-587e11ce61b0 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 98.E4.10233.8C11E785; Tue, 17 Jan 2017 12:44:56 +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 <0OJX00GNRCQPHB20@eusync2.samsung.com>; Tue, 17 Jan 2017 12:45:01 +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 v2 10/13] pinctrl: samsung: Add infrastructure for pin-bank retention control Date: Tue, 17 Jan 2017 13:44:41 +0100 Message-id: <1484657084-26227-11-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1484657084-26227-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNIsWRmVeSWpSXmKPExsWy7djP87rnBOsiDKYeELTYOGM9q8X58xvY Lab8Wc5ksenxNVaLzfP/MFp87j3CaDHj/D4mi7VH7rJbHH7TzmqxatcfRgcuj52z7rJ7bFrV yeZx59oeNo/NS+o9+rasYvT4vEkugC2KyyYlNSezLLVI3y6BK6OpZzNrwUX1ii07tjA1MLYp djFyckgImEic+fGbBcIWk7hwbz1bFyMXh5DAUkaJzub3rBDOZ0aJGZ9eMcJ0nGo/yQyRWMYo sXvjFqiqBiaJXdd+sINUsQkYSnS97QKbJSLQzCgx8+5edhCHWaCPSeLz5r1Aszg4hAXiJRZ+ TABpYBFQlbhz+zlYM6+Ap8SjhQuZIdbJSZw8NpkVxOYEiv/4uZ4JIt7PLtGw1hNkjISArMSm A8wQpovEv/fcEBXCEq+Ob2GHsGUkLk/uhnqzn1GiqVUbwp7BKHHuLS+EbS1x+PhFsE3MAnwS k7ZNhxrJK9HRJgRR4iHx9fwFqAMcJfZPXswI8focRokFXzazTGCUWcDIsIpRJLW0ODc9tdhE rzgxt7g0L10vOT93EyMwyk//O/5lB+PiY1aHGAU4GJV4eGfcrYkQYk0sK67MPcQowcGsJMI7 V6AuQog3JbGyKrUoP76oNCe1+BCjNAeLkjjvngVXwoUE0hNLUrNTUwtSi2CyTBycUg2MpltC D27JXf4saMFJkUeCK5gzGF4pfTP6+VxfQv1vdG2KpWjK5odrrJpP/FrMfmxbs7OPdKtI/ubc KZJ6rlOnTlXeyrZBIyZVtP+hO1Os3y2fs+vmlEwRPOm2ekrIk66uf6I1/y52ZpxlOnlYdXOf j4z73oaSv7NW96y803jyVU++7/9Nly7YKLEUZyQaajEXFScCAIh6x9nuAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRmVeSWpSXmKPExsVy+t/xK7onBOsiDCbMEbXYOGM9q8X58xvY Lab8Wc5ksenxNVaLzfP/MFp87j3CaDHj/D4mi7VH7rJbHH7TzmqxatcfRgcuj52z7rJ7bFrV yeZx59oeNo/NS+o9+rasYvT4vEkugC3KzSYjNTEltUghNS85PyUzL91WKTTETddCSSEvMTfV VilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJbhlNPZtZCy6qV2zZsYWpgbFNsYuRk0NCwETi VPtJZghbTOLCvfVsXYxcHEICSxglDnXugnKamCRunN/BDlLFJmAo0fW2CywhItDMKNGwpBfM YRaYwCQx81MDUxcjB4ewQLzEwo8JIA0sAqoSd24/B2vmFfCUeLRwIdQ6OYmTxyazgticQPEf P9czgdhCAh4S5+/vY53AyLuAkWEVo0hqaXFuem6xkV5xYm5xaV66XnJ+7iZGYNBvO/Zzyw7G rnfBhxgFOBiVeHidbtdECLEmlhVX5h5ilOBgVhLhnStQFyHEm5JYWZValB9fVJqTWnyI0RTo qInMUqLJ+cCIzCuJNzQxNLc0NDK2sDA3MlIS55364Uq4kEB6YklqdmpqQWoRTB8TB6dUA2Pa Qtmr686mXw2akPU68bBgg/eKq/0C3LtCmzaaGU8LqVmfZOn26LGeysE/HewXJ3hWLp0ndn1i 5oITB+LOfzQ/dsvTS5P7ZJEyl/YCrzyJAj3OzTufbX+YJzwn+9rGfzyrTS0U3k37L/wxxWDF ZIPg0w0Lrh3//fLVzqeOKhsb/r/cznrIw/qJEktxRqKhFnNRcSIAdSUtR5ACAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170117124501eucas1p2ab3ec2a1dee18486878733826037d071 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1BSam?= =?utf-8?q?sung_Electronics=1BSenior_Software_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BEHQ=1BC10CD02CD027392?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170117124501eucas1p2ab3ec2a1dee18486878733826037d071 X-RootMTR: 20170117124501eucas1p2ab3ec2a1dee18486878733826037d071 References: <1484657084-26227-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 Pad retention control after suspend/resume cycle should be done from pin controller driver instead of PMU (power management unit) driver to avoid possible ordering and logical dependencies. Till now it worked fine only because PMU driver registered its sys_ops after pin controller. This patch adds infrastructure to handle pad retention during pin control driver resume. Signed-off-by: Marek Szyprowski Reviewed-by: Krzysztof Kozlowski --- drivers/pinctrl/samsung/pinctrl-samsung.c | 12 +++++++++ drivers/pinctrl/samsung/pinctrl-samsung.h | 42 +++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index 59f99ea7e65b..021abd7221f8 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -1060,6 +1060,13 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) if (res) drvdata->irq = res->start; + if (ctrl->retention_data) { + drvdata->retention_ctrl = ctrl->retention_data->init(drvdata, + ctrl->retention_data); + if (IS_ERR(drvdata->retention_ctrl)) + return PTR_ERR(drvdata->retention_ctrl); + } + ret = samsung_gpiolib_register(pdev, drvdata); if (ret) return ret; @@ -1126,6 +1133,8 @@ static void samsung_pinctrl_suspend_dev( if (drvdata->suspend) drvdata->suspend(drvdata); + if (drvdata->retention_ctrl && drvdata->retention_ctrl->enable) + drvdata->retention_ctrl->enable(drvdata); } /** @@ -1173,6 +1182,9 @@ static void samsung_pinctrl_resume_dev(struct samsung_pinctrl_drv_data *drvdata) if (widths[type]) writel(bank->pm_save[type], reg + offs[type]); } + + if (drvdata->retention_ctrl && drvdata->retention_ctrl->disable) + drvdata->retention_ctrl->disable(drvdata); } /** diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.h b/drivers/pinctrl/samsung/pinctrl-samsung.h index 6f7ce7539a00..5ebbf4137a06 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.h +++ b/drivers/pinctrl/samsung/pinctrl-samsung.h @@ -185,10 +185,48 @@ struct samsung_pin_bank { }; /** + * struct samsung_retention_data: runtime pin-bank retention control data. + * @regs: array of PMU registers to control pad retention. + * @nr_regs: number of registers in @regs array. + * @value: value to store to registers to turn off retention. + * @refcnt: atomic counter if retention control affects more than one bank. + * @priv: retention control code private data + * @on: platform specific callback to enter retention mode. + * @off: platform specific callback to exit retention mode. + **/ +struct samsung_retention_ctrl { + const u32 *regs; + int nr_regs; + u32 value; + atomic_t *refcnt; + void *priv; + void (*enable)(struct samsung_pinctrl_drv_data *); + void (*disable)(struct samsung_pinctrl_drv_data *); +}; + +/** + * struct samsung_retention_data: represent a pin-bank retention control data. + * @regs: array of PMU registers to control pad retention. + * @nr_regs: number of registers in @regs array. + * @value: value to store to registers to turn off retention. + * @refcnt: atomic counter if retention control affects more than one bank. + * @init: platform specific callback to initialize retention control. + **/ +struct samsung_retention_data { + const u32 *regs; + int nr_regs; + u32 value; + atomic_t *refcnt; + struct samsung_retention_ctrl *(*init)(struct samsung_pinctrl_drv_data *, + const struct samsung_retention_data *); +}; + +/** * struct samsung_pin_ctrl: represent a pin controller. * @pin_banks: list of pin banks included in this controller. * @nr_banks: number of pin banks. * @nr_ext_resources: number of the extra base address for pin banks. + * @retention_data: configuration data for retention control. * @eint_gpio_init: platform specific callback to setup the external gpio * interrupts for the controller. * @eint_wkup_init: platform specific callback to setup the external wakeup @@ -198,6 +236,7 @@ struct samsung_pin_ctrl { const struct samsung_pin_bank_data *pin_banks; u32 nr_banks; int nr_ext_resources; + const struct samsung_retention_data *retention_data; int (*eint_gpio_init)(struct samsung_pinctrl_drv_data *); int (*eint_wkup_init)(struct samsung_pinctrl_drv_data *); @@ -219,6 +258,7 @@ struct samsung_pin_ctrl { * @nr_function: number of such pin functions. * @pin_base: starting system wide pin number. * @nr_pins: number of pins supported by the controller. + * @retention_ctrl: retention control runtime data. */ struct samsung_pinctrl_drv_data { struct list_head node; @@ -238,6 +278,8 @@ struct samsung_pinctrl_drv_data { unsigned int pin_base; unsigned int nr_pins; + const struct samsung_retention_ctrl *retention_ctrl; + void (*suspend)(struct samsung_pinctrl_drv_data *); void (*resume)(struct samsung_pinctrl_drv_data *); };