[PATCH] usb: gadget: Fix build error due to selection of USB_FSL_MPH_DR_OF by ARCH_MXC

[PATCH] usb: gadget: Fix build error due to selection of USB_FSL_MPH_DR_OF by ARCH_MXC

[Fabio Estevam]

USB_FSL_MPH_DR_OF is a PowerPC driver and should not be selected by ARCH_MXC.

Doing a 'make mx3_defconfig' and selecting i.MX6 we get:

CC [M]  drivers/usb/host/fsl-mph-dr-of.o
drivers/usb/host/fsl-mph-dr-of.c: In function 'fsl_usb2_device_register':
drivers/usb/host/fsl-mph-dr-of.c:97: error: 'struct pdev_archdata' has no member named 'dma_mask'

Fix this error by not allowing USB_FSL_MPH_DR_OF to be selected by ARCH_MXC.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/usb/gadget/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 23a4473..0148676 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -159,7 +159,7 @@ config USB_FSL_USB2
 	tristate "Freescale Highspeed USB DR Peripheral Controller"
 	depends on FSL_SOC || ARCH_MXC
 	select USB_GADGET_DUALSPEED
-	select USB_FSL_MPH_DR_OF if OF
+	select USB_FSL_MPH_DR_OF if OF && !ARCH_MXC
 	help
 	   Some of Freescale PowerPC processors have a High Speed
 	   Dual-Role(DR) USB controller, which supports device mode.
-- 
1.7.1

[PATCH] usb: gadget: Fix build error due to selection of USB_FSL_MPH_DR_OF by ARCH_MXC

[Lothar Waßmann]

Hi,

Fabio Estevam writes:
> USB_FSL_MPH_DR_OF is a PowerPC driver and should not be selected by ARCH_MXC.
> 
> Doing a 'make mx3_defconfig' and selecting i.MX6 we get:
> 
> CC [M]  drivers/usb/host/fsl-mph-dr-of.o
> drivers/usb/host/fsl-mph-dr-of.c: In function 'fsl_usb2_device_register':
> drivers/usb/host/fsl-mph-dr-of.c:97: error: 'struct pdev_archdata' has no member named 'dma_mask'
> 
> Fix this error by not allowing USB_FSL_MPH_DR_OF to be selected by ARCH_MXC.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  drivers/usb/gadget/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 23a4473..0148676 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -159,7 +159,7 @@ config USB_FSL_USB2
>  	tristate "Freescale Highspeed USB DR Peripheral Controller"
>  	depends on FSL_SOC || ARCH_MXC
>  	select USB_GADGET_DUALSPEED
> -	select USB_FSL_MPH_DR_OF if OF
> +	select USB_FSL_MPH_DR_OF if OF && !ARCH_MXC
>
You could probably use 'FSL_SOC' instead of '!ARCH_MXC', like it is
done for the USB host controller:
|config USB_EHCI_FSL
|	bool "Support for Freescale on-chip EHCI USB controller"
|	depends on USB_EHCI_HCD && FSL_SOC
|	select USB_EHCI_ROOT_HUB_TT
|	select USB_FSL_MPH_DR_OF if OF
|	---help---
|	  Variation of ARC USB block used in some Freescale chips.
|
|config USB_EHCI_MXC
|	bool "Support for Freescale on-chip EHCI USB controller"
|	depends on USB_EHCI_HCD && ARCH_MXC
|	select USB_EHCI_ROOT_HUB_TT
|	---help---
|	  Variation of ARC USB block used in some Freescale chips.

Otherwise you would have the same trouble again, if e.g. ARCH_MXS
should be added to the dependency list of USB_FSL_USB2.


Lothar Wa?mann
-- 
___________________________________________________________

Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Gesch?ftsf?hrer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996

www.karo-electronics.de | info at karo-electronics.de
___________________________________________________________

[PATCH v2] usb: gadget: Fix build error due to selection of USB_FSL_MPH_DR_OF by ARCH_MXC

[Fabio Estevam]

USB_FSL_MPH_DR_OF is a PowerPC driver and should not be selected by ARCH_MXC.

Doing a 'make mx3_defconfig' and selecting i.MX6 we get:

CC [M]  drivers/usb/host/fsl-mph-dr-of.o
drivers/usb/host/fsl-mph-dr-of.c: In function 'fsl_usb2_device_register':
drivers/usb/host/fsl-mph-dr-of.c:97: error: 'struct pdev_archdata' has no member named 'dma_mask'

Fix this error by not allowing USB_FSL_MPH_DR_OF to be selected by ARCH_MXC.

