2010-08-13 10:21:42

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH] ARM: imx: fix build failure concerning otg/ulpi

The build failure was introduced by

13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.)

Cc: Igor Grinberg <[email protected]>
Cc: Mike Rapoport <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
arch/arm/mach-imx/mach-cpuimx27.c | 4 ++--
arch/arm/mach-imx/mach-pca100.c | 4 ++--
arch/arm/mach-mx25/mach-cpuimx25.c | 2 +-
arch/arm/mach-mx3/mach-cpuimx35.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
index 575ff1a..339150a 100644
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@ -279,13 +279,13 @@ static void __init eukrea_cpuimx27_init(void)
#if defined(CONFIG_USB_ULPI)
if (otg_mode_host) {
otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_otg_host, &otg_pdata);
}

usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_usbh2, &usbh2_pdata);
#endif
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index a389d11..23c9e1f 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -419,13 +419,13 @@ static void __init pca100_init(void)
#if defined(CONFIG_USB_ULPI)
if (otg_mode_host) {
otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_otg_host, &otg_pdata);
}

usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_usbh2, &usbh2_pdata);
#endif
diff --git a/arch/arm/mach-mx25/mach-cpuimx25.c b/arch/arm/mach-mx25/mach-cpuimx25.c
index 56b2e26..0134fb8 100644
--- a/arch/arm/mach-mx25/mach-cpuimx25.c
+++ b/arch/arm/mach-mx25/mach-cpuimx25.c
@@ -138,7 +138,7 @@ static void __init eukrea_cpuimx25_init(void)
#if defined(CONFIG_USB_ULPI)
if (otg_mode_host) {
otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ USB_OTG_DRV_VBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_otg, &otg_pdata);
}
diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-mx3/mach-cpuimx35.c
index 63f970f..117f90e 100644
--- a/arch/arm/mach-mx3/mach-cpuimx35.c
+++ b/arch/arm/mach-mx3/mach-cpuimx35.c
@@ -192,7 +192,7 @@ static void __init mxc_board_init(void)
#if defined(CONFIG_USB_ULPI)
if (otg_mode_host) {
otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ USB_OTG_DRV_VBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_otg_host, &otg_pdata);
}
--
1.7.1


2010-08-13 10:56:14

by Sergei Shtylyov

[permalink] [raw]
Subject: Re: [PATCH] ARM: imx: fix build failure concerning otg/ulpi

Hello.

Uwe Kleine-K?nig wrote:

> The build failure was introduced by
>
> 13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.)

> Cc: Igor Grinberg <[email protected]>
> Cc: Mike Rapoport <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>

Signoff is missing.


> diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
> index 575ff1a..339150a 100644
> --- a/arch/arm/mach-imx/mach-cpuimx27.c
> +++ b/arch/arm/mach-imx/mach-cpuimx27.c
> @@ -279,13 +279,13 @@ static void __init eukrea_cpuimx27_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_otg_host, &otg_pdata);
> }
>
> usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_usbh2, &usbh2_pdata);
> #endif
> diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
> index a389d11..23c9e1f 100644
> --- a/arch/arm/mach-imx/mach-pca100.c
> +++ b/arch/arm/mach-imx/mach-pca100.c
> @@ -419,13 +419,13 @@ static void __init pca100_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_otg_host, &otg_pdata);
> }
>
> usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_usbh2, &usbh2_pdata);
> #endif
> diff --git a/arch/arm/mach-mx25/mach-cpuimx25.c b/arch/arm/mach-mx25/mach-cpuimx25.c
> index 56b2e26..0134fb8 100644
> --- a/arch/arm/mach-mx25/mach-cpuimx25.c
> +++ b/arch/arm/mach-mx25/mach-cpuimx25.c
> @@ -138,7 +138,7 @@ static void __init eukrea_cpuimx25_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + USB_OTG_DRV_VBUS | ULPI_OTG_DRVVBUS_EXT);

Not ULPI_OTG_DRVVBUS, like in other cases?

>
> mxc_register_device(&mxc_otg, &otg_pdata);
> }
> diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-mx3/mach-cpuimx35.c
> index 63f970f..117f90e 100644
> --- a/arch/arm/mach-mx3/mach-cpuimx35.c
> +++ b/arch/arm/mach-mx3/mach-cpuimx35.c
> @@ -192,7 +192,7 @@ static void __init mxc_board_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + USB_OTG_DRV_VBUS | ULPI_OTG_DRVVBUS_EXT);

