From: Steve deRosier <derosier@gmail.com>
To: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: ath6kl@lists.infradead.org, linux-wireless@vger.kernel.org,
Julian Calaby <julian.calaby@gmail.com>,
Steve deRosier <steve.derosier@lairdtech.com>
Subject: [PATCH v3 2/2] ath6kl_sdio: Add power gpio reset feature into sdio driver for suspend
Date: Sun, 22 Nov 2015 16:15:47 -0800 [thread overview]
Message-ID: <1448237747-20037-3-git-send-email-steve.derosier@lairdtech.com> (raw)
In-Reply-To: <1448237747-20037-1-git-send-email-steve.derosier@lairdtech.com>
This change adds pm suspend callbacks in order to trigger a gpio line
to push the CHIP_PWD_L reset/power line low on suspend. This puts the chip
into the lowest power state on suspend. On resume, it releases the line,
allowing the chip to boot. Slower, but provides a clean reset of the
chip and recovery from standby.
Signed-off-by: Steve deRosier <steve.derosier@lairdtech.com>
---
drivers/net/wireless/ath/ath6kl/sdio.c | 40 ++++++++++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index d06aa41..cef311d 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -1295,8 +1295,44 @@ static int ath6kl_sdio_pm_resume(struct device *device)
return 0;
}
-static SIMPLE_DEV_PM_OPS(ath6kl_sdio_pm_ops, ath6kl_sdio_pm_suspend,
- ath6kl_sdio_pm_resume);
+/* Below handlers leverage the PM system to make sure we turn on and off
+ * the power gpio at the right time. If we do it in the earlier power on
+ * and off handlers for the sdio, we get errors from the mmc subsystem.
+ */
+static int ath6kl_sdio_pm_suspend_late(struct device *device)
+{
+ ath6kl_dbg(ATH6KL_DBG_SUSPEND, "sdio pm ath6kl_sdio_pm_suspend_late\n");
+
+ if (gpio_is_valid(reset_pwd_gpio))
+ gpio_set_value(reset_pwd_gpio, 0);
+
+ return 0;
+}
+
+static int ath6kl_sdio_pm_resume_early(struct device *device)
+{
+ ath6kl_dbg(ATH6KL_DBG_SUSPEND, "sdio pm ath6kl_sdio_pm_resume_early\n");
+
+ if (gpio_is_valid(reset_pwd_gpio)) {
+ gpio_set_value(reset_pwd_gpio, 1);
+ usleep_range(1000, 5000); /* wait for power up */
+ }
+ return 0;
+}
+
+/* The GPIO version requires the more complex dev_pm_ops setup */
+const struct dev_pm_ops ath6kl_sdio_pm_ops = {
+ .suspend = ath6kl_sdio_pm_suspend,
+ .suspend_late = ath6kl_sdio_pm_suspend_late,
+ .resume_early = ath6kl_sdio_pm_resume_early,
+ .resume = ath6kl_sdio_pm_resume,
+ .freeze = ath6kl_sdio_pm_suspend,
+ .thaw = ath6kl_sdio_pm_resume,
+ .poweroff = ath6kl_sdio_pm_suspend,
+ .poweroff_late = ath6kl_sdio_pm_suspend_late,
+ .restore_early = ath6kl_sdio_pm_resume_early,
+ .restore = ath6kl_sdio_pm_resume,
+};
#define ATH6KL_SDIO_PM_OPS (&ath6kl_sdio_pm_ops)
--
1.9.1
prev parent reply other threads:[~2015-11-23 0:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-23 0:15 [PATCH v3 0/2] ath6kl_sdio: add control of CHIP_PWD_L via GPIO Steve deRosier
2015-11-23 0:15 ` [PATCH v3 1/2] ath6kl_sdio: Add reset gpio module parameter for CHIP_PWD_L pin Steve deRosier
2015-12-01 13:01 ` Kalle Valo
2015-12-06 0:19 ` kbuild test robot
2015-11-23 0:15 ` Steve deRosier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448237747-20037-3-git-send-email-steve.derosier@lairdtech.com \
--to=derosier@gmail.com \
--cc=ath6kl@lists.infradead.org \
--cc=julian.calaby@gmail.com \
--cc=kvalo@qca.qualcomm.com \
--cc=linux-wireless@vger.kernel.org \
--cc=steve.derosier@lairdtech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).