kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: Fix trout build failure with ci13xxx_msm gadget

Browse source 
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: Pavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pavankumar Kondeti 2011-02-04 10:08:18 +05:30 committed by Greg Kroah-Hartman
parent 148fc55fd0
commit 8cf28f1f4d
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/usb/gadget/Kconfig
View file

@ -546,6 +546,8 @@ config USB_GADGET_CI13XXX_MSM
ci13xxx_udc core. ci13xxx_udc core.
This driver depends on OTG driver for PHY initialization, This driver depends on OTG driver for PHY initialization,
clock management, powering up VBUS, and power management. 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 Say "y" to link the driver statically, or "m" to build a
dynamically linked module called "ci13xxx_msm" and force all dynamically linked module called "ci13xxx_msm" and force all

2
drivers/usb/host/Kconfig
View file

@ -151,6 +151,8 @@ config USB_EHCI_MSM
Qualcomm chipsets. Root Hub has inbuilt TT. Qualcomm chipsets. Root Hub has inbuilt TT.
This driver depends on OTG driver for PHY initialization, This driver depends on OTG driver for PHY initialization,
clock management, powering up VBUS, and power management. 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 config USB_EHCI_HCD_PPC_OF
bool "EHCI support for PPC USB controller on OF platform bus" bool "EHCI support for PPC USB controller on OF platform bus"

2
drivers/usb/otg/Kconfig
View file

@ -103,6 +103,8 @@ config USB_MSM_OTG_72K
required after resetting the hardware and power management. required after resetting the hardware and power management.
This driver is required even for peripheral only or host only This driver is required even for peripheral only or host only
mode configurations. mode configurations.
This driver is not supported on boards like trout which
has an external PHY.
config AB8500_USB config AB8500_USB
tristate "AB8500 USB Transceiver Driver" tristate "AB8500 USB Transceiver Driver"

4
include/linux/usb/msm_hsusb_hw.h
View file

@ -16,12 +16,8 @@
#ifndef __LINUX_USB_GADGET_MSM72K_UDC_H__ #ifndef __LINUX_USB_GADGET_MSM72K_UDC_H__
#define __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_AHBBURST (MSM_USB_BASE + 0x0090)
#define USB_AHBMODE (MSM_USB_BASE + 0x0098) #define USB_AHBMODE (MSM_USB_BASE + 0x0098)
#endif
#define USB_CAPLENGTH (MSM_USB_BASE + 0x0100) /* 8 bit */ #define USB_CAPLENGTH (MSM_USB_BASE + 0x0100) /* 8 bit */
#define USB_USBCMD (MSM_USB_BASE + 0x0140) #define USB_USBCMD (MSM_USB_BASE + 0x0140)