Hello. On 23-09-2010 9:50, Maulik wrote:
-----Original Message----- From: Hema HK [mailto:hemahk@xxxxxx] Sent: Thursday, September 23, 2010 6:01 AM To: linux-omap@xxxxxxxxxxxxxxx; linux-usb@xxxxxxxxxxxxxxx Cc: Hema HK; Maulik Mankad; Felipe Balbi; Tony Lindgren; Kevin Hilman; Cousson, Benoit; Paul Walmsley Subject: [PATCH 9/9 v3] usb : musb: Offmode fix for idle path
With OMAP core-off support musb was not functional as context was getting lost after wakeup from core-off. And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
Used the pm_runtime_put_sysc API to configure the musb to force idle/standby modes, saving the context and disable the clk in while idling if there is no activity on the usb bus.
Used the pm_runtime_get_sync API to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.
Signed-off-by: Hema HK<hemahk@xxxxxx> Signed-off-by: Maulik Mankad<x0082077@xxxxxx> Cc: Felipe Balbi<balbi@xxxxxx> Cc: Tony Lindgren<tony@xxxxxxxxxxx> Cc: Kevin Hilman<khilman@xxxxxxxxxxxxxxxxxxx> Cc: Cousson, Benoit<b-cousson@xxxxxx> Cc: Paul Walmsley<paul@xxxxxxxxx>
[...]
Index: linux-omap-pm/arch/arm/mach-omap2/usb-musb.c =================================================================== --- linux-omap-pm.orig/arch/arm/mach-omap2/usb-musb.c +++ linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
[...]
@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_mu put_device(dev); } +void musb_prepare_for_idle() +{ + int core_next_state; + struct omap_hwmod *oh = oh_p; + struct omap_device *od; + struct platform_device *pdev; + struct musb_hdrc_platform_data *pdata; + struct device *dev; + + if (!core_pwrdm) + return; + + core_next_state = pwrdm_read_next_pwrst(core_pwrdm); + if (core_next_state>= PWRDM_POWER_INACTIVE) + return; + if (!oh) + return; + + od = oh->od; + pdev =&od->pdev; + + if (!pdev) + return; + dev =&pdev->dev; + + if (dev->driver) { + pdata = dev->platform_data; + + if (pdata->is_usb_active)
Don't you need a start brace here?
No if the *if* only embraces one statement as here. But the next *if* can be collapsed into this one.
Also a tab is required if this if condition is under if (dev->driver)
Yeah.
+ if (!pdata->is_usb_active(dev)) {
Brace not necessary.
+ if (core_next_state == PWRDM_POWER_OFF) { + pdata->save_context = 1; + pm_runtime_put_sync(dev); + } else if (core_next_state == PWRDM_POWER_RET) { + pdata->save_context = 0; + pm_runtime_put_sync(dev); + } + } + } +} + +void musb_wakeup_from_idle() +{ + int core_next_state; + int core_prev_state; + struct omap_hwmod *oh = oh_p; + struct omap_device *od; + struct platform_device *pdev; + struct device *dev; + struct musb_hdrc_platform_data *pdata; + + if (!core_pwrdm) + return; + + core_next_state = pwrdm_read_next_pwrst(core_pwrdm); + + if (core_next_state>= PWRDM_POWER_INACTIVE) + return; + core_prev_state = pwrdm_read_prev_pwrst(core_pwrdm); + + if (!oh) + return; + od = oh->od; + pdev =&od->pdev; + + if (!pdev) + return; + + dev =&pdev->dev; + + if (dev->driver) { + pdata = dev->platform_data; + + if (pdata->is_usb_active)
Braces needed for this if condition?
No. But the next *if* can be collapsed into the previous.
+ if (!pdata->is_usb_active(dev)) { + if (core_prev_state == PWRDM_POWER_OFF) { + pdata->restore_context = 1; + pm_runtime_get_sync(dev); + } else { + pdata->restore_context = 0; + pm_runtime_get_sync(dev); + } + } + } +}
WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
