usb: musb: drop a gigantic amount of ifdeferry
the MUSB IP is always OTG, so there's no point in adding so many ifdefs on the code. Drop those and always compile the driver for OTG support. This also allows us to drop the useless "driver mode" choice. For doing that, we need to make musb depend on both Host and Peripheral side. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:

committed by
Greg Kroah-Hartman

szülő
e4e5b136eb
commit
622859634a
@@ -172,11 +172,7 @@ static void da8xx_musb_disable(struct musb *musb)
|
||||
musb_writel(reg_base, DA8XX_USB_END_OF_INTR_REG, 0);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_USB_MUSB_HDRC_HCD
|
||||
#define portstate(stmt) stmt
|
||||
#else
|
||||
#define portstate(stmt)
|
||||
#endif
|
||||
#define portstate(stmt) stmt
|
||||
|
||||
static void da8xx_musb_set_vbus(struct musb *musb, int is_on)
|
||||
{
|
||||
@@ -397,21 +393,15 @@ static int da8xx_musb_set_mode(struct musb *musb, u8 musb_mode)
|
||||
|
||||
cfgchip2 &= ~CFGCHIP2_OTGMODE;
|
||||
switch (musb_mode) {
|
||||
#ifdef CONFIG_USB_MUSB_HDRC_HCD
|
||||
case MUSB_HOST: /* Force VBUS valid, ID = 0 */
|
||||
cfgchip2 |= CFGCHIP2_FORCE_HOST;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_USB_GADGET_MUSB_HDRC
|
||||
case MUSB_PERIPHERAL: /* Force VBUS valid, ID = 1 */
|
||||
cfgchip2 |= CFGCHIP2_FORCE_DEVICE;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_USB_MUSB_OTG
|
||||
case MUSB_OTG: /* Don't override the VBUS/ID comparators */
|
||||
cfgchip2 |= CFGCHIP2_NO_OVERRIDE;
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
dev_dbg(musb->controller, "Trying to set unsupported mode %u\n", musb_mode);
|
||||
}
|
||||
|
Reference in New Issue
Block a user