linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Mack <zonque@gmail.com>
To: linux-usb@vger.kernel.org
Cc: linux-omap@vger.kernel.org, neumann@teufel.de,
	bigeasy@linutronix.de, vinod.koul@intel.com,
	dan.j.williams@intel.com, balbi@ti.com,
	Daniel Mack <zonque@gmail.com>
Subject: [PATCH v3 2/5] usb: musb: conditionally save and restore the context on suspend
Date: Fri, 18 Oct 2013 11:39:32 +0200	[thread overview]
Message-ID: <1382089175-13487-3-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1382089175-13487-1-git-send-email-zonque@gmail.com>

It appears not all platforms featuring a musb core need to save the musb
core registers at suspend time and restore them on resume.

The dsps platform does, however. So add a bit in struct
musb_hdrc_platform_data to let platforms specify their need of such
action being taken.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 drivers/usb/musb/musb_core.c | 17 ++++++++++++++++-
 include/linux/usb/musb.h     |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index e5ad77d..fea6ecd 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2200,6 +2200,7 @@ static int musb_suspend(struct device *dev)
 {
 	struct musb	*musb = dev_to_musb(dev);
 	unsigned long	flags;
+	struct musb_hdrc_platform_data *plat = dev_get_platdata(dev);
 
 	spin_lock_irqsave(&musb->lock, flags);
 
@@ -2213,16 +2214,30 @@ static int musb_suspend(struct device *dev)
 		 */
 	}
 
+	if (plat->restore_after_suspend)
+		musb_save_context(musb);
+
 	spin_unlock_irqrestore(&musb->lock, flags);
 	return 0;
 }
 
 static int musb_resume_noirq(struct device *dev)
 {
-	/* for static cmos like DaVinci, register values were preserved
+	struct musb	*musb = dev_to_musb(dev);
+	struct musb_hdrc_platform_data *plat = dev_get_platdata(dev);
+
+	/*
+	 * For static cmos like DaVinci, register values were preserved
 	 * unless for some reason the whole soc powered down or the USB
 	 * module got reset through the PSC (vs just being disabled).
+	 *
+	 * The plaform data tells us about the necessity of saving and
+	 * restoring the context across a suspend cycle.
 	 */
+
+	if (plat->restore_after_suspend)
+		musb_restore_context(musb);
+
 	return 0;
 }
 
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index 053c268..296be6c 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -100,6 +100,7 @@ struct musb_hdrc_platform_data {
 	u8		mode;
 
 	u8		has_mailbox:1;
+	u8		restore_after_suspend:1;
 
 	/* for clk_get() */
 	const char	*clock;
-- 
1.8.3.1


  parent reply	other threads:[~2013-10-18  9:39 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-18  9:39 [PATCH v3 0/5] usb: musb_dsps: support for suspend and resume Daniel Mack
2013-10-18  9:39 ` [PATCH v3 1/5] usb: musb: call musb_port_suspend from musb_bus_suspend Daniel Mack
2013-10-18  9:39 ` Daniel Mack [this message]
2013-10-18  9:39 ` [PATCH v3 3/5] usb: musb: dsps: add {tx,rx}_mode to wrapper Daniel Mack
2013-10-18  9:39 ` [PATCH v3 4/5] usb: musb: dsps: add support for suspend and resume Daniel Mack
2013-10-18  9:58   ` Sebastian Andrzej Siewior
     [not found]     ` <52610643.1000607-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-10-18 10:00       ` Daniel Mack
     [not found] ` <1382089175-13487-1-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-10-18  9:39   ` [PATCH v3 5/5] usb: musb: dsps: indentation and whitespace fixes Daniel Mack
2013-10-18  9:59   ` [PATCH v3 0/5] usb: musb_dsps: support for suspend and resume Sebastian Andrzej Siewior
     [not found]     ` <52610696.7020900-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-10-18 10:02       ` Daniel Mack
2013-10-18 10:05         ` Sebastian Andrzej Siewior
2013-10-28 11:06       ` Daniel Mack

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=1382089175-13487-3-git-send-email-zonque@gmail.com \
    --to=zonque@gmail.com \
    --cc=balbi@ti.com \
    --cc=bigeasy@linutronix.de \
    --cc=dan.j.williams@intel.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=neumann@teufel.de \
    --cc=vinod.koul@intel.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).