aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHema HK <hemahk@ti.com>2011-02-28 03:49:33 -0500
committerFelipe Balbi <balbi@ti.com>2011-03-01 04:35:11 -0500
commitda68ccec210c45eb99e461ad31b499b4e7043c41 (patch)
treecd86514205d9348b4a3c2fdda5d1ef2ce44cd3b1
parent4cbbf084436caddeb815534df4ebaa018c970196 (diff)
usb: musb: Remove platform context save/restore API
For OMAP3 and OMAP4 for offmode and retention support, musb sysconfig is configured to force idle and standby with ENABLE_FORCE bit of OTG_FORCESTNDBY set. And on wakeup configure to no ilde/standby with resetting the ENABLE_FORCE bit. There is not need to save and restore of this register anymore so removed omap2430_save_context/omap2430_restore_context functions. and also removed otg_forcestandby member of musb_context_registers structure Signed-off-by: Hema HK <hemahk@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/musb/musb_core.h4
-rw-r--r--drivers/usb/musb/omap2430.c11
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 5216729bd4b2..5cb50f8f2907 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -358,10 +358,6 @@ struct musb_csr_regs {
358 358
359struct musb_context_registers { 359struct musb_context_registers {
360 360
361#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
362 defined(CONFIG_ARCH_OMAP4)
363 u32 otg_forcestandby;
364#endif
365 u8 power; 361 u8 power;
366 u16 intrtxe, intrrxe; 362 u16 intrtxe, intrrxe;
367 u8 intrusbe; 363 u8 intrusbe;
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 64cf2431c05e..b6dcc7eaa21f 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -488,15 +488,6 @@ static int __exit omap2430_remove(struct platform_device *pdev)
488} 488}
489 489
490#ifdef CONFIG_PM 490#ifdef CONFIG_PM
491static void omap2430_save_context(struct musb *musb)
492{
493 musb->context.otg_forcestandby = musb_readl(musb->mregs, OTG_FORCESTDBY);
494}
495
496static void omap2430_restore_context(struct musb *musb)
497{
498 musb_writel(musb->mregs, OTG_FORCESTDBY, musb->context.otg_forcestandby);
499}
500 491
501static int omap2430_suspend(struct device *dev) 492static int omap2430_suspend(struct device *dev)
502{ 493{
@@ -505,7 +496,6 @@ static int omap2430_suspend(struct device *dev)
505 496
506 omap2430_low_level_exit(musb); 497 omap2430_low_level_exit(musb);
507 otg_set_suspend(musb->xceiv, 1); 498 otg_set_suspend(musb->xceiv, 1);
508 omap2430_save_context(musb);
509 499
510 if (!pm_runtime_suspended(dev) && dev->bus && dev->bus->pm && 500 if (!pm_runtime_suspended(dev) && dev->bus && dev->bus->pm &&
511 dev->bus->pm->runtime_suspend) 501 dev->bus->pm->runtime_suspend)
@@ -524,7 +514,6 @@ static int omap2430_resume(struct device *dev)
524 dev->bus->pm->runtime_resume(dev); 514 dev->bus->pm->runtime_resume(dev);
525 515
526 omap2430_low_level_init(musb); 516 omap2430_low_level_init(musb);
527 omap2430_restore_context(musb);
528 otg_set_suspend(musb->xceiv, 0); 517 otg_set_suspend(musb->xceiv, 0);
529 518
530 return 0; 519 return 0;