[PATCH v4] Move DWC2 driver out of staging
Paul Zimmerman
Paul.Zimmerman at synopsys.com
Mon Jan 13 21:50:09 UTC 2014
The DWC2 driver should now be in good enough shape to move out of
staging. I have stress tested it overnight on RPI running mass
storage and Ethernet transfers in parallel, and for several days
on our proprietary PCI-based platform.
Signed-off-by: Paul Zimmerman <paulz at synopsys.com>
---
v4: Also change directory path in MAINTAINERS
Greg,
I believe I have addressed all of the feedback since I last
submitted this. Is there still time to do this before you
close your trees?
MAINTAINERS | 2 +-
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/dwc2/TODO | 33 -------------------------------
drivers/usb/Kconfig | 2 ++
drivers/usb/Makefile | 1 +
drivers/{staging => usb}/dwc2/Kconfig | 0
drivers/{staging => usb}/dwc2/Makefile | 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(+), 37 deletions(-)
delete mode 100644 drivers/staging/dwc2/TODO
rename drivers/{staging => usb}/dwc2/Kconfig (100%)
rename drivers/{staging => usb}/dwc2/Makefile (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 d5e4ff3..d3303eb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2635,7 +2635,7 @@ DESIGNWARE USB2 DRD IP DRIVER
M: Paul Zimmerman <paulz at synopsys.com>
L: linux-usb at vger.kernel.org
S: Maintained
-F: drivers/staging/dwc2/
+F: drivers/usb/dwc2/
DESIGNWARE USB3 DRD IP DRIVER
M: Felipe Balbi <balbi at ti.com>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index d2beb07..4bb6b11 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -140,8 +140,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/xillybus/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index bf62386..9f07e5e 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -61,7 +61,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_XILLYBUS) += xillybus/
obj-$(CONFIG_DGNC) += dgnc/
diff --git a/drivers/staging/dwc2/TODO b/drivers/staging/dwc2/TODO
deleted file mode 100644
index 282470d..0000000
--- a/drivers/staging/dwc2/TODO
+++ /dev/null
@@ -1,33 +0,0 @@
-TODO:
- - Dan Carpenter would like to see some cleanups to the microframe
- scheduler code:
- http://www.mail-archive.com/linux-usb@vger.kernel.org/msg26650.html
-
- - Should merge the NAK holdoff patch from Raspberry Pi
- (http://marc.info/?l=linux-usb&m=137625067103833). But as it stands
- that patch is incomplete, it needs more investigation to see if it
- can be made to work for non-Raspberry Pi platforms that lack the
- special FIQ interrupt that the Pi has. Without this patch, the driver
- has a high interrupt rate (8K/sec).
-
- - The Raspberry Pi platform needs to have support for its FIQ interrupt
- added, to get the same level of functionality as the downstream
- driver. The raspberrypi.org developers have indicated they are
- willing to help with that.
-
- - Some of the default driver parameters (see 'struct dwc2_core_params'
- in core.h) won't work for many platforms. So DT attributes will need
- to be added for some of these. But that can be done as-needed as new
- platforms are added.
-
- - Eventually the driver should be merged with the s3c-hsotg peripheral
- mode driver, so that both modes of operation can be supported with a
- single driver. But I think that can wait till after the driver has
- been moved to mainline.
-
- - After that, OTG support can be added. I'm not sure how much demand
- there is for that, though, so I have that as a low priority.
-
-Please send any patches for this driver to Paul Zimmerman <paulz at synopsys.com>
-and Greg Kroah-Hartman <gregkh at linuxfoundation.org>. And please CC linux-usb
-<linux-usb at vger.kernel.org> too.
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/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
More information about the devel
mailing list