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

Commit 69ae2a70 authored by Daniel Mack's avatar Daniel Mack Committed by Felipe Balbi
Browse files

usb: musb: move musb_start to musb_virthub.c 



This function has its only user in musb_virthub.c, so let's move it
there and make it static.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Acked-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent fe4cb091

drivers/usb/musb/musb_core.c

+0 −45
Original line number Diff line number Diff line
@@ -897,51 +897,6 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 


/*-------------------------------------------------------------------------*/



/*

* Program the HDRC to start (enable interrupts, dma, etc.).

*/

void musb_start(struct musb *musb)

{

	void __iomem	*regs = musb->mregs;

	u8		devctl = musb_readb(regs, MUSB_DEVCTL);



	dev_dbg(musb->controller, "<== devctl %02x\n", devctl);



	/*  Set INT enable registers, enable interrupts */

	musb->intrtxe = musb->epmask;

	musb_writew(regs, MUSB_INTRTXE, musb->intrtxe);

	musb->intrrxe = musb->epmask & 0xfffe;

	musb_writew(regs, MUSB_INTRRXE, musb->intrrxe);

	musb_writeb(regs, MUSB_INTRUSBE, 0xf7);



	musb_writeb(regs, MUSB_TESTMODE, 0);



	/* put into basic highspeed mode and start session */

	musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE

						| MUSB_POWER_HSENAB

						/* ENSUSPEND wedges tusb */

						/* | MUSB_POWER_ENSUSPEND */

						);



	musb->is_active = 0;

	devctl = musb_readb(regs, MUSB_DEVCTL);

	devctl &= ~MUSB_DEVCTL_SESSION;



	/* session started after:

	 * (a) ID-grounded irq, host mode;

	 * (b) vbus present/connect IRQ, peripheral mode;

	 * (c) peripheral initiates, using SRP

	 */

	if ((devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS)

		musb->is_active = 1;

	else

		devctl |= MUSB_DEVCTL_SESSION;



	musb_platform_enable(musb);

	musb_writeb(regs, MUSB_DEVCTL, devctl);

}





static void musb_generic_disable(struct musb *musb)

{

	void __iomem	*mbase = musb->mregs;

drivers/usb/musb/musb_core.h

+0 −1
Original line number Diff line number Diff line
@@ -502,7 +502,6 @@ static inline void musb_configure_ep0(struct musb *musb) 


extern const char musb_driver_name[];



extern void musb_start(struct musb *musb);

extern void musb_stop(struct musb *musb);



extern void musb_write_fifo(struct musb_hw_ep *ep, u16 len, const u8 *src);

drivers/usb/musb/musb_virthub.c

+44 −0
Original line number Diff line number Diff line
@@ -44,6 +44,50 @@ 


#include "musb_core.h"



/*

* Program the HDRC to start (enable interrupts, dma, etc.).

*/

static void musb_start(struct musb *musb)

{

	void __iomem	*regs = musb->mregs;

	u8		devctl = musb_readb(regs, MUSB_DEVCTL);



	dev_dbg(musb->controller, "<== devctl %02x\n", devctl);



	/*  Set INT enable registers, enable interrupts */

	musb->intrtxe = musb->epmask;

	musb_writew(regs, MUSB_INTRTXE, musb->intrtxe);

	musb->intrrxe = musb->epmask & 0xfffe;

	musb_writew(regs, MUSB_INTRRXE, musb->intrrxe);

	musb_writeb(regs, MUSB_INTRUSBE, 0xf7);



	musb_writeb(regs, MUSB_TESTMODE, 0);



	/* put into basic highspeed mode and start session */

	musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE

						| MUSB_POWER_HSENAB

						/* ENSUSPEND wedges tusb */

						/* | MUSB_POWER_ENSUSPEND */

						);



	musb->is_active = 0;

	devctl = musb_readb(regs, MUSB_DEVCTL);

	devctl &= ~MUSB_DEVCTL_SESSION;



	/* session started after:

	 * (a) ID-grounded irq, host mode;

	 * (b) vbus present/connect IRQ, peripheral mode;

	 * (c) peripheral initiates, using SRP

	 */

	if ((devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) {

		musb->is_active = 1;

	} else {

		devctl |= MUSB_DEVCTL_SESSION;

	}



	musb_platform_enable(musb);

	musb_writeb(regs, MUSB_DEVCTL, devctl);

}



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

{