Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94f72136 authored by Daniel Mack's avatar Daniel Mack Committed by Felipe Balbi
Browse files

usb: musb: call musb_port_suspend from musb_bus_suspend 



Make musb_port_suspend() externally available, and call it when to host
goes into suspend. This allows the core to go into suspend while a
device is connected.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent c338412b

drivers/usb/musb/musb_host.c

+2 −0
Original line number Diff line number Diff line
@@ -2433,6 +2433,8 @@ static int musb_bus_suspend(struct usb_hcd *hcd) 
	struct musb	*musb = hcd_to_musb(hcd);

	u8		devctl;



	musb_port_suspend(musb, true);



	if (!is_host_active(musb))

		return 0;

drivers/usb/musb/musb_host.h

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ extern void musb_host_rx(struct musb *, u8); 
extern void musb_root_disconnect(struct musb *musb);

extern void musb_host_resume_root_hub(struct musb *musb);

extern void musb_host_poke_root_hub(struct musb *musb);

extern void musb_port_suspend(struct musb *musb, bool do_suspend);

#else

static inline struct musb *hcd_to_musb(struct usb_hcd *hcd)

{
@@ -121,6 +122,7 @@ static inline void musb_root_disconnect(struct musb *musb) {} 
static inline void musb_host_resume_root_hub(struct musb *musb)	{}

static inline void musb_host_poll_rh_status(struct musb *musb)	{}

static inline void musb_host_poke_root_hub(struct musb *musb)	{}

static inline void musb_port_suspend(struct musb *musb, bool do_suspend) {}

#endif



struct usb_hcd;

drivers/usb/musb/musb_virthub.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


#include "musb_core.h"



static void musb_port_suspend(struct musb *musb, bool do_suspend)

void musb_port_suspend(struct musb *musb, bool do_suspend)

{

	struct usb_otg	*otg = musb->xceiv->otg;

	u8		power;