EHCI_MV confusion was: Re: kirkwood devicetree respin

[Jason Cooper]

On Wed, Mar 21, 2012 at 09:56:24AM -0400, Alan Stern wrote:
> On Wed, 21 Mar 2012, Jason Cooper wrote:
> 
> > On Tue, Mar 20, 2012 at 11:54:53PM -0400, Nicolas Pitre wrote:
> > > On Tue, 20 Mar 2012, Arnd Bergmann wrote:
> > > 
> > > > ehci-orion only makes sense on PLAT_ORION, and they never have any
> > > > other platform ehci driver.
> > > > 
> > > > ehci-mv only makese sense on PLAT_PXA, and they  also don't have any
> > > > other platform ehci driver.
> > > 
> > > BTW, as someone who once was the active maintainer for PXA, and later 
> > > the active maintainer for Orion, I should say that ehci-mv is a terribly 
> > > bad name (as demonstrated, not all Marvell SOCs use ehci-mv) and 
> > > confusion would be much reduced if it was renamed to ehci-pxa.
> > 
> > How about like this (to differentiate against pxa168):
> > 
> > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> > index 353cdd4..e1bc205 100644
> > --- a/drivers/usb/host/Kconfig
> > +++ b/drivers/usb/host/Kconfig
> > @@ -194,8 +194,8 @@ config USB_EHCI_S5P
> >         help
> >          Enable support for the S5P SOC's on-chip EHCI controller.
> >  
> > -config USB_EHCI_MV
> > -       bool "EHCI support for Marvell on-chip controller"
> > +config USB_EHCI_MV_PXA
> > +       bool "EHCI support for Marvell PXA on-chip controller"
> >         depends on USB_EHCI_HCD
> >         select USB_EHCI_ROOT_HUB_TT
> >         ---help---
> > diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
> > index a007a9f..4e1ec71 100644
> > --- a/drivers/usb/host/ehci-hcd.c
> > +++ b/drivers/usb/host/ehci-hcd.c
> > @@ -1371,8 +1371,8 @@ MODULE_LICENSE ("GPL");
> >  #define PLATFORM_DRIVER                ehci_xls_driver
> >  #endif
> >  
> > -#ifdef CONFIG_USB_EHCI_MV
> > -#include "ehci-mv.c"
> > +#ifdef CONFIG_USB_EHCI_MV_PXA
> > +#include "ehci-mvpxa.c"
> >  #define        PLATFORM_DRIVER         ehci_mv_driver
> >  #endif
> 
> You guys have spent an awful lot of time and effort beating a dead 
> horse.  See commit a219b666e89bd2f7810b4eaaf4d7382ad0e6ecb1 (usb: host: 
> add dependence for USB_EHCI_MV).

Ahh, that explains it.  My series was based off of v3.3-rc3, this made
it in v3.3-rc5.

thx,

Jason.