[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4C65246E.1000906@ru.mvista.com>
Date: Fri, 13 Aug 2010 14:54:38 +0400
From: Sergei Shtylyov <sshtylyov@...sta.com>
To: Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>
CC: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
linux-usb@...r.kernel.org, Igor Grinberg <grinberg@...pulab.co.il>,
Mike Rapoport <mike@...pulab.co.il>,
Greg Kroah-Hartman <gregkh@...e.de>
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 <grinberg@...pulab.co.il>
> Cc: Mike Rapoport <mike@...pulab.co.il>
> Cc: Greg Kroah-Hartman <gregkh@...e.de>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists