| Message ID | 20180705194113.16256-2-roy.pledge@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Roy, Couple of comments inline. On 05.07.2018 22:41, Roy Pledge wrote: > Move the NXP DPIO (Datapath I/O Driver) out of the > drivers/staging directory and into the drivers/soc/fsl directory. > > The DPIO driver enables access to Queue and Buffer Manager (QBMAN) > hardware on NXP DPAA2 devices. This is a prerequisite to moving the > DPAA2 Ethernet driver out of staging. > > Signed-off-by: Roy Pledge <roy.pledge@nxp.com> > --- > MAINTAINERS | 2 +- > drivers/crypto/caam/sg_sw_qm2.h | 2 +- > drivers/crypto/caam/sg_sw_sec4.h | 2 +- > drivers/soc/fsl/Kconfig | 10 ++++++++++ > drivers/soc/fsl/Makefile | 1 + > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0 > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h | 0 > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +- > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0 Maybe this should be converted to .rst and go in the already existing Documentation/networking/dpaa2/? > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c | 2 +- > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c | 0 > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h | 0 > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c | 2 +- > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h | 2 +- > drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++-- > drivers/staging/fsl-mc/bus/Kconfig | 9 --------- > drivers/staging/fsl-mc/bus/Makefile | 2 -- > {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0 > .../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0 > {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0 > 20 files changed, 20 insertions(+), 20 deletions(-) > rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile (100%) > rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h (100%) > rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c (99%) > rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt (100%) > rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c (99%) > rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c (100%) > rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h (100%) > rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c (99%) > rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h (99%) > rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (100%) > rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h (100%) > rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h (100%) I received feedback in the past on mc-bus that a driver should limit to only one public header and one private one. Would it make sense to do the same for dpio too? --- Best Regards, Laurentiu
On 7/9/2018 6:37 AM, Laurentiu Tudor wrote: > Hi Roy, > > Couple of comments inline. > > On 05.07.2018 22:41, Roy Pledge wrote: >> Move the NXP DPIO (Datapath I/O Driver) out of the >> drivers/staging directory and into the drivers/soc/fsl directory. >> >> The DPIO driver enables access to Queue and Buffer Manager (QBMAN) >> hardware on NXP DPAA2 devices. This is a prerequisite to moving the >> DPAA2 Ethernet driver out of staging. >> >> Signed-off-by: Roy Pledge <roy.pledge@nxp.com> >> --- >> MAINTAINERS | 2 +- >> drivers/crypto/caam/sg_sw_qm2.h | 2 +- >> drivers/crypto/caam/sg_sw_sec4.h | 2 +- >> drivers/soc/fsl/Kconfig | 10 ++++++++++ >> drivers/soc/fsl/Makefile | 1 + >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0 >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h | 0 >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +- >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0 > Maybe this should be converted to .rst and go in the already existing > Documentation/networking/dpaa2/? I can look into converting this to RST but I'm not sure it belongs in the networking documentation folder since it will be used by other non networking drivers in the near future - compress/decompress for example. > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c | 2 +- >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c | 0 >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h | 0 >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c | 2 +- >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h | 2 +- >> drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++-- >> drivers/staging/fsl-mc/bus/Kconfig | 9 --------- >> drivers/staging/fsl-mc/bus/Makefile | 2 -- >> {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0 >> .../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0 >> {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0 >> 20 files changed, 20 insertions(+), 20 deletions(-) >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile (100%) >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h (100%) >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c (99%) >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt (100%) >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c (99%) >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c (100%) >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h (100%) >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c (99%) >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h (99%) >> rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (100%) >> rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h (100%) >> rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h (100%) > I received feedback in the past on mc-bus that a driver should limit to > only one public header and one private one. Would it make sense to do > the same for dpio too? Looking at this the dpaa-2global.h file should probably be integrated into the dpaa2-io.h file. The dpaaa2-fd.h can be used by devices that don't need to used DPIO - the definition of a frame descriptor isn't DPIO specific so I would argue it should be kept in a seperate file. > > --- > Best Regards, Laurentiu
> -----Original Message----- > From: Roy Pledge > Sent: Monday, July 9, 2018 10:24 AM > To: Laurentiu Tudor <laurentiu.tudor@nxp.com>; > devel@driverdev.osuosl.org; linux-arm-kernel@lists.infradead.org; > gregkh@linuxfoundation.org; Leo Li <leoyang.li@nxp.com> > Cc: Ioana Ciocoi Radulescu <ruxandra.radulescu@nxp.com>; Horia Geanta > <horia.geanta@nxp.com>; linux-kernel@vger.kernel.org; arnd@arndb.de; > catalin.marinas@arm.com; robin.murphy@arm.com > Subject: Re: [PATCH 1/2] staging:fsl-mc: Move DPIO from staging to > drivers/soc/fsl > > On 7/9/2018 6:37 AM, Laurentiu Tudor wrote: > > Hi Roy, > > > > Couple of comments inline. > > > > On 05.07.2018 22:41, Roy Pledge wrote: > >> Move the NXP DPIO (Datapath I/O Driver) out of the drivers/staging > >> directory and into the drivers/soc/fsl directory. > >> > >> The DPIO driver enables access to Queue and Buffer Manager (QBMAN) > >> hardware on NXP DPAA2 devices. This is a prerequisite to moving the > >> DPAA2 Ethernet driver out of staging. > >> > >> Signed-off-by: Roy Pledge <roy.pledge@nxp.com> > >> --- > >> MAINTAINERS | 2 +- > >> drivers/crypto/caam/sg_sw_qm2.h | 2 +- > >> drivers/crypto/caam/sg_sw_sec4.h | 2 +- > >> drivers/soc/fsl/Kconfig | 10 ++++++++++ > >> drivers/soc/fsl/Makefile | 1 + > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0 > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h | 0 > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +- > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0 > > Maybe this should be converted to .rst and go in the already existing > > Documentation/networking/dpaa2/? > > I can look into converting this to RST but I'm not sure it belongs in the > networking documentation folder since it will be used by other non > networking drivers in the near future - compress/decompress for example. > > > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c | 2 +- > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c | 0 > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h | 0 > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c | 2 +- > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h | 2 +- > >> drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++-- > >> drivers/staging/fsl-mc/bus/Kconfig | 9 --------- > >> drivers/staging/fsl-mc/bus/Makefile | 2 -- > >> {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0 > >> .../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0 > >> {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0 > >> 20 files changed, 20 insertions(+), 20 deletions(-) > >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile (100%) > >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h (100%) > >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c (99%) > >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt > (100%) > >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c (99%) > >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c (100%) > >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h (100%) > >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c > (99%) > >> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h > (99%) > >> rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h > (100%) > >> rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2- > global.h (100%) > >> rename {drivers/staging/fsl-mc/include => > >> include/soc/fsl}/dpaa2-io.h (100%) > > I received feedback in the past on mc-bus that a driver should limit > > to only one public header and one private one. Would it make sense to > > do the same for dpio too? > Looking at this the dpaa-2global.h file should probably be integrated into the > dpaa2-io.h file. > The dpaaa2-fd.h can be used by devices that don't need to used DPIO - the > definition of a frame descriptor isn't DPIO specific so I would argue it should > be kept in a seperate file. Hi Roy, Will there be a re-spin of the patch soon so that we can probably catch the next merge window? Regards, Leo
diff --git a/MAINTAINERS b/MAINTAINERS index f771ec1..5b41d0d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4442,7 +4442,7 @@ DPAA2 DATAPATH I/O (DPIO) DRIVER M: Roy Pledge <Roy.Pledge@nxp.com> L: linux-kernel@vger.kernel.org S: Maintained -F: drivers/staging/fsl-mc/bus/dpio +F: drivers/soc/fsl/dpio DPAA2 ETHERNET DRIVER M: Ioana Radulescu <ruxandra.radulescu@nxp.com> diff --git a/drivers/crypto/caam/sg_sw_qm2.h b/drivers/crypto/caam/sg_sw_qm2.h index 31b4407..b5b4c12 100644 --- a/drivers/crypto/caam/sg_sw_qm2.h +++ b/drivers/crypto/caam/sg_sw_qm2.h @@ -35,7 +35,7 @@ #ifndef _SG_SW_QM2_H_ #define _SG_SW_QM2_H_ -#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h" +#include <soc/fsl/dpaa2-fd.h> static inline void dma_to_qm_sg_one(struct dpaa2_sg_entry *qm_sg_ptr, dma_addr_t dma, u32 len, u16 offset) diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h index e586ffa..dbfa9fc 100644 --- a/drivers/crypto/caam/sg_sw_sec4.h +++ b/drivers/crypto/caam/sg_sw_sec4.h @@ -12,7 +12,7 @@ #include "ctrl.h" #include "regs.h" #include "sg_sw_qm2.h" -#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h" +#include <soc/fsl/dpaa2-fd.h> struct sec4_sg_entry { u64 ptr; diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig index 7a9fb9b..c17bf38 100644 --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig @@ -16,3 +16,13 @@ config FSL_GUTS Initially only reading SVR and registering soc device are supported. Other guts accesses, such as reading RCW, should eventually be moved into this driver as well. + +config FSL_MC_DPIO + tristate "QorIQ DPAA2 DPIO driver" + depends on FSL_MC_BUS + help + Driver for the DPAA2 DPIO object. A DPIO provides queue and + buffer management facilities for software to interact with + other DPAA2 objects. This driver does not expose the DPIO + objects individually, but groups them under a service layer + API. diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile index 44b3beb..803ef1b 100644 --- a/drivers/soc/fsl/Makefile +++ b/drivers/soc/fsl/Makefile @@ -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/ diff --git a/drivers/staging/fsl-mc/bus/dpio/Makefile b/drivers/soc/fsl/dpio/Makefile similarity index 100% rename from drivers/staging/fsl-mc/bus/dpio/Makefile rename to drivers/soc/fsl/dpio/Makefile diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h b/drivers/soc/fsl/dpio/dpio-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h rename to drivers/soc/fsl/dpio/dpio-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c b/drivers/soc/fsl/dpio/dpio-driver.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dpio/dpio-driver.c rename to drivers/soc/fsl/dpio/dpio-driver.c index 11a90a9..b60b77b 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c +++ b/drivers/soc/fsl/dpio/dpio-driver.c @@ -16,7 +16,7 @@ #include <linux/io.h> #include <linux/fsl/mc.h> -#include "../../include/dpaa2-io.h" +#include <soc/fsl/dpaa2-io.h> #include "qbman-portal.h" #include "dpio.h" diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt b/drivers/soc/fsl/dpio/dpio-driver.txt similarity index 100% rename from drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt rename to drivers/soc/fsl/dpio/dpio-driver.txt diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dpio/dpio-service.c rename to drivers/soc/fsl/dpio/dpio-service.c index 14ed2be..9b17f72 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c +++ b/drivers/soc/fsl/dpio/dpio-service.c @@ -6,7 +6,7 @@ */ #include <linux/types.h> #include <linux/fsl/mc.h> -#include "../../include/dpaa2-io.h" +#include <soc/fsl/dpaa2-io.h> #include <linux/init.h> #include <linux/module.h> #include <linux/platform_device.h> diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.c b/drivers/soc/fsl/dpio/dpio.c similarity index 100% rename from drivers/staging/fsl-mc/bus/dpio/dpio.c rename to drivers/soc/fsl/dpio/dpio.c diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.h b/drivers/soc/fsl/dpio/dpio.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpio/dpio.h rename to drivers/soc/fsl/dpio/dpio.h diff --git a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dpio/qbman-portal.c rename to drivers/soc/fsl/dpio/qbman-portal.c index 116fafb..cf1d448 100644 --- a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c +++ b/drivers/soc/fsl/dpio/qbman-portal.c @@ -8,7 +8,7 @@ #include <asm/cacheflush.h> #include <linux/io.h> #include <linux/slab.h> -#include "../../include/dpaa2-global.h" +#include <soc/fsl/dpaa2-global.h> #include "qbman-portal.h" diff --git a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.h b/drivers/soc/fsl/dpio/qbman-portal.h similarity index 99% rename from drivers/staging/fsl-mc/bus/dpio/qbman-portal.h rename to drivers/soc/fsl/dpio/qbman-portal.h index 69db3c8..89d1dd9 100644 --- a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.h +++ b/drivers/soc/fsl/dpio/qbman-portal.h @@ -7,7 +7,7 @@ #ifndef __FSL_QBMAN_PORTAL_H #define __FSL_QBMAN_PORTAL_H -#include "../../include/dpaa2-fd.h" +#include <soc/fsl/dpaa2-fd.h> struct dpaa2_dq; struct qbman_swp; diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h index 905a4e6..824dcd5 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h @@ -37,8 +37,8 @@ #include <linux/if_vlan.h> #include <linux/fsl/mc.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 "dpni.h" #include "dpni-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig index 3424530..90f234d 100644 --- a/drivers/staging/fsl-mc/bus/Kconfig +++ b/drivers/staging/fsl-mc/bus/Kconfig @@ -5,12 +5,3 @@ # Copyright (C) 2014-2016 Freescale Semiconductor, Inc. # -config FSL_MC_DPIO - tristate "QorIQ DPAA2 DPIO driver" - depends on FSL_MC_BUS - help - Driver for the DPAA2 DPIO object. A DPIO provides queue and - buffer management facilities for software to interact with - other DPAA2 objects. This driver does not expose the DPIO - objects individually, but groups them under a service layer - API. diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile index 21d8ebc..2141e4b 100644 --- a/drivers/staging/fsl-mc/bus/Makefile +++ b/drivers/staging/fsl-mc/bus/Makefile @@ -5,5 +5,3 @@ # Copyright (C) 2014 Freescale Semiconductor, Inc. # -# MC DPIO driver -obj-$(CONFIG_FSL_MC_DPIO) += dpio/ diff --git a/drivers/staging/fsl-mc/include/dpaa2-fd.h b/include/soc/fsl/dpaa2-fd.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpaa2-fd.h rename to include/soc/fsl/dpaa2-fd.h diff --git a/drivers/staging/fsl-mc/include/dpaa2-global.h b/include/soc/fsl/dpaa2-global.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpaa2-global.h rename to include/soc/fsl/dpaa2-global.h diff --git a/drivers/staging/fsl-mc/include/dpaa2-io.h b/include/soc/fsl/dpaa2-io.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpaa2-io.h rename to include/soc/fsl/dpaa2-io.h
Move the NXP DPIO (Datapath I/O Driver) out of the drivers/staging directory and into the drivers/soc/fsl directory. The DPIO driver enables access to Queue and Buffer Manager (QBMAN) hardware on NXP DPAA2 devices. This is a prerequisite to moving the DPAA2 Ethernet driver out of staging. Signed-off-by: Roy Pledge <roy.pledge@nxp.com> --- MAINTAINERS | 2 +- drivers/crypto/caam/sg_sw_qm2.h | 2 +- drivers/crypto/caam/sg_sw_sec4.h | 2 +- drivers/soc/fsl/Kconfig | 10 ++++++++++ drivers/soc/fsl/Makefile | 1 + drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +- drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c | 2 +- drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c | 2 +- drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++-- drivers/staging/fsl-mc/bus/Kconfig | 9 --------- drivers/staging/fsl-mc/bus/Makefile | 2 -- {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0 .../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0 {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0 20 files changed, 20 insertions(+), 20 deletions(-) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile (100%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c (99%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt (100%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c (99%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c (100%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h (100%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c (99%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h (99%) rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (100%) rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h (100%) rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h (100%)