diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2013-07-26 06:16:42 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-08-09 10:26:00 -0400 |
commit | 3fa4d7344be0afebd80382ffeea6b1787cccf971 (patch) | |
tree | 82f2a35cfb964fe6c6f3fabac51693f5c09d6e1e /arch/arm/mach-omap2/usb-host.c | |
parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) |
usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv
The "nop" driver isn't a do-nothing-stub but supports a couple functions
like clock on/off or is able to use a voltage regulator. This patch
simply renames the driver to "generic" since it is easy possible to
extend it by a simple function istead of writing a complete driver.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/usb-host.c')
-rw-r--r-- | arch/arm/mach-omap2/usb-host.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c index 2eb19d4d0aa1..e83a6a4b184a 100644 --- a/arch/arm/mach-omap2/usb-host.c +++ b/arch/arm/mach-omap2/usb-host.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
29 | #include <linux/gpio.h> | 29 | #include <linux/gpio.h> |
30 | #include <linux/usb/phy.h> | 30 | #include <linux/usb/phy.h> |
31 | #include <linux/usb/nop-usb-xceiv.h> | 31 | #include <linux/usb/usb_phy_gen_xceiv.h> |
32 | 32 | ||
33 | #include "soc.h" | 33 | #include "soc.h" |
34 | #include "omap_device.h" | 34 | #include "omap_device.h" |
@@ -349,7 +349,7 @@ static struct fixed_voltage_config hsusb_reg_config = { | |||
349 | /* .init_data filled later */ | 349 | /* .init_data filled later */ |
350 | }; | 350 | }; |
351 | 351 | ||
352 | static const char *nop_name = "nop_usb_xceiv"; /* NOP PHY driver */ | 352 | static const char *nop_name = "usb_phy_gen_xceiv"; /* NOP PHY driver */ |
353 | static const char *reg_name = "reg-fixed-voltage"; /* Regulator driver */ | 353 | static const char *reg_name = "reg-fixed-voltage"; /* Regulator driver */ |
354 | 354 | ||
355 | /** | 355 | /** |
@@ -460,9 +460,9 @@ int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys) | |||
460 | pdevinfo.name = nop_name; | 460 | pdevinfo.name = nop_name; |
461 | pdevinfo.id = phy->port; | 461 | pdevinfo.id = phy->port; |
462 | pdevinfo.data = phy->platform_data; | 462 | pdevinfo.data = phy->platform_data; |
463 | pdevinfo.size_data = sizeof(struct nop_usb_xceiv_platform_data); | 463 | pdevinfo.size_data = |
464 | 464 | sizeof(struct usb_phy_gen_xceiv_platform_data); | |
465 | scnprintf(phy_id, MAX_STR, "nop_usb_xceiv.%d", | 465 | scnprintf(phy_id, MAX_STR, "usb_phy_gen_xceiv.%d", |
466 | phy->port); | 466 | phy->port); |
467 | pdev = platform_device_register_full(&pdevinfo); | 467 | pdev = platform_device_register_full(&pdevinfo); |
468 | if (IS_ERR(pdev)) { | 468 | if (IS_ERR(pdev)) { |