From: Mike Frysinger <vapier@gentoo.org>
To: linux-usb@vger.kernel.org, Felipe Balbi <felipe.balbi@nokia.com>
Cc: Cliff Cai <cliff.cai@analog.com>,
uclinux-dist-devel@blackfin.uclinux.org, stable@kernel.org,
stable-review@kernel.org, linux-kernel@vger.kernel.org,
Ian Jeffray <ian@jeffray.co.uk>
Subject: [PATCH] USB: musb: fix Blackfin building after power updates
Date: Sat, 22 May 2010 22:49:08 -0400 [thread overview]
Message-ID: <1274582948-11499-1-git-send-email-vapier@gentoo.org> (raw)
From: Ian Jeffray <ian@jeffray.co.uk>
The new MUSB power code needs musb_read_txhubport() to return a value (so
stub it as 0 like the other Blackfin hub funcs). It also needs new helper
functions for saving/restoring context, so change the apparently unused
musb_platform_{suspend,resume} to musb_platform_{save,restore}_context in
the Blackfin code.
Signed-off-by: Ian Jeffray <ian@jeffray.co.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
Note: this is for 2.6.34.x and 2.6.35
Note: i believe this is what we want, but Cliff is free to correct me ;)
drivers/usb/musb/blackfin.c | 12 ++++++++++++
drivers/usb/musb/musb_regs.h | 3 ++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index b611420..b5f1d17 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -392,6 +392,18 @@ int __init musb_platform_init(struct musb *musb, void *board_data)
return 0;
}
+#ifdef CONFIG_PM
+void musb_platform_save_context(struct musb *musb,
+ struct musb_context_registers *musb_context)
+{
+}
+
+void musb_platform_restore_context(struct musb *musb,
+ struct musb_context_registers *musb_context)
+{
+}
+#endif
+
int musb_platform_exit(struct musb *musb)
{
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index 2442675..5a727c5 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -633,8 +633,9 @@ static inline u8 musb_read_txhubaddr(void __iomem *mbase, u8 epnum)
return 0;
}
-static inline void musb_read_txhubport(void __iomem *mbase, u8 epnum)
+static inline u8 musb_read_txhubport(void __iomem *mbase, u8 epnum)
{
+ return 0;
}
#endif /* CONFIG_BLACKFIN */
--
1.7.1
next reply other threads:[~2010-05-23 2:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-23 2:49 Mike Frysinger [this message]
2010-05-23 8:42 ` Sergei Shtylyov
2010-05-23 8:49 ` Mike Frysinger
2010-05-24 18:50 ` [stable] " Greg KH
2010-05-24 18:52 ` [Uclinux-dist-devel] " Mike Frysinger
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=1274582948-11499-1-git-send-email-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=cliff.cai@analog.com \
--cc=felipe.balbi@nokia.com \
--cc=ian@jeffray.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=uclinux-dist-devel@blackfin.uclinux.org \
/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
all inboxes | Powered by JetHome®