DWC2 driver should be in good enough shape to move out of staging

Signed-off-by: Paul Zimmerman <pa...@synopsys.com>
---
Greg, is this the proper method for moving a driver out of staging?

v2: Also update the MAINTAINERS entry

 MAINTAINERS                               | 2 +-
 drivers/staging/Kconfig                   | 2 --
 drivers/staging/Makefile                  | 1 -
 drivers/usb/Kconfig                       | 2 ++
 drivers/usb/Makefile                      | 1 +
 drivers/{staging => usb}/dwc2/Kconfig     | 0
 drivers/{staging => usb}/dwc2/Makefile    | 0
 drivers/{staging => usb}/dwc2/TODO        | 0
 drivers/{staging => usb}/dwc2/core.c      | 0
 drivers/{staging => usb}/dwc2/core.h      | 0
 drivers/{staging => usb}/dwc2/core_intr.c | 0
 drivers/{staging => usb}/dwc2/hcd.c       | 0
 drivers/{staging => usb}/dwc2/hcd.h       | 0
 drivers/{staging => usb}/dwc2/hcd_ddma.c  | 0
 drivers/{staging => usb}/dwc2/hcd_intr.c  | 0
 drivers/{staging => usb}/dwc2/hcd_queue.c | 0
 drivers/{staging => usb}/dwc2/hw.h        | 0
 drivers/{staging => usb}/dwc2/pci.c       | 0
 drivers/{staging => usb}/dwc2/platform.c  | 0
 19 files changed, 4 insertions(+), 4 deletions(-)
 rename drivers/{staging => usb}/dwc2/Kconfig (100%)
 rename drivers/{staging => usb}/dwc2/Makefile (100%)
 rename drivers/{staging => usb}/dwc2/TODO (100%)
 rename drivers/{staging => usb}/dwc2/core.c (100%)
 rename drivers/{staging => usb}/dwc2/core.h (100%)
 rename drivers/{staging => usb}/dwc2/core_intr.c (100%)
 rename drivers/{staging => usb}/dwc2/hcd.c (100%)
 rename drivers/{staging => usb}/dwc2/hcd.h (100%)
 rename drivers/{staging => usb}/dwc2/hcd_ddma.c (100%)
 rename drivers/{staging => usb}/dwc2/hcd_intr.c (100%)
 rename drivers/{staging => usb}/dwc2/hcd_queue.c (100%)
 rename drivers/{staging => usb}/dwc2/hw.h (100%)
 rename drivers/{staging => usb}/dwc2/pci.c (100%)
 rename drivers/{staging => usb}/dwc2/platform.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index f3ef1d1..7dcc4e3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2632,7 +2632,7 @@ DESIGNWARE USB2 DRD IP DRIVER
 M:     Paul Zimmerman <pa...@synopsys.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/dwc2/
+F:     drivers/usb/dwc2/
 
 DESIGNWARE USB3 DRD IP DRIVER
 M:     Felipe Balbi <ba...@ti.com>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 3bfdaa8..16b3a5c 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -138,8 +138,6 @@ source "drivers/staging/netlogic/Kconfig"
 
 source "drivers/staging/mt29f_spinand/Kconfig"
 
-source "drivers/staging/dwc2/Kconfig"
-
 source "drivers/staging/lustre/Kconfig"
 
 source "drivers/staging/btmtk_usb/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index b0d3303..4de06cd 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -60,7 +60,6 @@ obj-$(CONFIG_DGRP)            += dgrp/
 obj-$(CONFIG_SB105X)           += sb105x/
 obj-$(CONFIG_FIREWIRE_SERIAL)  += fwserial/
 obj-$(CONFIG_GOLDFISH)         += goldfish/
-obj-$(CONFIG_USB_DWC2)         += dwc2/
 obj-$(CONFIG_LUSTRE_FS)                += lustre/
 obj-$(CONFIG_USB_BTMTK)                += btmtk_usb/
 obj-$(CONFIG_XILLYBUS)         += xillybus/
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 2642b8a..7eb909a 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -108,6 +108,8 @@ endif
 
 source "drivers/usb/dwc3/Kconfig"
 
+source "drivers/usb/dwc2/Kconfig"
+
 source "drivers/usb/chipidea/Kconfig"
 
 comment "USB port drivers"
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 70d7c5b..1ae2bf3 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -7,6 +7,7 @@
 obj-$(CONFIG_USB)              += core/
 
 obj-$(CONFIG_USB_DWC3)         += dwc3/
+obj-$(CONFIG_USB_DWC2)         += dwc2/
 
 obj-$(CONFIG_USB_MON)          += mon/
 
diff --git a/drivers/staging/dwc2/Kconfig b/drivers/usb/dwc2/Kconfig
similarity index 100%
rename from drivers/staging/dwc2/Kconfig
rename to drivers/usb/dwc2/Kconfig
diff --git a/drivers/staging/dwc2/Makefile b/drivers/usb/dwc2/Makefile
similarity index 100%
rename from drivers/staging/dwc2/Makefile
rename to drivers/usb/dwc2/Makefile
diff --git a/drivers/staging/dwc2/TODO b/drivers/usb/dwc2/TODO
similarity index 100%
rename from drivers/staging/dwc2/TODO
rename to drivers/usb/dwc2/TODO
diff --git a/drivers/staging/dwc2/core.c b/drivers/usb/dwc2/core.c
similarity index 100%
rename from drivers/staging/dwc2/core.c
rename to drivers/usb/dwc2/core.c
diff --git a/drivers/staging/dwc2/core.h b/drivers/usb/dwc2/core.h
similarity index 100%
rename from drivers/staging/dwc2/core.h
rename to drivers/usb/dwc2/core.h
diff --git a/drivers/staging/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
similarity index 100%
rename from drivers/staging/dwc2/core_intr.c
rename to drivers/usb/dwc2/core_intr.c
diff --git a/drivers/staging/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
similarity index 100%
rename from drivers/staging/dwc2/hcd.c
rename to drivers/usb/dwc2/hcd.c
diff --git a/drivers/staging/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
similarity index 100%
rename from drivers/staging/dwc2/hcd.h
rename to drivers/usb/dwc2/hcd.h
diff --git a/drivers/staging/dwc2/hcd_ddma.c b/drivers/usb/dwc2/hcd_ddma.c
similarity index 100%
rename from drivers/staging/dwc2/hcd_ddma.c
rename to drivers/usb/dwc2/hcd_ddma.c
diff --git a/drivers/staging/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
similarity index 100%
rename from drivers/staging/dwc2/hcd_intr.c
rename to drivers/usb/dwc2/hcd_intr.c
diff --git a/drivers/staging/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c
similarity index 100%
rename from drivers/staging/dwc2/hcd_queue.c
rename to drivers/usb/dwc2/hcd_queue.c
diff --git a/drivers/staging/dwc2/hw.h b/drivers/usb/dwc2/hw.h
similarity index 100%
rename from drivers/staging/dwc2/hw.h
rename to drivers/usb/dwc2/hw.h
diff --git a/drivers/staging/dwc2/pci.c b/drivers/usb/dwc2/pci.c
similarity index 100%
rename from drivers/staging/dwc2/pci.c
rename to drivers/usb/dwc2/pci.c
diff --git a/drivers/staging/dwc2/platform.c b/drivers/usb/dwc2/platform.c
similarity index 100%
rename from drivers/staging/dwc2/platform.c
rename to drivers/usb/dwc2/platform.c
-- 
1.8.5.rc0

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to