diff options
author | Pavankumar Kondeti <pkondeti@codeaurora.org> | 2011-03-04 12:15:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 15:15:21 -0500 |
commit | dfb2130c453c2c6d36b5e0f39eca289cbdbb631d (patch) | |
tree | c1bf393818c782c06b968c9a3a8a595df1de42c8 | |
parent | d3cf2a8d4ddd121dbf4ad48c995648af04e0cfbf (diff) |
USB: Rename "msm72k_otg.c" to "msm_otg.c"
This driver is used across all MSM SoCs. Hence give a generic name.
All Functions and strutures are also using "msm_otg" as prefix.
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/gadget/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/host/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/otg/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/otg/Makefile | 2 | ||||
-rw-r--r-- | drivers/usb/otg/msm_otg.c (renamed from drivers/usb/otg/msm72k_otg.c) | 0 | ||||
-rw-r--r-- | include/linux/usb/msm_hsusb.h | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 99ed91c7cdc6..bfde50e20b30 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
@@ -552,7 +552,7 @@ config USB_GADGET_CI13XXX_MSM | |||
552 | boolean "MIPS USB CI13xxx for MSM" | 552 | boolean "MIPS USB CI13xxx for MSM" |
553 | depends on ARCH_MSM | 553 | depends on ARCH_MSM |
554 | select USB_GADGET_DUALSPEED | 554 | select USB_GADGET_DUALSPEED |
555 | select USB_MSM_OTG_72K | 555 | select USB_MSM_OTG |
556 | help | 556 | help |
557 | MSM SoC has chipidea USB controller. This driver uses | 557 | MSM SoC has chipidea USB controller. This driver uses |
558 | ci13xxx_udc core. | 558 | ci13xxx_udc core. |
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 9116d30bcdac..b5a908eacb82 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -156,7 +156,7 @@ config USB_EHCI_MSM | |||
156 | bool "Support for MSM on-chip EHCI USB controller" | 156 | bool "Support for MSM on-chip EHCI USB controller" |
157 | depends on USB_EHCI_HCD && ARCH_MSM | 157 | depends on USB_EHCI_HCD && ARCH_MSM |
158 | select USB_EHCI_ROOT_HUB_TT | 158 | select USB_EHCI_ROOT_HUB_TT |
159 | select USB_MSM_OTG_72K | 159 | select USB_MSM_OTG |
160 | ---help--- | 160 | ---help--- |
161 | Enables support for the USB Host controller present on the | 161 | Enables support for the USB Host controller present on the |
162 | Qualcomm chipsets. Root Hub has inbuilt TT. | 162 | Qualcomm chipsets. Root Hub has inbuilt TT. |
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig index 9ffc8237fb4b..ceb24fee2eac 100644 --- a/drivers/usb/otg/Kconfig +++ b/drivers/usb/otg/Kconfig | |||
@@ -93,7 +93,7 @@ config USB_LANGWELL_OTG | |||
93 | To compile this driver as a module, choose M here: the | 93 | To compile this driver as a module, choose M here: the |
94 | module will be called langwell_otg. | 94 | module will be called langwell_otg. |
95 | 95 | ||
96 | config USB_MSM_OTG_72K | 96 | config USB_MSM_OTG |
97 | tristate "OTG support for Qualcomm on-chip USB controller" | 97 | tristate "OTG support for Qualcomm on-chip USB controller" |
98 | depends on (USB || USB_GADGET) && ARCH_MSM | 98 | depends on (USB || USB_GADGET) && ARCH_MSM |
99 | select USB_OTG_UTILS | 99 | select USB_OTG_UTILS |
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile index a520e715cfd6..e516894260bf 100644 --- a/drivers/usb/otg/Makefile +++ b/drivers/usb/otg/Makefile | |||
@@ -16,5 +16,5 @@ obj-$(CONFIG_TWL6030_USB) += twl6030-usb.o | |||
16 | obj-$(CONFIG_USB_LANGWELL_OTG) += langwell_otg.o | 16 | obj-$(CONFIG_USB_LANGWELL_OTG) += langwell_otg.o |
17 | obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o | 17 | obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o |
18 | obj-$(CONFIG_USB_ULPI) += ulpi.o | 18 | obj-$(CONFIG_USB_ULPI) += ulpi.o |
19 | obj-$(CONFIG_USB_MSM_OTG_72K) += msm72k_otg.o | 19 | obj-$(CONFIG_USB_MSM_OTG) += msm_otg.o |
20 | obj-$(CONFIG_AB8500_USB) += ab8500-usb.o | 20 | obj-$(CONFIG_AB8500_USB) += ab8500-usb.o |
diff --git a/drivers/usb/otg/msm72k_otg.c b/drivers/usb/otg/msm_otg.c index 296598628b85..296598628b85 100644 --- a/drivers/usb/otg/msm72k_otg.c +++ b/drivers/usb/otg/msm_otg.c | |||
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h index 3675e03b1539..3657403eac18 100644 --- a/include/linux/usb/msm_hsusb.h +++ b/include/linux/usb/msm_hsusb.h | |||
@@ -55,7 +55,7 @@ enum otg_control_type { | |||
55 | 55 | ||
56 | /** | 56 | /** |
57 | * struct msm_otg_platform_data - platform device data | 57 | * struct msm_otg_platform_data - platform device data |
58 | * for msm72k_otg driver. | 58 | * for msm_otg driver. |
59 | * @phy_init_seq: PHY configuration sequence. val, reg pairs | 59 | * @phy_init_seq: PHY configuration sequence. val, reg pairs |
60 | * terminated by -1. | 60 | * terminated by -1. |
61 | * @vbus_power: VBUS power on/off routine. | 61 | * @vbus_power: VBUS power on/off routine. |