staging:fsl-mc: Move DPIO out of staging

Move the DPIO driver out of the staging directory and into drivers/soc/fsl

---
 MAINTAINERS                                     |    2 +-
 drivers/soc/fsl/Makefile                        |    1 +
 drivers/soc/fsl/dpio/Makefile                   |    8 +
 drivers/soc/fsl/dpio/dpio-cmd.h                 |   49 ++
 drivers/soc/fsl/dpio/dpio-driver.c              |  271 ++++++
 drivers/soc/fsl/dpio/dpio-driver.txt            |  135 +++
 drivers/soc/fsl/dpio/dpio-service.c             |  545 ++++++++++++
 drivers/soc/fsl/dpio/dpio.c                     |  198 +++++
 drivers/soc/fsl/dpio/dpio.h                     |   83 ++
 drivers/soc/fsl/dpio/qbman-portal.c             | 1005 +++++++++++++++++++++++
 drivers/soc/fsl/dpio/qbman-portal.h             |  444 ++++++++++
 drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h  |    4 +-
 drivers/staging/fsl-mc/bus/Makefile             |    2 -
 drivers/staging/fsl-mc/bus/dpio/Makefile        |    8 -
 drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h      |   49 --
 drivers/staging/fsl-mc/bus/dpio/dpio-driver.c   |  271 ------
 drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt |  135 ---
 drivers/staging/fsl-mc/bus/dpio/dpio-service.c  |  545 ------------
 drivers/staging/fsl-mc/bus/dpio/dpio.c          |  198 -----
 drivers/staging/fsl-mc/bus/dpio/dpio.h          |   83 --
 drivers/staging/fsl-mc/bus/dpio/qbman-portal.c  | 1005 -----------------------
 drivers/staging/fsl-mc/bus/dpio/qbman-portal.h  |  444 ----------
 drivers/staging/fsl-mc/include/dpaa2-fd.h       |  426 ----------
 drivers/staging/fsl-mc/include/dpaa2-global.h   |  177 ----
 drivers/staging/fsl-mc/include/dpaa2-io.h       |  115 ---
 include/soc/fsl/dpaa2-fd.h                      |  426 ++++++++++
 include/soc/fsl/dpaa2-global.h                  |  177 ++++
 include/soc/fsl/dpaa2-io.h                      |  115 +++
 28 files changed, 3460 insertions(+), 3461 deletions(-)
 create mode 100644 drivers/soc/fsl/dpio/Makefile
 create mode 100644 drivers/soc/fsl/dpio/dpio-cmd.h
 create mode 100644 drivers/soc/fsl/dpio/dpio-driver.c
 create mode 100644 drivers/soc/fsl/dpio/dpio-driver.txt
 create mode 100644 drivers/soc/fsl/dpio/dpio-service.c
 create mode 100644 drivers/soc/fsl/dpio/dpio.c
 create mode 100644 drivers/soc/fsl/dpio/dpio.h
 create mode 100644 drivers/soc/fsl/dpio/qbman-portal.c
 create mode 100644 drivers/soc/fsl/dpio/qbman-portal.h
 delete mode 100644 drivers/staging/fsl-mc/bus/dpio/Makefile
 delete mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h
 delete mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-driver.c
 delete mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt
 delete mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-service.c
 delete mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio.c
 delete mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio.h
 delete mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.c
 delete mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.h
 delete mode 100644 drivers/staging/fsl-mc/include/dpaa2-fd.h
 delete mode 100644 drivers/staging/fsl-mc/include/dpaa2-global.h
 delete mode 100644 drivers/staging/fsl-mc/include/dpaa2-io.h
 create mode 100644 include/soc/fsl/dpaa2-fd.h
 create mode 100644 include/soc/fsl/dpaa2-global.h
 create mode 100644 include/soc/fsl/dpaa2-io.h

index 3057761..3fdaade 100644
@@ -4436,7 +4436,7 @@ DPAA2 DATAPATH I/O (DPIO) DRIVER
 M:	Roy Pledge <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	drivers/staging/fsl-mc/bus/dpio
+F:	drivers/soc/fsl/dpio
 
 DPAA2 ETHERNET DRIVER
 M:	Ioana Radulescu <[email protected]>

index 44b3beb..803ef1b 100644
@@ -6,3 +6,4 @@ obj-$(CONFIG_FSL_DPAA)                 += qbman/
 obj-$(CONFIG_QUICC_ENGINE)		+= qe/
 obj-$(CONFIG_CPM)			+= qe/
 obj-$(CONFIG_FSL_GUTS)			+= guts.o
+obj-$(CONFIG_FSL_MC_DPIO) 		+= dpio/

new file mode 100644
index 0000000..b9ff24c
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# QorIQ DPAA2 DPIO driver
+#
+
+obj-$(CONFIG_FSL_MC_DPIO) += fsl-mc-dpio.o
+
+fsl-mc-dpio-objs := dpio.o qbman-portal.o dpio-service.o dpio-driver.o

index e577410..c421733 100644
@@ -36,8 +36,8 @@
 #include <linux/netdevice.h>
 #include <linux/if_vlan.h>
 
-#include "../../fsl-mc/include/dpaa2-io.h"
-#include "../../fsl-mc/include/dpaa2-fd.h"
+#include <soc/fsl/dpaa2-io.h>
+#include <soc/fsl/dpaa2-fd.h>
 #include "../../fsl-mc/include/dpbp.h"
 #include "../../fsl-mc/include/dpcon.h"
 #include "dpni.h"

index b67889e..4a3cb8b 100644
@@ -7,5 +7,3 @@
 obj-$(CONFIG_FSL_MC_BUS) += dpbp.o \
 			    dpcon.o
 
-# MC DPIO driver
-obj-$(CONFIG_FSL_MC_DPIO) += dpio/

deleted file mode 100644
index b9ff24c..0000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# QorIQ DPAA2 DPIO driver
-#
-
-obj-$(CONFIG_FSL_MC_DPIO) += fsl-mc-dpio.o
-
-fsl-mc-dpio-objs := dpio.o qbman-portal.o dpio-service.o dpio-driver.o

2.7.4

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Part of the diff is not shown here. View the raw message.