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>

diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile
index 9b320d1a11fdbf501f86cb4e58e7213bac37e01d..752646167e1e469dffaa2f47604611b70aad9c80 100644 (file)
--- 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
similarity index 100%
rename from drivers/usb/phy/phy-fsm-usb.c
rename to drivers/usb/common/usb-otg-fsm.c

diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 9519878587f666e3125cf5b5a89409435c3f3de4..1060657ca1b01c77acf57abae20e6037fc2cb90a 100644 (file)
--- 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
index 4c35d6176735193fd9269a90c8092047aa7f9cc6..c9950becb7e07463d40ff89a0cbfb1ab8cc30854 100644 (file)
--- 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
index a2d05690d9255c440b8d3cf5e273d5bf1cd9966d..24a91332d4ad4dff7076f1e7ae98864626349f36 100644 (file)
--- 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