From patchwork Fri Dec 14 20:00:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13608 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 23A0023E19 for ; Fri, 14 Dec 2012 20:01:15 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id A9B08A182DF for ; Fri, 14 Dec 2012 20:01:14 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so3432871iag.11 for ; Fri, 14 Dec 2012 12:01:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=DbIGNv+1zwhgwsCN9Bo2AdUjRg9IsfMyLXC7QZoZhMw=; b=pyvNWbur1bm0WOync3mAVjNqNOa4U3/vrxdzYxoBak4i9fOTXMZPwJl90KtEsKOMfO 6X7/6/+dvZ8nfLOgxjjPzvgvZX+bDmboIXE5NxUF692XbgNewUppmYfDVMaBRlmwxrib vN9rHUj2Lryx0Z42yGIMAxO2hM/aG3SB8oV/XHzroFIambgOoQd467bmiSg9+mcaHmcq 5y+yIjxQw5v923TPI3A2V8wfnSG9B8+Xbahy+3AON1UVDXqYlHB6TBgxHzGk+xxdlBPy hTQUgEhU3P2yN5UMzIXTkgQzZM5nrqWU93CUcjo31fU1cYe0DxsJ+0faI1AvnIIEIqaQ 6lng== Received: by 10.50.173.34 with SMTP id bh2mr2711792igc.70.1355515274126; Fri, 14 Dec 2012 12:01:14 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp93444igt; Fri, 14 Dec 2012 12:01:13 -0800 (PST) Received: by 10.14.173.65 with SMTP id u41mr17625903eel.13.1355515272624; Fri, 14 Dec 2012 12:01:12 -0800 (PST) Received: from eu1sys200aog109.obsmtp.com (eu1sys200aog109.obsmtp.com [207.126.144.127]) by mx.google.com with SMTP id l8si14461479eem.101.2012.12.14.12.00.52 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Dec 2012 12:01:12 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.127 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.127; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.127 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob109.postini.com ([207.126.147.11]) with SMTP ID DSNKUMuFdFpAVlJhX4QZiOhTrfMt2/o9//UQ@postini.com; Fri, 14 Dec 2012 20:01:12 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 6C65B223; Fri, 14 Dec 2012 20:00:38 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id E3F2F5570; Fri, 14 Dec 2012 20:00:37 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 10D0AA8074; Fri, 14 Dec 2012 21:00:30 +0100 (CET) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 14 Dec 2012 21:00:36 +0100 From: Linus Walleij To: , Cc: Stephen Warren , Anmar Oueja , Julien Delacou , Linus Walleij Subject: [PATCH v2] pinctrl: add sleep mode management Date: Fri, 14 Dec 2012 21:00:33 +0100 Message-ID: <1355515233-23663-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlzXSrSwHKQn19LU2GtIq+PJYUGfIBgQWi//Vw2wWRFPH1/mr+alJ/I+ztJ+rU3y/2LNAJa From: Julien Delacou This fix allows handling sleep mode for hogged pins in pinctrl. It provides functions to set pins to sleep/default configurations according to their current state. Signed-off-by: Julien Delacou Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Move function prototypes to the local pinctrl/core.h header file - Added exports --- drivers/pinctrl/core.c | 37 ++++++++++++++++++++++++++++++++++--- drivers/pinctrl/core.h | 7 +++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 5b4885c..3611753 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -1076,6 +1076,30 @@ void pinctrl_unregister_map(struct pinctrl_map const *map) } } +/** + * pinctrl_force_sleep() - turn a given controller device into sleep state + * @pctldev: pin controller device + */ +int pinctrl_force_sleep(struct pinctrl_dev *pctldev) +{ + if (!IS_ERR(pctldev->p) && !IS_ERR(pctldev->hog_sleep)) + return pinctrl_select_state(pctldev->p, pctldev->hog_sleep); + return 0; +} +EXPORT_SYMBOL_GPL(pinctrl_force_sleep); + +/** + * pinctrl_force_default() - turn a given controller device into default state + * @pctldev: pin controller device + */ +int pinctrl_force_default(struct pinctrl_dev *pctldev) +{ + if (!IS_ERR(pctldev->p) && !IS_ERR(pctldev->hog_default)) + return pinctrl_select_state(pctldev->p, pctldev->hog_default); + return 0; +} +EXPORT_SYMBOL_GPL(pinctrl_force_default); + #ifdef CONFIG_DEBUG_FS static int pinctrl_pins_show(struct seq_file *s, void *what) @@ -1521,16 +1545,23 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, pctldev->p = pinctrl_get_locked(pctldev->dev); if (!IS_ERR(pctldev->p)) { - struct pinctrl_state *s = + pctldev->hog_default = pinctrl_lookup_state_locked(pctldev->p, PINCTRL_STATE_DEFAULT); - if (IS_ERR(s)) { + if (IS_ERR(pctldev->hog_default)) { dev_dbg(dev, "failed to lookup the default state\n"); } else { - if (pinctrl_select_state_locked(pctldev->p, s)) + if (pinctrl_select_state_locked(pctldev->p, + pctldev->hog_default)) dev_err(dev, "failed to select default state\n"); } + + pctldev->hog_sleep = + pinctrl_lookup_state_locked(pctldev->p, + PINCTRL_STATE_SLEEP); + if (IS_ERR(pctldev->hog_sleep)) + dev_dbg(dev, "failed to lookup the sleep state\n"); } mutex_unlock(&pinctrl_mutex); diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h index 12f5694..232a9f6 100644 --- a/drivers/pinctrl/core.h +++ b/drivers/pinctrl/core.h @@ -30,6 +30,8 @@ struct pinctrl_gpio_range; * @driver_data: driver data for drivers registering to the pin controller * subsystem * @p: result of pinctrl_get() for this device + * @hog_default: default state for pins hogged by this device + * @hog_sleep: sleep state for pins hogged by this device * @device_root: debugfs root for this device */ struct pinctrl_dev { @@ -41,6 +43,8 @@ struct pinctrl_dev { struct module *owner; void *driver_data; struct pinctrl *p; + struct pinctrl_state *hog_default; + struct pinctrl_state *hog_sleep; #ifdef CONFIG_DEBUG_FS struct dentry *device_root; #endif @@ -164,5 +168,8 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps, bool dup, bool locked); void pinctrl_unregister_map(struct pinctrl_map const *map); +extern int pinctrl_force_sleep(struct pinctrl_dev *pctldev); +extern int pinctrl_force_default(struct pinctrl_dev *pctldev); + extern struct mutex pinctrl_mutex; extern struct list_head pinctrldev_list;