Skip to content

Commit

Permalink
usb: gadget: r8a66597-udc: add support for set_selfpowered
Browse files Browse the repository at this point in the history
The previous code always set to USB_DEVICE_SELF_POWERED in GET_STATUS.
So, this patch adds set_selfpowered().

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Shimoda, Yoshihiro authored and Felipe Balbi committed May 4, 2012
1 parent 00c16f9 commit 1ec9c8a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
15 changes: 14 additions & 1 deletion drivers/usb/gadget/r8a66597-udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@ __acquires(r8a66597->lock)

switch (ctrl->bRequestType & USB_RECIP_MASK) {
case USB_RECIP_DEVICE:
status = 1 << USB_DEVICE_SELF_POWERED;
status = r8a66597->device_status;
break;
case USB_RECIP_INTERFACE:
status = 0;
Expand Down Expand Up @@ -1800,11 +1800,24 @@ static int r8a66597_pullup(struct usb_gadget *gadget, int is_on)
return 0;
}

static int r8a66597_set_selfpowered(struct usb_gadget *gadget, int is_self)
{
struct r8a66597 *r8a66597 = gadget_to_r8a66597(gadget);

if (is_self)
r8a66597->device_status |= 1 << USB_DEVICE_SELF_POWERED;
else
r8a66597->device_status &= ~(1 << USB_DEVICE_SELF_POWERED);

return 0;
}

static struct usb_gadget_ops r8a66597_gadget_ops = {
.get_frame = r8a66597_get_frame,
.udc_start = r8a66597_start,
.udc_stop = r8a66597_stop,
.pullup = r8a66597_pullup,
.set_selfpowered = r8a66597_set_selfpowered,
};

static int __exit r8a66597_remove(struct platform_device *pdev)
Expand Down
1 change: 1 addition & 0 deletions drivers/usb/gadget/r8a66597-udc.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ struct r8a66597 {
u16 old_vbus;
u16 scount;
u16 old_dvsq;
u16 device_status; /* for GET_STATUS */

/* pipe config */
unsigned char bulk;
Expand Down

0 comments on commit 1ec9c8a

Please sign in to comment.