[PATCH] USB: Fix trout build failure with ci13xxx_msm gadget

[PATCH] USB: Fix trout build failure with ci13xxx_msm gadget

[Pavankumar Kondeti]

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>
---
 drivers/usb/gadget/Kconfig       |    2 ++
 drivers/usb/host/Kconfig         |    2 ++
 drivers/usb/otg/Kconfig          |    2 ++
 include/linux/usb/msm_hsusb_hw.h |    4 ----
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 06bb9d4..d500996 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -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
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 24046c0..0e6afa2 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -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"
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 9fb875d..9ffc823 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -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"
diff --git a/include/linux/usb/msm_hsusb_hw.h b/include/linux/usb/msm_hsusb_hw.h
index b92e173..7d1babb 100644
--- a/include/linux/usb/msm_hsusb_hw.h
+++ b/include/linux/usb/msm_hsusb_hw.h
@@ -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)
-- 
1.7.1

--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH] USB: Fix trout build failure with ci13xxx_msm gadget

[Daniel Walker]

On Fri, 2011-02-04 at 10:08 +0530, Pavankumar Kondeti wrote:
> +         This driver is not supported on boards like trout which
> +         has an external PHY.
> 

What is an external PHY?

Daniel

-- 
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
Forum.

Re: [PATCH] USB: Fix trout build failure with ci13xxx_msm gadget

[Bryan Huntsman]

On 02/04/2011 02:07 PM, Daniel Walker wrote:
> On Fri, 2011-02-04 at 10:08 +0530, Pavankumar Kondeti wrote:
>> +         This driver is not supported on boards like trout which
>> +         has an external PHY.
>>
> 
> What is an external PHY?
> 
> Daniel

In this context, external to the SoC.

- Bryan

-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH] USB: Fix trout build failure with ci13xxx_msm gadget

[David Brown]

On Fri, Feb 04 2011, Daniel Walker wrote:

> On Fri, 2011-02-04 at 10:08 +0530, Pavankumar Kondeti wrote:
>> +         This driver is not supported on boards like trout which
>> +         has an external PHY.
>> 
>
> What is an external PHY?

http://en.wikipedia.org/wiki/PHY_(chip)

It is a PHY that is external to the MSM chip.

David

-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH] USB: Fix trout build failure with ci13xxx_msm gadget

[Felipe Balbi]

On Fri, Feb 04, 2011 at 10:08:18AM +0530, Pavankumar Kondeti wrote:
> 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>

the real fix, though, would be to phase out the PHY to
drivers/usb/otg/blablabla.c. ci13xxx_msm.c shouldn't assume the PHY it's
using. That's wrong.

-- 
balbi

Re: [PATCH] USB: Fix trout build failure with ci13xxx_msm gadget

[Pavan Kondeti]

On 4/5/2011 6:25 PM, Felipe Balbi wrote:
> On Fri, Feb 04, 2011 at 10:08:18AM +0530, Pavankumar Kondeti wrote:
>> 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>
> 
> the real fix, though, would be to phase out the PHY to
> drivers/usb/otg/blablabla.c. ci13xxx_msm.c shouldn't assume the PHY it's
> using. That's wrong.
> 
Agreed. Thanks for pointing this out.

I think OTG driver should bail out if the PHY (or SoC) is not supported;
which means otg_get_transceiver() returns NULL and gadget/host driver's
probe also will fail.

-- 
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH] USB: Fix trout build failure with ci13xxx_msm gadget

[Felipe Balbi]

On Thu, Apr 07, 2011 at 04:04:21PM +0530, Pavan Kondeti wrote:
> On 4/5/2011 6:25 PM, Felipe Balbi wrote:
> > On Fri, Feb 04, 2011 at 10:08:18AM +0530, Pavankumar Kondeti wrote:
> >> 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>
> > 
> > the real fix, though, would be to phase out the PHY to
> > drivers/usb/otg/blablabla.c. ci13xxx_msm.c shouldn't assume the PHY it's
> > using. That's wrong.
> > 
> Agreed. Thanks for pointing this out.
> 
> I think OTG driver should bail out if the PHY (or SoC) is not supported;
> which means otg_get_transceiver() returns NULL and gadget/host driver's
> probe also will fail.

correct :-)

-- 
balbi