Cc: stable at kernel.org
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Changed the selection logic to depend on FSL_SOC
- Cc stable at kernel.org

 drivers/usb/gadget/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 23a4473..0148676 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -159,7 +159,7 @@ config USB_FSL_USB2
 	tristate "Freescale Highspeed USB DR Peripheral Controller"
 	depends on FSL_SOC || ARCH_MXC
 	select USB_GADGET_DUALSPEED
-	select USB_FSL_MPH_DR_OF if OF
+	select USB_FSL_MPH_DR_OF if OF && FSL_SOC
 	help
 	   Some of Freescale PowerPC processors have a High Speed
 	   Dual-Role(DR) USB controller, which supports device mode.
-- 
1.7.1

[PATCH v2] usb: gadget: Fix build error due to selection of USB_FSL_MPH_DR_OF by ARCH_MXC

[Fabio Estevam]

Hi Felipe,

On Thu, Dec 22, 2011 at 9:33 AM, Fabio Estevam
<fabio.estevam@freescale.com> wrote:
> USB_FSL_MPH_DR_OF is a PowerPC driver and should not be selected by ARCH_MXC.
>
> Doing a 'make mx3_defconfig' and selecting i.MX6 we get:
>
> CC [M] ?drivers/usb/host/fsl-mph-dr-of.o
> drivers/usb/host/fsl-mph-dr-of.c: In function 'fsl_usb2_device_register':
> drivers/usb/host/fsl-mph-dr-of.c:97: error: 'struct pdev_archdata' has no member named 'dma_mask'
>
> Fix this error by not allowing USB_FSL_MPH_DR_OF to be selected by ARCH_MXC.
>
> Cc: stable at kernel.org
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Does this patch look good?

Regards,

Fabio Estevam

[PATCH v2] usb: gadget: Fix build error due to selection of USB_FSL_MPH_DR_OF by ARCH_MXC

[Felipe Balbi]

On Thu, Dec 29, 2011 at 09:26:24PM -0200, Fabio Estevam wrote:
> Hi Felipe,
> 
> On Thu, Dec 22, 2011 at 9:33 AM, Fabio Estevam
> <fabio.estevam@freescale.com> wrote:
> > USB_FSL_MPH_DR_OF is a PowerPC driver and should not be selected by ARCH_MXC.
> >
> > Doing a 'make mx3_defconfig' and selecting i.MX6 we get:
> >
> > CC [M] ?drivers/usb/host/fsl-mph-dr-of.o
> > drivers/usb/host/fsl-mph-dr-of.c: In function 'fsl_usb2_device_register':
> > drivers/usb/host/fsl-mph-dr-of.c:97: error: 'struct pdev_archdata' has no member named 'dma_mask'
> >
> > Fix this error by not allowing USB_FSL_MPH_DR_OF to be selected by ARCH_MXC.
> >
> > Cc: stable at kernel.org
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Does this patch look good?

I'm not looking into patches until Jan 2nd. Sorry. Focussing on some
internal stuff during the merge window. Hang on for a little while and I
will soon get back to apply patches.

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111230/53e4cf90/attachment.sig>

[PATCH v2] usb: gadget: Fix build error due to selection of USB_FSL_MPH_DR_OF by ARCH_MXC

[Fabio Estevam]

Hi Felipe,

On Fri, Dec 30, 2011 at 8:32 AM, Felipe Balbi <balbi@ti.com> wrote:

> I'm not looking into patches until Jan 2nd. Sorry. Focussing on some
> internal stuff during the merge window. Hang on for a little while and I
> will soon get back to apply patches.

Have you had a chance to review this patch?

Regards,

Fabio Estevam

[PATCH v2] usb: gadget: Fix build error due to selection of USB_FSL_MPH_DR_OF by ARCH_MXC

[Felipe Balbi]

On Thu, Dec 22, 2011 at 09:33:22AM -0200, Fabio Estevam wrote:
> USB_FSL_MPH_DR_OF is a PowerPC driver and should not be selected by ARCH_MXC.
> 
> Doing a 'make mx3_defconfig' and selecting i.MX6 we get:
> 
> CC [M]  drivers/usb/host/fsl-mph-dr-of.o
> drivers/usb/host/fsl-mph-dr-of.c: In function 'fsl_usb2_device_register':
> drivers/usb/host/fsl-mph-dr-of.c:97: error: 'struct pdev_archdata' has no member named 'dma_mask'
> 
> Fix this error by not allowing USB_FSL_MPH_DR_OF to be selected by ARCH_MXC.

I would like to have these drivers compile on all archs, so I'm sorry
but this cannot be applied as is.

All of these stupid arch dependencies should vanish. Please fix this in
another way.

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120124/e48c8517/attachment.sig>