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.
Signed-off-by: Peter Chen <[email protected]> --- drivers/usb/common/Makefile | 1 + .../{phy/phy-fsm-usb.c => common/usb-otg-fsm.c} | 0 drivers/usb/core/Kconfig | 9 +++++++++ drivers/usb/phy/Kconfig | 9 --------- drivers/usb/phy/Makefile | 1 - 5 files changed, 10 insertions(+), 10 deletions(-) rename drivers/usb/{phy/phy-fsm-usb.c => common/usb-otg-fsm.c} (100%) diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile index 9b320d1..7526461 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 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 9519878..8d18eba 100644 --- 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 Final 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 33dd6a6..d027a19 100644 --- 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 a2d0569..24a9133 100644 --- 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 -- 1.7.8 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