Same question here...

WBR, Sergei

2010-08-13 12:07:00

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi

The build failure was introduced by

13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.)

Cc: Igor Grinberg <[email protected]>
Cc: Mike Rapoport <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Uwe Kleine-König <[email protected]>
---
arch/arm/mach-imx/mach-cpuimx27.c | 4 ++--
arch/arm/mach-imx/mach-pca100.c | 4 ++--
arch/arm/mach-mx25/mach-cpuimx25.c | 2 +-
arch/arm/mach-mx3/mach-cpuimx35.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
index 575ff1a..339150a 100644
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@ -279,13 +279,13 @@ static void __init eukrea_cpuimx27_init(void)
#if defined(CONFIG_USB_ULPI)
if (otg_mode_host) {
otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_otg_host, &otg_pdata);
}

usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_usbh2, &usbh2_pdata);
#endif
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index a389d11..23c9e1f 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -419,13 +419,13 @@ static void __init pca100_init(void)
#if defined(CONFIG_USB_ULPI)
if (otg_mode_host) {
otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_otg_host, &otg_pdata);
}

usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_usbh2, &usbh2_pdata);
#endif
diff --git a/arch/arm/mach-mx25/mach-cpuimx25.c b/arch/arm/mach-mx25/mach-cpuimx25.c
index 56b2e26..a5f0174 100644
--- a/arch/arm/mach-mx25/mach-cpuimx25.c
+++ b/arch/arm/mach-mx25/mach-cpuimx25.c
@@ -138,7 +138,7 @@ static void __init eukrea_cpuimx25_init(void)
#if defined(CONFIG_USB_ULPI)
if (otg_mode_host) {
otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_otg, &otg_pdata);
}
diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-mx3/mach-cpuimx35.c
index 63f970f..9770a6a 100644
--- a/arch/arm/mach-mx3/mach-cpuimx35.c
+++ b/arch/arm/mach-mx3/mach-cpuimx35.c
@@ -192,7 +192,7 @@ static void __init mxc_board_init(void)
#if defined(CONFIG_USB_ULPI)
if (otg_mode_host) {
otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+ ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

mxc_register_device(&mxc_otg_host, &otg_pdata);
}
--
1.7.1

2010-08-15 06:06:15

by Igor Grinberg

[permalink] [raw]
Subject: Re: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi

On 08/13/10 15:06, Uwe Kleine-König wrote:
> The build failure was introduced by
>
> 13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.)
>
> Cc: Igor Grinberg <[email protected]>
> Cc: Mike Rapoport <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Uwe Kleine-König <[email protected]>
>

I've based my patches on v2.6.35-rc6, so I could not patch
those imx variants, sorry...
But I did deal with mach-pca100.c, so I think moving it from
mach-mx2 to mach-imx is what made it miss my patch.

Anyway, this looks like the right addition.

Thanks

> ---
> arch/arm/mach-imx/mach-cpuimx27.c | 4 ++--
> arch/arm/mach-imx/mach-pca100.c | 4 ++--
> arch/arm/mach-mx25/mach-cpuimx25.c | 2 +-
> arch/arm/mach-mx3/mach-cpuimx35.c | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
> index 575ff1a..339150a 100644
> --- a/arch/arm/mach-imx/mach-cpuimx27.c
> +++ b/arch/arm/mach-imx/mach-cpuimx27.c
> @@ -279,13 +279,13 @@ static void __init eukrea_cpuimx27_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_otg_host, &otg_pdata);
> }
>
> usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_usbh2, &usbh2_pdata);
> #endif
> diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
> index a389d11..23c9e1f 100644
> --- a/arch/arm/mach-imx/mach-pca100.c
> +++ b/arch/arm/mach-imx/mach-pca100.c
> @@ -419,13 +419,13 @@ static void __init pca100_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_otg_host, &otg_pdata);
> }
>
> usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_usbh2, &usbh2_pdata);
> #endif
> diff --git a/arch/arm/mach-mx25/mach-cpuimx25.c b/arch/arm/mach-mx25/mach-cpuimx25.c
> index 56b2e26..a5f0174 100644
> --- a/arch/arm/mach-mx25/mach-cpuimx25.c
> +++ b/arch/arm/mach-mx25/mach-cpuimx25.c
> @@ -138,7 +138,7 @@ static void __init eukrea_cpuimx25_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_otg, &otg_pdata);
> }
> diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-mx3/mach-cpuimx35.c
> index 63f970f..9770a6a 100644
> --- a/arch/arm/mach-mx3/mach-cpuimx35.c
> +++ b/arch/arm/mach-mx3/mach-cpuimx35.c
> @@ -192,7 +192,7 @@ static void __init mxc_board_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_otg_host, &otg_pdata);
> }
>

