Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c89105c9 authored by Roy Pledge's avatar Roy Pledge Committed by Li Yang
Browse files

staging: fsl-mc: Move DPIO from staging to drivers/soc/fsl 



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: default avatarRoy Pledge <roy.pledge@nxp.com>
Reviewed-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Reviewed-by: default avatarIoana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: default avatarLi Yang <leoyang.li@nxp.com>
parent 58ad0d02

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4419,7 +4419,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>

drivers/crypto/caam/sg_sw_qm2.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/crypto/caam/sg_sw_sec4.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/soc/fsl/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -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.

drivers/soc/fsl/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/