Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 8cf28f1f4de58c70e6af657bb46ca8f304c073d4

Authored by Pavankumar Kondeti
Committed by Greg Kroah-Hartman
1 parent 148fc55fd0
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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: Pavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 4 changed files with 6 additions and 4 deletions Side-by-side Diff

drivers/usb/gadget/Kconfig
Diff comments   View file @ 8cf28f1
... ... @@ -546,6 +546,8 @@
546 546 ci13xxx_udc core.
547 547 This driver depends on OTG driver for PHY initialization,
548 548 clock management, powering up VBUS, and power management.
  549 + This driver is not supported on boards like trout which
  550 + has an external PHY.
549 551  
550 552 Say "y" to link the driver statically, or "m" to build a
551 553 dynamically linked module called "ci13xxx_msm" and force all
drivers/usb/host/Kconfig
Diff comments   View file @ 8cf28f1
... ... @@ -151,6 +151,8 @@
151 151 Qualcomm chipsets. Root Hub has inbuilt TT.
152 152 This driver depends on OTG driver for PHY initialization,
153 153 clock management, powering up VBUS, and power management.
  154 + This driver is not supported on boards like trout which
  155 + has an external PHY.
154 156  
155 157 config USB_EHCI_HCD_PPC_OF
156 158 bool "EHCI support for PPC USB controller on OF platform bus"
drivers/usb/otg/Kconfig
Diff comments   View file @ 8cf28f1
... ... @@ -103,6 +103,8 @@
103 103 required after resetting the hardware and power management.
104 104 This driver is required even for peripheral only or host only
105 105 mode configurations.
  106 + This driver is not supported on boards like trout which
  107 + has an external PHY.
106 108  
107 109 config AB8500_USB
108 110 tristate "AB8500 USB Transceiver Driver"
include/linux/usb/msm_hsusb_hw.h
Diff comments   View file @ 8cf28f1
... ... @@ -16,12 +16,8 @@
16 16 #ifndef __LINUX_USB_GADGET_MSM72K_UDC_H__
17 17 #define __LINUX_USB_GADGET_MSM72K_UDC_H__
18 18  
19   -#ifdef CONFIG_ARCH_MSM7X00A
20   -#define USB_SBUSCFG (MSM_USB_BASE + 0x0090)
21   -#else
22 19 #define USB_AHBBURST (MSM_USB_BASE + 0x0090)
23 20 #define USB_AHBMODE (MSM_USB_BASE + 0x0098)
24   -#endif
25 21 #define USB_CAPLENGTH (MSM_USB_BASE + 0x0100) /* 8 bit */
26 22  
27 23 #define USB_USBCMD (MSM_USB_BASE + 0x0140)