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>
(cherry picked from commit 8dc0fda6e5246450c688e2d3e09f9834a4323e01)

5 files changed, 10 insertions, 9 deletions

diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile
index 9b320d1a11fd..752646167e1e 100644
--- 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 b/drivers/usb/common/usb-otg-fsm.c
index f51dc5e9a23b..f51dc5e9a23b 100644
--- a/drivers/usb/phy/phy-fsm-usb.c
+++ b/drivers/usb/common/usb-otg-fsm.c
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index db535b0aa172..73bd77cf075a 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -89,3 +89,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
index a13631d11083..9883d2e1b495 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -6,14 +6,6 @@ menu "USB Physical Layer drivers"
 config USB_PHY
         def_bool n
 
-config USB_OTG_FSM
-        bool "USB 2.0 OTG FSM implementation"
-        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
index fee33f6a315e..d8ee9f743479 100644
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -6,7 +6,6 @@ ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
 
 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