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

Commit 8cf28f1f authored by Pavankumar Kondeti's avatar Pavankumar Kondeti Committed by Greg Kroah-Hartman
Browse files

USB: Fix trout build failure with ci13xxx_msm gadget 



This patch fixes the below compilation errors.

  CC      drivers/usb/gadget/ci13xxx_msm.o
  CC      net/mac80211/led.o
  drivers/usb/gadget/ci13xxx_msm.c: In function 'ci13xxx_msm_notify_event':
  drivers/usb/gadget/ci13xxx_msm.c:42: error: 'USB_AHBBURST' undeclared (first use in this function)
  drivers/usb/gadget/ci13xxx_msm.c:42: error: (Each undeclared identifier is reported only once
  drivers/usb/gadget/ci13xxx_msm.c:42: error: for each function it appears in.)
  drivers/usb/gadget/ci13xxx_msm.c:43: error: 'USB_AHBMODE' undeclared (first use in this function)
make[4]: *** [drivers/usb/gadget/ci13xxx_msm.o] Error 1
make[3]: *** [drivers/usb/gadget] Error 2

MSM USB driver is not supported on boards like trout (MSM7201) which
has an external PHY.

Signed-off-by: default avatarPavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 148fc55f

drivers/usb/gadget/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -546,6 +546,8 @@ config USB_GADGET_CI13XXX_MSM 
	  ci13xxx_udc core.

	  This driver depends on OTG driver for PHY initialization,

	  clock management, powering up VBUS, and power management.

	  This driver is not supported on boards like trout which

	  has an external PHY.



	  Say "y" to link the driver statically, or "m" to build a

	  dynamically linked module called "ci13xxx_msm" and force all

drivers/usb/host/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ config USB_EHCI_MSM 
	  Qualcomm chipsets. Root Hub has inbuilt TT.

	  This driver depends on OTG driver for PHY initialization,

	  clock management, powering up VBUS, and power management.

	  This driver is not supported on boards like trout which

	  has an external PHY.



config USB_EHCI_HCD_PPC_OF

	bool "EHCI support for PPC USB controller on OF platform bus"

drivers/usb/otg/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ config USB_MSM_OTG_72K 
	  required after resetting the hardware and power management.

	  This driver is required even for peripheral only or host only

	  mode configurations.

	  This driver is not supported on boards like trout which

	  has an external PHY.



config AB8500_USB

        tristate "AB8500 USB Transceiver Driver"

include/linux/usb/msm_hsusb_hw.h

+0 −4
Original line number Diff line number Diff line
@@ -16,12 +16,8 @@ 
#ifndef __LINUX_USB_GADGET_MSM72K_UDC_H__

#define __LINUX_USB_GADGET_MSM72K_UDC_H__



#ifdef CONFIG_ARCH_MSM7X00A

#define USB_SBUSCFG          (MSM_USB_BASE + 0x0090)

#else

#define USB_AHBBURST         (MSM_USB_BASE + 0x0090)

#define USB_AHBMODE          (MSM_USB_BASE + 0x0098)

#endif

#define USB_CAPLENGTH        (MSM_USB_BASE + 0x0100) /* 8 bit */



#define USB_USBCMD           (MSM_USB_BASE + 0x0140)