usb: common: rename phy-fsm-usb.c to usb-otg-fsm.c

Since usb otg fsm implementation is not related to usb phy. We move it from usb/phy/ to usb/common/, and rename it to reflect its real meaning. Cc: Felipe Balbi <balbi@ti.com> Signed-off-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mariux64 · May 27, 2014 · 1dfa91a · 1dfa91a
1 parent f4cbd33
commit 1dfa91a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile
@@ -3,3 +3,4 @@
 #
 
 obj-$(CONFIG_USB_COMMON) += usb-common.o
+obj-$(CONFIG_USB_OTG_FSM) += usb-otg-fsm.o
diff --git a/drivers/usb/phy/phy-fsm-usb.c → drivers/usb/common/usb-otg-fsm.c b/drivers/usb/phy/phy-fsm-usb.c → drivers/usb/common/usb-otg-fsm.c
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
@@ -81,3 +81,12 @@ config USB_OTG_BLACKLIST_HUB
 	  and software costs by not supporting external hubs.  So
 	  are "Embedded Hosts" that don't offer OTG support.
 
+config USB_OTG_FSM
+	tristate "USB 2.0 OTG FSM implementation"
+	depends on USB
+	select USB_OTG
+	select USB_PHY
+	help
+	  Implements OTG Finite State Machine as specified in On-The-Go
+	  and Embedded Host Supplement to the USB Revision 2.0 Specification.
+
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
@@ -6,15 +6,6 @@ menu "USB Physical Layer drivers"
 config USB_PHY
 	def_bool n
 
-config USB_OTG_FSM
-	tristate "USB 2.0 OTG FSM implementation"
-	depends on USB
-	select USB_OTG
-	select USB_PHY
-	help
-	  Implements OTG Final State Machine as specified in On-The-Go
-	  and Embedded Host Supplement to the USB Revision 2.0 Specification.
-
 #
 # USB Transceiver Drivers
 #

diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
@@ -3,7 +3,6 @@
 #
 obj-$(CONFIG_USB_PHY)			+= phy.o
 obj-$(CONFIG_OF)			+= of.o
-obj-$(CONFIG_USB_OTG_FSM)		+= phy-fsm-usb.o
 
 # transceiver drivers, keep the list sorted