From patchwork Thu Apr 12 03:53:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J, KEERTHY" X-Patchwork-Id: 10337855 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 81C96603B5 for ; Thu, 12 Apr 2018 03:59:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70F85285AB for ; Thu, 12 Apr 2018 03:59:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62521285AF; Thu, 12 Apr 2018 03:59:58 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 94CFD285A7 for ; Thu, 12 Apr 2018 03:59:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V2c1pZBzTH56vI2Vpbpn06/lMFrEYy3g7n3xDoCxAgw=; b=SJhijLCTYLcnDu PYEXA6scrKWgaZL/4CZinyW5UxBfrJo/T2ozgQkrFmG01F0R56A55mpreCGxtv+5rlfrJbZAlju/8 PreKONAT+uBcPV1EqiAK/EIfDH461ek0ZBZkpJPJvbh4A6I81UIycg7PZ8d6Vk7Yz1tmCcg+twT5S zIgsSpdJK5JaZmmhDuvbHhZofk/EqhwB2Yo7CRe1awfqe9juqQnMOcpwQXbDGioJmvO8QqGEkVMuF KY7dyUwl1nEopjMYNxXEGAlwmzcEpe9kYh5ePO0TUNdw8kJ5foYeAMLWfsvo/a7MkR9CXwo2IT4Q8 AA7KkH2sE0utSW2/ln3w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6TOl-0002sC-Tj; Thu, 12 Apr 2018 03:59:47 +0000 Received: from fllnx210.ext.ti.com ([198.47.19.17]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6TKJ-0007oP-CW for linux-arm-kernel@lists.infradead.org; Thu, 12 Apr 2018 03:55:14 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id w3C3t0Ue017597; Wed, 11 Apr 2018 22:55:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1523505300; bh=AOaaDoe5SM6ZKpposFzVCP+iUZVLkj3pA0XhktE1mJ4=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=iWgJs+ZFKkzB46caEWeVsJ/1nIgvFK9AKchfR+sS8t0/ixA3XHUzH0LBsJupWeRSa MvoL8FopUyJg2+o3cqI+Wf84F4odDpUzRei5F+KnjaGkuEEorQ8t7ByCmlZGCAF4js YVLJdMPX9SHox+Z8gAZ3//w3jHnKMArXzR/Pwfvk= Received: from DLEE106.ent.ti.com (dlee106.ent.ti.com [157.170.170.36]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w3C3t0sS026366; Wed, 11 Apr 2018 22:55:00 -0500 Received: from DLEE115.ent.ti.com (157.170.170.26) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Wed, 11 Apr 2018 22:55:00 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Wed, 11 Apr 2018 22:55:00 -0500 Received: from ula0393675.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w3C3sQpp010150; Wed, 11 Apr 2018 22:54:56 -0500 From: Keerthy To: , , Subject: [PATCH 08/14] ARM: OMAP2: Add functions to save and restore pinctrl context. Date: Thu, 12 Apr 2018 09:23:53 +0530 Message-ID: <1523505239-16229-9-git-send-email-j-keerthy@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1523505239-16229-1-git-send-email-j-keerthy@ti.com> References: <1523505239-16229-1-git-send-email-j-keerthy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180411_205511_627673_E449F750 X-CRM114-Status: GOOD ( 22.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: d-gerlach@ti.com, Russ Dill , j-keerthy@ti.com, linux-kernel@vger.kernel.org, t-kristo@ti.com, Russ.Dill@ti.com, haojian.zhuang@linaro.org, ssantosh@kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 From: Russ Dill This adds a pair of context save/restore functions to save/restore the state of a set of pinctrl registers. This simplifies some of the AM33XX PM code as some of the pinctrl registers are lost when the per power domain loses power. The pincrtl code can perform the necessary save/restore. This will also be necessary for hibernation and RTC only sleep, as all pinctrl registers all lost. Signed-off-by: Russ Dill Signed-off-by: Keerthy --- drivers/pinctrl/core.c | 1 + drivers/pinctrl/core.h | 1 - drivers/pinctrl/pinctrl-single.c | 50 ++++++++++++++++++++++++++++++++++++++++ drivers/pinctrl/pinmux.c | 22 ++++++++++++++++++ include/linux/pinctrl/pinctrl.h | 7 ++++++ include/linux/pinctrl/pinmux.h | 16 +++++++++++++ 6 files changed, 96 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index e5a3030..1a9ae64 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -119,6 +119,7 @@ struct pinctrl_dev *get_pinctrl_dev_from_devname(const char *devname) return NULL; } +EXPORT_SYMBOL_GPL(get_pinctrl_dev_from_devname); struct pinctrl_dev *get_pinctrl_dev_from_of_node(struct device_node *np) { diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h index 8cf2eba..e587c29 100644 --- a/drivers/pinctrl/core.h +++ b/drivers/pinctrl/core.h @@ -226,7 +226,6 @@ int pinctrl_generic_remove_group(struct pinctrl_dev *pctldev, #endif /* CONFIG_GENERIC_PINCTRL_GROUPS */ -struct pinctrl_dev *get_pinctrl_dev_from_devname(const char *dev_name); struct pinctrl_dev *get_pinctrl_dev_from_of_node(struct device_node *np); int pin_get_from_name(struct pinctrl_dev *pctldev, const char *name); const char *pin_get_name(struct pinctrl_dev *pctldev, const unsigned pin); diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index a7c5eb3..2fc3317 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -144,6 +144,7 @@ struct pcs_soc_data { * struct pcs_device - pinctrl device instance * @res: resources * @base: virtual address of the controller + * @saved_vals: saved values for the controller * @size: size of the ioremapped area * @dev: device entry * @np: device tree node @@ -172,6 +173,7 @@ struct pcs_soc_data { struct pcs_device { struct resource *res; void __iomem *base; + void *saved_vals; unsigned size; struct device *dev; struct device_node *np; @@ -372,6 +374,52 @@ static int pcs_set_mux(struct pinctrl_dev *pctldev, unsigned fselector, return 0; } +static int pcs_save_context(struct pinctrl_dev *pctldev) +{ + struct pcs_device *pcs; + int i; + + pcs = pinctrl_dev_get_drvdata(pctldev); + + if (!pcs->saved_vals) + pcs->saved_vals = devm_kzalloc(pcs->dev, pcs->size, GFP_ATOMIC); + + switch (pcs->width) { + case 32: + for (i = 0; i < pcs->size; i += 4) + *(u32 *)(pcs->saved_vals + i) = + pcs->read(pcs->base + i); + break; + case 16: + for (i = 0; i < pcs->size; i += 2) + *(u16 *)(pcs->saved_vals + i) = + pcs->read(pcs->base + i); + break; + } + return 0; +} + +static void pcs_restore_context(struct pinctrl_dev *pctldev) +{ + struct pcs_device *pcs; + int i; + + pcs = pinctrl_dev_get_drvdata(pctldev); + + switch (pcs->width) { + case 32: + for (i = 0; i < pcs->size; i += 4) + pcs->write(*(u32 *)(pcs->saved_vals + i), + pcs->base + i); + break; + case 16: + for (i = 0; i < pcs->size; i += 2) + pcs->write(*(u16 *)(pcs->saved_vals + i), + pcs->base + i); + break; + } +} + static int pcs_request_gpio(struct pinctrl_dev *pctldev, struct pinctrl_gpio_range *range, unsigned pin) { @@ -420,6 +468,8 @@ static int pcs_request_gpio(struct pinctrl_dev *pctldev, .get_function_name = pinmux_generic_get_function_name, .get_function_groups = pinmux_generic_get_function_groups, .set_mux = pcs_set_mux, + .save_context = pcs_save_context, + .restore_context = pcs_restore_context, .gpio_request_enable = pcs_request_gpio, }; diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index b8e9bda..b144e0d 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -312,6 +312,28 @@ static int pinmux_func_name_to_selector(struct pinctrl_dev *pctldev, return -EINVAL; } +int pinmux_save_context(struct pinctrl_dev *pctldev, const char *function) +{ + const struct pinmux_ops *pmxops = pctldev->desc->pmxops; + + if (!pmxops || !pmxops->save_context) + return -EINVAL; + + return pmxops->save_context(pctldev); +} +EXPORT_SYMBOL(pinmux_save_context); + +void pinmux_restore_context(struct pinctrl_dev *pctldev, const char *function) +{ + const struct pinmux_ops *pmxops = pctldev->desc->pmxops; + + if (!pmxops || !pmxops->restore_context) + return; + + pmxops->restore_context(pctldev); +} +EXPORT_SYMBOL(pinmux_restore_context); + int pinmux_map_to_setting(const struct pinctrl_map *map, struct pinctrl_setting *setting) { diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h index 8f5dbb8..c523593 100644 --- a/include/linux/pinctrl/pinctrl.h +++ b/include/linux/pinctrl/pinctrl.h @@ -198,6 +198,7 @@ struct pinctrl_dev *of_pinctrl_get(struct device_node *np) extern const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev); extern const char *pinctrl_dev_get_devname(struct pinctrl_dev *pctldev); extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev); +extern struct pinctrl_dev *get_pinctrl_dev_from_devname(const char *dev_name); #else struct pinctrl_dev; @@ -208,6 +209,12 @@ static inline bool pin_is_valid(struct pinctrl_dev *pctldev, int pin) return pin >= 0; } +static inline struct pinctrl_dev *get_pinctrl_dev_from_devname( + const char *dev_name) +{ + return NULL; +} + #endif /* !CONFIG_PINCTRL */ #endif /* __LINUX_PINCTRL_PINCTRL_H */ diff --git a/include/linux/pinctrl/pinmux.h b/include/linux/pinctrl/pinmux.h index ace60d7..f837b8f 100644 --- a/include/linux/pinctrl/pinmux.h +++ b/include/linux/pinctrl/pinmux.h @@ -75,6 +75,8 @@ struct pinmux_ops { int (*gpio_request_enable) (struct pinctrl_dev *pctldev, struct pinctrl_gpio_range *range, unsigned offset); + int (*save_context)(struct pinctrl_dev *pctldev); + void (*restore_context)(struct pinctrl_dev *pctldev); void (*gpio_disable_free) (struct pinctrl_dev *pctldev, struct pinctrl_gpio_range *range, unsigned offset); @@ -85,6 +87,20 @@ struct pinmux_ops { bool strict; }; +int pinmux_save_context(struct pinctrl_dev *pctldev, const char *function); +void pinmux_restore_context(struct pinctrl_dev *pctldev, const char *function); + +#else /* !CONFIG_PINMUX */ + +static inline int pinmux_save_context(struct pinctrl_dev *pctldev, + const char *function) +{ + return 0; +} + +static inline void pinmux_restore_context(struct pinctrl_dev *pctldev, + const char *function) {} + #endif /* CONFIG_PINMUX */ #endif /* __LINUX_PINCTRL_PINMUX_H */