--
Regards,
Igor.

2010-08-16 04:53:44

by Uwe Kleine-König

[permalink] [raw]
Subject: Re: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi

Hello Igor,

On Sun, Aug 15, 2010 at 09:05:59AM +0300, Igor Grinberg wrote:
> On 08/13/10 15:06, Uwe Kleine-K?nig wrote:
> > The build failure was introduced by
> >
> > 13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.)
> >
> > Cc: Igor Grinberg <[email protected]>
> > Cc: Mike Rapoport <[email protected]>
> > Cc: Greg Kroah-Hartman <[email protected]>
> > Signed-off-by: Uwe Kleine-K?nig <[email protected]>
> >
>
> I've based my patches on v2.6.35-rc6, so I could not patch
> those imx variants, sorry...
> But I did deal with mach-pca100.c, so I think moving it from
> mach-mx2 to mach-imx is what made it miss my patch.
>
> Anyway, this looks like the right addition.
I assume this is an Ack?

Best regards
Uwe

--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |

2010-08-16 06:09:24

by Igor Grinberg

[permalink] [raw]
Subject: Re: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi

On 08/16/10 07:53, Uwe Kleine-K?nig wrote:
> Hello Igor,
>
> On Sun, Aug 15, 2010 at 09:05:59AM +0300, Igor Grinberg wrote:
>
>> On 08/13/10 15:06, Uwe Kleine-K?nig wrote:
>>
>>> The build failure was introduced by
>>>
>>> 13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.)
>>>
>>> Cc: Igor Grinberg <[email protected]>
>>> Cc: Mike Rapoport <[email protected]>
>>> Cc: Greg Kroah-Hartman <[email protected]>
>>> Signed-off-by: Uwe Kleine-K?nig <[email protected]>
>>>
>>>
>> I've based my patches on v2.6.35-rc6, so I could not patch
>> those imx variants, sorry...
>> But I did deal with mach-pca100.c, so I think moving it from
>> mach-mx2 to mach-imx is what made it miss my patch.
>>
>> Anyway, this looks like the right addition.
>>
> I assume this is an Ack?
>

Acked-by: Igor Grinberg <[email protected]>


Greg,

Can you, please, add this as a fix (maybe urgent) for build failure?

Thanks

> Best regards
> Uwe
>
>

--
Regards,
Igor.

2010-08-22 07:25:32

by Igor Grinberg

[permalink] [raw]
Subject: Re: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi

Greg,

ping...

On 08/16/10 09:09, Igor Grinberg wrote:
> On 08/16/10 07:53, Uwe Kleine-K?nig wrote:
>> Hello Igor,
>>
>> On Sun, Aug 15, 2010 at 09:05:59AM +0300, Igor Grinberg wrote:
>>
>>> On 08/13/10 15:06, Uwe Kleine-K?nig wrote:
>>>
>>>> The build failure was introduced by
>>>>
>>>> 13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.)
>>>>
>>>> Cc: Igor Grinberg <[email protected]>
>>>> Cc: Mike Rapoport <[email protected]>
>>>> Cc: Greg Kroah-Hartman <[email protected]>
>>>> Signed-off-by: Uwe Kleine-K?nig <[email protected]>
>>>>
>>>>
>>> I've based my patches on v2.6.35-rc6, so I could not patch
>>> those imx variants, sorry...
>>> But I did deal with mach-pca100.c, so I think moving it from
>>> mach-mx2 to mach-imx is what made it miss my patch.
>>>
>>> Anyway, this looks like the right addition.
>>>
>> I assume this is an Ack?
>>
> Acked-by: Igor Grinberg <[email protected]>
>
>
> Greg,
>
> Can you, please, add this as a fix (maybe urgent) for build failure?
>
> Thanks
>
>> Best regards
>> Uwe
>>
>>

--
Regards,
Igor.

2010-08-22 17:26:50

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi

On Sun, Aug 22, 2010 at 10:24:59AM +0300, Igor Grinberg wrote:
> Greg,
>
> ping...

Sorry, it's in my queue, swamped with -stable work at the moment. Will
get to Linus soon...

greg k-h