diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 11:22:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 11:22:30 -0700 |
| commit | a7c6d4fb3ad0fde884f9a83d33cae3bcb55a30e5 (patch) | |
| tree | d10b7a023d1b667098fbb7e1ffe33a4d863c2040 /usb/usb-otg-ulpi-extend-the-generic-ulpi-driver.patch | |
| parent | 147c7b894ea67c33a6524f8ce14a47288d0ac371 (diff) | |
| download | patches-a7c6d4fb3ad0fde884f9a83d33cae3bcb55a30e5.tar.gz | |
2.6.35-git2
Diffstat (limited to 'usb/usb-otg-ulpi-extend-the-generic-ulpi-driver.patch')
| -rw-r--r-- | usb/usb-otg-ulpi-extend-the-generic-ulpi-driver.patch | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/usb/usb-otg-ulpi-extend-the-generic-ulpi-driver.patch b/usb/usb-otg-ulpi-extend-the-generic-ulpi-driver.patch index 558d41bf0ed445..6ecdad59244d69 100644 --- a/usb/usb-otg-ulpi-extend-the-generic-ulpi-driver.patch +++ b/usb/usb-otg-ulpi-extend-the-generic-ulpi-driver.patch @@ -22,7 +22,6 @@ Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - arch/arm/mach-mx2/mach-pca100.c | 4 arch/arm/mach-mx3/mach-armadillo5x0.c | 4 arch/arm/mach-mx3/mach-mx31lilly.c | 4 arch/arm/mach-mx3/mach-mx31lite.c | 2 @@ -33,29 +32,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/otg/ulpi.c | 127 ++++++++++++++++++++++++++++--- include/linux/usb/otg.h | 7 - include/linux/usb/ulpi.h | 39 +++++++++ - 11 files changed, 168 insertions(+), 29 deletions(-) + 10 files changed, 166 insertions(+), 27 deletions(-) ---- a/arch/arm/mach-mx2/mach-pca100.c -+++ b/arch/arm/mach-mx2/mach-pca100.c -@@ -357,13 +357,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 --- a/arch/arm/mach-mx3/mach-armadillo5x0.c +++ b/arch/arm/mach-mx3/mach-armadillo5x0.c -@@ -552,9 +552,9 @@ static void __init armadillo5x0_init(voi +@@ -551,9 +551,9 @@ static void __init armadillo5x0_init(voi /* USB */ #if defined(CONFIG_USB_ULPI) usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, @@ -69,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> mxc_register_device(&mxc_usbh2, &usbh2_pdata); --- a/arch/arm/mach-mx3/mach-mx31lilly.c +++ b/arch/arm/mach-mx3/mach-mx31lilly.c -@@ -249,9 +249,9 @@ static struct mxc_usbh_platform_data usb +@@ -245,9 +245,9 @@ static struct mxc_usbh_platform_data usb static void lilly1131_usb_init(void) { usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, @@ -83,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> mxc_register_device(&mxc_usbh2, &usbh2_pdata); --- a/arch/arm/mach-mx3/mach-mx31lite.c +++ b/arch/arm/mach-mx3/mach-mx31lite.c -@@ -261,7 +261,7 @@ static void __init mxc_board_init(void) +@@ -256,7 +256,7 @@ static void __init mxc_board_init(void) #if defined(CONFIG_USB_ULPI) /* USB */ usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, @@ -94,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- a/arch/arm/mach-mx3/mach-mx31moboard.c +++ b/arch/arm/mach-mx3/mach-mx31moboard.c -@@ -405,7 +405,7 @@ static struct mxc_usbh_platform_data usb +@@ -412,7 +412,7 @@ static struct mxc_usbh_platform_data usb static int __init moboard_usbh2_init(void) { usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, @@ -105,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c -@@ -658,13 +658,13 @@ static void __init mxc_board_init(void) +@@ -654,13 +654,13 @@ 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, @@ -123,7 +104,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- a/arch/arm/mach-mx3/mach-pcm043.c +++ b/arch/arm/mach-mx3/mach-pcm043.c -@@ -380,7 +380,7 @@ static void __init mxc_board_init(void) +@@ -378,7 +378,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, @@ -134,7 +115,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/arch/arm/mach-mx3/mx31moboard-smartbot.c +++ b/arch/arm/mach-mx3/mx31moboard-smartbot.c -@@ -138,7 +138,7 @@ static struct mxc_usbh_platform_data otg +@@ -134,7 +134,7 @@ static struct mxc_usbh_platform_data otg static int __init smartbot_otg_host_init(void) { otg_host_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |