usb: musb/otg: cleanup and fixes
v2 cover usb: musb/otg: cleanup and fixes
This series has some misc cleanup and fixes. The fix solves the cold plug issue in omap3 which some have reported. Developed these patches on fixes-for-v3.9-rc3 after applying
http://www.spinics.net/lists/linux-usb/msg81563.html
(Grazvydas Ignotas patch series)
Tested for g_zero enumeration in pandaboard and beagleboard in both cold plug and hot plug case. Any kind of testing for this series is welcome.
Changes from v1:
* removed *usb: musb: omap: remove the check before calling otg_set_vbus* a similar patch is already merged.
Kishon Vijay Abraham I (4):
usb: musb: omap: remove the check before calling otg_set_vbus
usb: otg: twl4030: use devres API for regulator get and request irq
usb: musb: omap: add usb_phy_init in omap2430_musb_init
usb: otg: twl4030: fix cold plug on OMAP3
drivers/usb/musb/omap2430.c | 11 +++++------ drivers/usb/otg/twl4030-usb.c | 35 ++++++++++++----------------------- 2 files changed, 17 insertions(+), 29 deletions(-)
Signature · 6 lines
1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 1/4 usb: musb: omap: remove the check before calling otg_set_vbus
No functional change. otg_set_vbus is already protected so removed the check before calling otg_set_vbus.
--- drivers/usb/musb/omap2430.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/usb/musb/omap2430.c +3 -6
@@ -174,8 +174,7 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on) } } -if (otg->set_vbus) -otg_set_vbus (otg,1 ); +otg_set_vbus (otg,1 ); }else { musb->is_active =1 ; otg->default_a =1 ;
@@ -297,10 +296,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue) }omap2430_musb_set_vbus (musb,0 ); -if (data->interface_type ==MUSB_INTERFACE_UTMI ) { -if (musb->xceiv->otg->set_vbus) -otg_set_vbus (musb->xceiv->otg,0 ); - } +if (data->interface_type ==MUSB_INTERFACE_UTMI ) +otg_set_vbus (musb->xceiv->otg,0 );omap_control_usb_set_mode (glue->control_otghs,USB_MODE_DISCONNECT );break ;
Signature · 1 line
1.7.10.4
PATCH v2 2/4 usb: otg: twl4030: use devres API for regulator get and request irq
In reply to Kishon Vijay Abraham IUsed devres APIs devm_request_threaded_irq and devm_regulator_get for requesting irq and for getting regulator respectively.
--- drivers/usb/otg/twl4030-usb.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)
drivers/usb/otg/twl4030-usb.c +8 -20
@@ -470,7 +470,7 @@ static int twl4030_usb_ldo_init(struct twl4030_usb *twl)/* Initialize 3.1V regulator */ twl_i2c_write_u8 (TWL_MODULE_PM_RECEIVER ,0 ,VUSB3V1_DEV_GRP ); - twl->usb3v1 =regulator_get (twl->dev,"usb3v1" ); + twl->usb3v1 =devm_regulator_get (twl->dev,"usb3v1" );if (IS_ERR (twl->usb3v1))return -ENODEV ;
@@ -479,18 +479,18 @@ static int twl4030_usb_ldo_init(struct twl4030_usb *twl)/* Initialize 1.5V regulator */ twl_i2c_write_u8 (TWL_MODULE_PM_RECEIVER ,0 ,VUSB1V5_DEV_GRP ); - twl->usb1v5 =regulator_get (twl->dev,"usb1v5" ); + twl->usb1v5 =devm_regulator_get (twl->dev,"usb1v5" );if (IS_ERR (twl->usb1v5)) - goto fail1; +return -ENODEV ;twl_i2c_write_u8 (TWL_MODULE_PM_RECEIVER ,0 ,VUSB1V5_TYPE );/* Initialize 1.8V regulator */ twl_i2c_write_u8 (TWL_MODULE_PM_RECEIVER ,0 ,VUSB1V8_DEV_GRP ); - twl->usb1v8 =regulator_get (twl->dev,"usb1v8" ); + twl->usb1v8 =devm_regulator_get (twl->dev,"usb1v8" );if (IS_ERR (twl->usb1v8)) - goto fail2; +return -ENODEV ;twl_i2c_write_u8 (TWL_MODULE_PM_RECEIVER ,0 ,VUSB1V8_TYPE );
@@ -499,14 +499,6 @@ static int twl4030_usb_ldo_init(struct twl4030_usb *twl) TWL4030_PM_MASTER_PROTECT_KEY);return 0 ; - -fail2: -regulator_put (twl->usb1v5); - twl->usb1v5 =NULL ; -fail1: -regulator_put (twl->usb3v1); - twl->usb3v1 =NULL ; -return -ENODEV ; } static ssize_t twl4030_usb_vbus_show(struct device *dev,
@@ -695,9 +687,9 @@ static int twl4030_usb_probe(struct platform_device *pdev)* need both handles, otherwise just one suffices. */ twl->irq_enabled = true; - status =request_threaded_irq (twl->irq,NULL , twl4030_usb_irq, -IRQF_TRIGGER_FALLING |IRQF_TRIGGER_RISING | -IRQF_ONESHOT ,"twl4030_usb" , twl); + status =devm_request_threaded_irq (twl->dev, twl->irq,NULL , + twl4030_usb_irq,IRQF_TRIGGER_FALLING | +IRQF_TRIGGER_RISING |IRQF_ONESHOT ,"twl4030_usb" , twl);if (status <0 ) {dev_dbg (&pdev->dev,"can't get IRQ %d, err %d\n" , twl->irq, status);
@@ -716,7 +708,6 @@ static int __exit twl4030_usb_remove(struct platform_device *pdev)int val;cancel_delayed_work (&twl->id_workaround_work); -free_irq (twl->irq, twl);device_remove_file (twl->dev, &dev_attr_vbus);/* set transceiver mode to power on defaults */
@@ -738,9 +729,6 @@ static int __exit twl4030_usb_remove(struct platform_device *pdev)if (!twl->asleep)twl4030_phy_power (twl,0 ); -regulator_put (twl->usb1v5); -regulator_put (twl->usb1v8); -regulator_put (twl->usb3v1);return 0 ; }
Signature · 1 line
1.7.10.4
Re: [PATCH v2 2/4] usb: otg: twl4030: use devres API for regulator get and request irq
Quoted 4 lines · Kishon Vijay Abraham I
Used devres APIs
devm_request_threaded_irqanddevm_regulator_getfor requesting irq and for getting regulator respectively.Signed-off-by Kishon Vijay Abraham I <[email protected]>
please refresh this on top of my testing branch, you should be patching drivers/usb/phy/phy-twl4030-usb.c
Signature · 1 line
balbi
Re: [PATCH v2 2/4] usb: otg: twl4030: use devres API for regulator get and request irq
Quoted 8 lines · Felipe Balbi
Quoted 4 lines · Kishon Vijay Abraham I
Used devres APIs
devm_request_threaded_irqanddevm_regulator_getfor requesting irq and for getting regulator respectively.Signed-off-by Kishon Vijay Abraham I <[email protected]>please refresh this on top of my testing branch, you should be patching
drivers/usb/phy/phy-twl4030-usb.c
Does that mean I need to rebase my series on your testing branch too?
Quoted 3 lines
--
balbi
Signature · 5 lines
Gražvydas -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/4] usb: otg: twl4030: use devres API for regulator get and request irq
Quoted 11 lines · Grazvydas Ignotas
Quoted 8 lines · Felipe Balbi
Quoted 4 lines · Kishon Vijay Abraham I
Used devres APIs
devm_request_threaded_irqanddevm_regulator_getfor requesting irq and for getting regulator respectively.Signed-off-by Kishon Vijay Abraham I <[email protected]>please refresh this on top of my testing branch, you should be patching
drivers/usb/phy/phy-twl4030-usb.cDoes that mean I need to rebase my series on your testing branch too?
Oh yeah, sorry. Forgot to mention.
Signature · 1 line
balbi
PATCH v2 3/4 usb: musb: omap: add usb_phy_init in omap2430_musb_init
In reply to Kishon Vijay Abraham ISome PHYs load too early (twl4030) making omap glue to miss cable connect events if the board is booted with cable connected. So adding usb_phy_init in omap2430_musb_init lets PHYs to report events once glue is ready.
--- drivers/usb/musb/omap2430.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/musb/omap2430.c +2 -0
@@ -391,6 +391,8 @@ static int omap2430_musb_init(struct musb *musb)if (glue->status !=OMAP_MUSB_UNKNOWN )omap_musb_set_mailbox (glue); +usb_phy_init (musb->xceiv); +pm_runtime_put_noidle (musb->controller);return 0 ;
Signature · 1 line
1.7.10.4
PATCH v2 4/4 usb: otg: twl4030: fix cold plug on OMAP3
In reply to Kishon Vijay Abraham IHaving twl4030_usb_phy_init() (detects if a cable is connected before twl4030 is probed) in twl4030 probe makes cable connect events to be missed by musb glue, since it gets loaded after twl4030. Having twl4030_usb_phy_init as a usb_phy ops lets twl4030_usb_phy_init to be called when glue is ready.
--- drivers/usb/otg/twl4030-usb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/usb/otg/twl4030-usb.c +4 -3
@@ -565,8 +565,9 @@ static void twl4030_id_workaround_work(struct work_struct *work) } } -static void twl4030_usb_phy_init (struct twl4030_usb *twl) +static int twl4030_usb_phy_init (struct usb_phy *phy) { +struct twl4030_usb *twl =phy_to_twl (phy);enum omap_musb_vbus_id_status status;/*
@@ -581,6 +582,7 @@ static void twl4030_usb_phy_init(struct twl4030_usb *twl)omap_musb_mailbox (twl->linkstat);sysfs_notify (&twl->dev->kobj,NULL ,"vbus" ); +return 0 ; }static int twl4030_set_suspend (struct usb_phy *x,int suspend)
@@ -657,6 +659,7 @@ static int twl4030_usb_probe(struct platform_device *pdev) twl->phy.otg = otg; twl->phy.type =USB_PHY_TYPE_USB2 ; twl->phy.set_suspend = twl4030_set_suspend; + twl->phy.init = twl4030_usb_phy_init; otg->phy = &twl->phy; otg->set_host = twl4030_set_host;
@@ -696,8 +699,6 @@ static int twl4030_usb_probe(struct platform_device *pdev)return status; } -twl4030_usb_phy_init (twl); -dev_info (&pdev->dev,"Initialized TWL4030 USB module\n" );return 0 ; }
Signature · 1 line
1.7.10.4
Re: [PATCH v2 4/4] usb: otg: twl4030: fix cold plug on OMAP3
Quoted 7 lines · Kishon Vijay Abraham I
Having
twl4030_usb_phy_init()(detects if a cable is connected before twl4030 is probed) in twl4030 probe makes cable connect events to be missed by musb glue, since it gets loaded after twl4030. Havingtwl4030_usb_phy_initas ausb_phyops letstwl4030_usb_phy_initto be called when glue is ready.Signed-off-by Kishon Vijay Abraham I <[email protected]>
likewise. The other two I have taken
Signature · 1 line
balbi
Quoted 11 lines · Kishon Vijay Abraham I
This series has some misc cleanup and fixes. The fix solves the cold plug issue in omap3 which some have reported. Developed these patches on fixes-for-v3.9-rc3 after applying
http://www.spinics.net/lists/linux-usb/msg81563.html
(Grazvydas Ignotas patch series)Tested for
g_zeroenumeration in pandaboard and beagleboard in both cold plug and hot plug case. Any kind of testing for this series is welcome.Changes from v1:
* removed *usb: musb: omap: remove the check before calling otg_set_vbus*
it's still on your list of patches :-p
Quoted 4 lines
a similar patch is already merged.
Kishon Vijay Abraham I (4):
usb: musb: omap: remove the check before callingotg_set_vbus
see ^^
please fix it up and when resending add Grazvydas' Tested-by since he has tested this patchset
Signature · 1 line
balbi
Quoted 7 lines · Felipe Balbi
Quoted 6 lines · Kishon Vijay Abraham I
This series has some misc cleanup and fixes. The fix solves the cold plug issue in omap3 which some have reported. Developed these patches on fixes-for-v3.9-rc3 after applying
http://www.spinics.net/lists/linux-usb/msg81563.html
(Grazvydas Ignotas patch series)
Quoted 5 lines
Quoted 5 lines
Tested for
g_zeroenumeration in pandaboard and beagleboard in both cold plug and hot plug case. Any kind of testing for this series is welcome.Changes from v1:
* removed *usb: musb: omap: remove the check before calling otg_set_vbus*
er.. removed *usb: musb: omap: always glue have the correct vbus/id status* since a patch similar to it is already merged.
Quoted 5 lines
it's still on your list of patches :-p
Quoted 2 lines
a similar patch is already merged.
Quoted 7 lines
Quoted 2 lines
Kishon Vijay Abraham I (4):
usb: musb: omap: remove the check before callingotg_set_vbussee ^^
please fix it up and when resending add Grazvydas' Tested-by since he has tested this patchset
Ok.
Thanks
Kishon
Quoted 8 lines · kishon
Quoted 7 lines · Felipe Balbi
Quoted 6 lines · Kishon Vijay Abraham I
This series has some misc cleanup and fixes. The fix solves the cold plug issue in omap3 which some have reported. Developed these patches on fixes-for-v3.9-rc3 after applying
http://www.spinics.net/lists/linux-usb/msg81563.html
(Grazvydas Ignotas patch series)
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Tested for
g_zeroenumeration in pandaboard and beagleboard in both cold plug and hot plug case. Any kind of testing for this series is welcome.Changes from v1:
* removed *usb: musb: omap: remove the check before calling otg_set_vbus*er.. removed *usb: musb: omap: always glue have the correct vbus/id status* since a patch similar to it is already merged.
alright, I'll apply this series soonish.
Signature · 1 line
balbi
Quoted 12 lines · Felipe Balbi
Quoted 11 lines · kishon
Quoted 10 lines · Felipe Balbi
Quoted 9 lines · Kishon Vijay Abraham I
This series has some misc cleanup and fixes. The fix solves the cold plug issue in omap3 which some have reported. Developed these patches on fixes-for-v3.9-rc3 after applying
http://www.spinics.net/lists/linux-usb/msg81563.html
(Grazvydas Ignotas patch series)Tested for
g_zeroenumeration in pandaboard and beagleboard in both cold plug and hot plug case. Any kind of testing for this series is welcome.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
Changes from v1:
* removed *usb: musb: omap: remove the check before calling otg_set_vbus*er.. removed *usb: musb: omap: always glue have the correct vbus/id status* since a patch similar to it is already merged.
alright, I'll apply this series soonish.
Ok.
Thanks
Kishon