Skip to content

Commit

Permalink
usb: musb: core: Convert the musb_platform_reset to have a return value.
Browse files Browse the repository at this point in the history
Currently musb_platform_reset() is only used by dsps.
In case of BABBLE interrupt for other platforms the  musb_platform_reset()
is a NOP. In such situations no need to re-initialize the endpoints.
Also in the latest silicon revision of AM335x, we do have a babble recovery
mechanism without resetting the IP block. In preperation to add that support
its better to have a rest_done return for  musb_platform_reset().

Signed-off-by: George Cherian <george.cherian@ti.com>
Tested-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
George Cherian authored and Felipe Balbi committed Jul 16, 2014
1 parent 675ae76 commit d871c62
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
10 changes: 6 additions & 4 deletions drivers/usb/musb/musb_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1753,9 +1753,11 @@ static void musb_irq_work(struct work_struct *data)
static void musb_recover_work(struct work_struct *data)
{
struct musb *musb = container_of(data, struct musb, recover_work.work);
int status;
int status, ret;

musb_platform_reset(musb);
ret = musb_platform_reset(musb);
if (ret)
return;

usb_phy_vbus_off(musb->xceiv);
usleep_range(100, 200);
Expand All @@ -1764,8 +1766,8 @@ static void musb_recover_work(struct work_struct *data)
usleep_range(100, 200);

/*
* When a babble condition occurs, the musb controller removes the
* session bit and the endpoint config is lost.
* When a babble condition occurs, the musb controller
* removes the session bit and the endpoint config is lost.
*/
if (musb->dyn_fifo)
status = ep_config_from_table(musb);
Expand Down
10 changes: 6 additions & 4 deletions drivers/usb/musb/musb_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ struct musb_platform_ops {

int (*set_mode)(struct musb *musb, u8 mode);
void (*try_idle)(struct musb *musb, unsigned long timeout);
void (*reset)(struct musb *musb);
int (*reset)(struct musb *musb);

int (*vbus_status)(struct musb *musb);
void (*set_vbus)(struct musb *musb, int on);
Expand Down Expand Up @@ -555,10 +555,12 @@ static inline void musb_platform_try_idle(struct musb *musb,
musb->ops->try_idle(musb, timeout);
}

static inline void musb_platform_reset(struct musb *musb)
static inline int musb_platform_reset(struct musb *musb)
{
if (musb->ops->reset)
musb->ops->reset(musb);
if (!musb->ops->reset)
return -EINVAL;

return musb->ops->reset(musb);
}

static inline int musb_platform_get_vbus_status(struct musb *musb)
Expand Down
3 changes: 2 additions & 1 deletion drivers/usb/musb/musb_dsps.c
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ static int dsps_musb_set_mode(struct musb *musb, u8 mode)
return 0;
}

static void dsps_musb_reset(struct musb *musb)
static int dsps_musb_reset(struct musb *musb)
{
struct device *dev = musb->controller;
struct dsps_glue *glue = dev_get_drvdata(dev->parent);
Expand All @@ -556,6 +556,7 @@ static void dsps_musb_reset(struct musb *musb)
usleep_range(100, 200);
usb_phy_init(musb->xceiv);

return 0;
}

static struct musb_platform_ops dsps_ops = {
Expand Down

0 comments on commit d871c62

Please sign in to comment.