Title: [8766] trunk/drivers/usb/musb: [#6038] USB: musb: fix Blackfin building after power updates
- Revision
- 8766
- Author
- vapier
- Date
- 2010-05-22 22:38:45 -0400 (Sat, 22 May 2010)
Log Message
[#6038] USB: musb: fix Blackfin building after power updates
From: Ian Jeffray <[email protected]>
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.
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/blackfin.c (8765 => 8766)
--- trunk/drivers/usb/musb/blackfin.c 2010-05-23 02:22:54 UTC (rev 8765)
+++ trunk/drivers/usb/musb/blackfin.c 2010-05-23 02:38:45 UTC (rev 8766)
@@ -396,23 +396,23 @@
return 0;
}
-int musb_platform_suspend(struct musb *musb)
+#ifdef CONFIG_PM
+void musb_platform_save_context(struct musb *musb,
+ struct musb_context_registers *musb_context)
{
- return 0;
}
-int musb_platform_resume(struct musb *musb)
+void musb_platform_restore_context(struct musb *musb,
+ struct musb_context_registers *musb_context)
{
- return 0;
}
+#endif
-
int musb_platform_exit(struct musb *musb)
{
bfin_vbus_power(musb, 0 /*off*/, 1);
gpio_free(musb->config->gpio_vrsel);
- musb_platform_suspend(musb);
return 0;
}
Modified: trunk/drivers/usb/musb/musb_regs.h (8765 => 8766)
--- trunk/drivers/usb/musb/musb_regs.h 2010-05-23 02:22:54 UTC (rev 8765)
+++ trunk/drivers/usb/musb/musb_regs.h 2010-05-23 02:38:45 UTC (rev 8766)
@@ -623,8 +623,9 @@
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 */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
