Home » Mailing list archives » linux-kernel » 2010 » August » 15

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

Previous thread: 12fdff3fc2483f906ae6404a6e8dcf2550310b6f - Add a dummy printk function for the maintenance of unused printks by Michal Simek on Friday, August 13, 2010 - 3:13 am. (1 message)

Next thread: fix BUG: using smp_processor_id() in touch_nmi_watchdog and touch_softlockup_watchdog by Sergey Senozhatsky on Friday, August 13, 2010 - 3:21 am. (41 messages)
[view original message]
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?=
Subject: [PATCH] ARM: imx: fix build failure concerning otg/ulpi
Date: Friday, August 13, 2010 - 3:21 am

The build failure was introduced by

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

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Mike Rapoport <mike@compulab.co.il>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
---
 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 ...
[ message continues ]
[view original message]
From: Sergei Shtylyov
Subject: Re: [PATCH] ARM: imx: fix build failure concerning otg/ulpi
Date: Friday, August 13, 2010 - 3:54 am

Hello.




    Same question here...

WBR, Sergei

--


[ message continues ]
[view original message]
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?=
Subject: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi
Date: Friday, August 13, 2010 - 5:06 am

The build failure was introduced by

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

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Mike Rapoport <mike@compulab.co.il>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 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 ...
[ message continues ]
[view original message]
From: Igor Grinberg
Subject: Re: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi
Date: Saturday, August 14, 2010 - 11:05 pm

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.


-- 
Regards,
Igor.

--


[ message continues ]
[view original message]
From: Uwe Kleine-König
Subject: Re: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi
Date: Sunday, August 15, 2010 - 9:53 pm

Hello Igor,

I assume this is an Ack?

Best regards
Uwe

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


[ message continues ]
[view original message]
From: Igor Grinberg
Subject: Re: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi
Date: Sunday, August 15, 2010 - 11:09 pm

Acked-by: Igor Grinberg <grinberg@compulab.co.il>


Greg,

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


-- 
Regards,
Igor.

--


[ message continues ]
[view original message]
From: Igor Grinberg
Subject: Re: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi
Date: Sunday, August 22, 2010 - 12:24 am

Greg,

ping...


-- 
Regards,
Igor.

--


[ message continues ]
[view original message]
From: Greg KH
Subject: Re: [PATCH v2] ARM: imx: fix build failure concerning otg/ulpi
Date: Sunday, August 22, 2010 - 10:10 am

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

greg k-h
--


[ message continues ]
Previous thread: 12fdff3fc2483f906ae6404a6e8dcf2550310b6f - Add a dummy printk function for the maintenance of unused printks by Michal Simek on Friday, August 13, 2010 - 3:13 am. (1 message)

Next thread: fix BUG: using smp_processor_id() in touch_nmi_watchdog and touch_softlockup_watchdog by Sergey Senozhatsky on Friday, August 13, 2010 - 3:21 am. (41 messages)