diff options
author | Igor Grinberg <grinberg@compulab.co.il> | 2010-07-15 09:00:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 17:35:40 -0400 |
commit | 13dd0c9767349b280cf131c34461f85e5effc42a (patch) | |
tree | fd4571015c4ed0097fb60e9d22132ab0aac6240f /arch/arm/mach-mx3 | |
parent | 51a91a5424cb94f40eb0c9d0b71d8df4e423742a (diff) |
USB: otg/ulpi: extend the generic ulpi driver.
1) Introduce ulpi specific flags for control of the ulpi phy
2) Extend the generic ulpi driver with support for Function and
Interface control of upli phy
3) Update the platforms using the generic ulpi driver with new ulpi
flags
4) Remove the otg control flags not in use
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r-- | arch/arm/mach-mx3/mach-armadillo5x0.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mach-mx31lilly.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mach-mx31lite.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mach-mx31moboard.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mach-pcm043.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mx31moboard-smartbot.c | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-mx3/mach-armadillo5x0.c b/arch/arm/mach-mx3/mach-armadillo5x0.c index 96aadcadb4ff..68879c996a55 100644 --- a/arch/arm/mach-mx3/mach-armadillo5x0.c +++ b/arch/arm/mach-mx3/mach-armadillo5x0.c | |||
@@ -551,9 +551,9 @@ static void __init armadillo5x0_init(void) | |||
551 | /* USB */ | 551 | /* USB */ |
552 | #if defined(CONFIG_USB_ULPI) | 552 | #if defined(CONFIG_USB_ULPI) |
553 | usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 553 | usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
554 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 554 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
555 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 555 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
556 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 556 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
557 | 557 | ||
558 | mxc_register_device(&mxc_otg_host, &usbotg_pdata); | 558 | mxc_register_device(&mxc_otg_host, &usbotg_pdata); |
559 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); | 559 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); |
diff --git a/arch/arm/mach-mx3/mach-mx31lilly.c b/arch/arm/mach-mx3/mach-mx31lilly.c index 8f66f65e80e2..7c37daabb757 100644 --- a/arch/arm/mach-mx3/mach-mx31lilly.c +++ b/arch/arm/mach-mx3/mach-mx31lilly.c | |||
@@ -245,9 +245,9 @@ static struct mxc_usbh_platform_data usbh2_pdata = { | |||
245 | static void lilly1131_usb_init(void) | 245 | static void lilly1131_usb_init(void) |
246 | { | 246 | { |
247 | usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 247 | usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
248 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 248 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
249 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 249 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
250 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 250 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
251 | 251 | ||
252 | mxc_register_device(&mxc_usbh1, &usbh1_pdata); | 252 | mxc_register_device(&mxc_usbh1, &usbh1_pdata); |
253 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); | 253 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); |
diff --git a/arch/arm/mach-mx3/mach-mx31lite.c b/arch/arm/mach-mx3/mach-mx31lite.c index da236c497d2a..f66a9576d8c2 100644 --- a/arch/arm/mach-mx3/mach-mx31lite.c +++ b/arch/arm/mach-mx3/mach-mx31lite.c | |||
@@ -256,7 +256,7 @@ static void __init mxc_board_init(void) | |||
256 | #if defined(CONFIG_USB_ULPI) | 256 | #if defined(CONFIG_USB_ULPI) |
257 | /* USB */ | 257 | /* USB */ |
258 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 258 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
259 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 259 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
260 | 260 | ||
261 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); | 261 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); |
262 | #endif | 262 | #endif |
diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-mx3/mach-mx31moboard.c index 67776bc61c33..7a075e8bf2d4 100644 --- a/arch/arm/mach-mx3/mach-mx31moboard.c +++ b/arch/arm/mach-mx3/mach-mx31moboard.c | |||
@@ -412,7 +412,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = { | |||
412 | static int __init moboard_usbh2_init(void) | 412 | static int __init moboard_usbh2_init(void) |
413 | { | 413 | { |
414 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 414 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
415 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 415 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
416 | 416 | ||
417 | return mxc_register_device(&mxc_usbh2, &usbh2_pdata); | 417 | return mxc_register_device(&mxc_usbh2, &usbh2_pdata); |
418 | } | 418 | } |
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index 8a292dd1a714..214de11b20b9 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c | |||
@@ -654,13 +654,13 @@ static void __init mxc_board_init(void) | |||
654 | #if defined(CONFIG_USB_ULPI) | 654 | #if defined(CONFIG_USB_ULPI) |
655 | if (otg_mode_host) { | 655 | if (otg_mode_host) { |
656 | otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 656 | otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
657 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 657 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
658 | 658 | ||
659 | mxc_register_device(&mxc_otg_host, &otg_pdata); | 659 | mxc_register_device(&mxc_otg_host, &otg_pdata); |
660 | } | 660 | } |
661 | 661 | ||
662 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 662 | usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
663 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 663 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
664 | 664 | ||
665 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); | 665 | mxc_register_device(&mxc_usbh2, &usbh2_pdata); |
666 | #endif | 666 | #endif |
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c index 47f5311b301a..28886f0e62f9 100644 --- a/arch/arm/mach-mx3/mach-pcm043.c +++ b/arch/arm/mach-mx3/mach-pcm043.c | |||
@@ -378,7 +378,7 @@ static void __init mxc_board_init(void) | |||
378 | #if defined(CONFIG_USB_ULPI) | 378 | #if defined(CONFIG_USB_ULPI) |
379 | if (otg_mode_host) { | 379 | if (otg_mode_host) { |
380 | otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 380 | otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
381 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 381 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
382 | 382 | ||
383 | mxc_register_device(&mxc_otg_host, &otg_pdata); | 383 | mxc_register_device(&mxc_otg_host, &otg_pdata); |
384 | } | 384 | } |
diff --git a/arch/arm/mach-mx3/mx31moboard-smartbot.c b/arch/arm/mach-mx3/mx31moboard-smartbot.c index 40c3e7564cb6..417757e78c65 100644 --- a/arch/arm/mach-mx3/mx31moboard-smartbot.c +++ b/arch/arm/mach-mx3/mx31moboard-smartbot.c | |||
@@ -134,7 +134,7 @@ static struct mxc_usbh_platform_data otg_host_pdata = { | |||
134 | static int __init smartbot_otg_host_init(void) | 134 | static int __init smartbot_otg_host_init(void) |
135 | { | 135 | { |
136 | otg_host_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, | 136 | otg_host_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, |
137 | USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT); | 137 | ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); |
138 | 138 | ||
139 | return mxc_register_device(&mxc_otg_host, &otg_host_pdata); | 139 | return mxc_register_device(&mxc_otg_host, &otg_host_pdata); |
140 | } | 140 | } |