mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
staging: fsl-mc: Move core bus out of staging
Move the source files out of staging into their final locations: -mc.h include file in drivers/staging/fsl-mc/include go to include/linux/fsl -source files in drivers/staging/fsl-mc/bus go to drivers/bus/fsl-mc -overview.rst, providing an overview of DPAA2, goes to Documentation/networking/dpaa2/overview.rst Update or delete other remaining staging files -- Makefile, Kconfig, TODO. Update dpaa2_eth and dpio staging drivers. Add integration bits for the documentation build system. Signed-off-by: Stuart Yoder <stuyoder@gmail.com> [rebased, add dpaa2_eth and dpio #include updates] Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> [rebased, split irqchip to separate patch] Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
281377cc66
commit
6bd067c48e
8
Documentation/networking/dpaa2/index.rst
Normal file
8
Documentation/networking/dpaa2/index.rst
Normal file
@ -0,0 +1,8 @@
|
||||
===================
|
||||
DPAA2 Documentation
|
||||
===================
|
||||
|
||||
.. toctree::
|
||||
:maxdepth: 1
|
||||
|
||||
overview
|
@ -8,6 +8,7 @@ Contents:
|
||||
|
||||
batman-adv
|
||||
can
|
||||
dpaa2/index
|
||||
kapi
|
||||
z8530book
|
||||
msg_zerocopy
|
||||
|
@ -11452,8 +11452,9 @@ M: Stuart Yoder <stuyoder@gmail.com>
|
||||
M: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
||||
L: linux-kernel@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/staging/fsl-mc/
|
||||
F: drivers/bus/fsl-mc/
|
||||
F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
|
||||
F: Documentation/networking/dpaa2/overview.rst
|
||||
|
||||
QT1010 MEDIA DRIVER
|
||||
M: Antti Palosaari <crope@iki.fi>
|
||||
|
@ -199,4 +199,6 @@ config DA8XX_MSTPRI
|
||||
configuration. Allows to adjust the priorities of all master
|
||||
peripherals.
|
||||
|
||||
source "drivers/bus/fsl-mc/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
@ -8,6 +8,10 @@ obj-$(CONFIG_ARM_CCI) += arm-cci.o
|
||||
obj-$(CONFIG_ARM_CCN) += arm-ccn.o
|
||||
|
||||
obj-$(CONFIG_BRCMSTB_GISB_ARB) += brcmstb_gisb.o
|
||||
|
||||
# DPAA2 fsl-mc bus
|
||||
obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/
|
||||
|
||||
obj-$(CONFIG_IMX_WEIM) += imx-weim.o
|
||||
obj-$(CONFIG_MIPS_CDMM) += mips_cdmm.o
|
||||
obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o
|
||||
|
16
drivers/bus/fsl-mc/Kconfig
Normal file
16
drivers/bus/fsl-mc/Kconfig
Normal file
@ -0,0 +1,16 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# DPAA2 fsl-mc bus
|
||||
#
|
||||
# Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
|
||||
#
|
||||
|
||||
config FSL_MC_BUS
|
||||
bool "QorIQ DPAA2 fsl-mc bus driver"
|
||||
depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86 || PPC)))
|
||||
select GENERIC_MSI_IRQ_DOMAIN
|
||||
help
|
||||
Driver to enable the bus infrastructure for the QorIQ DPAA2
|
||||
architecture. The fsl-mc bus driver handles discovery of
|
||||
DPAA2 objects (which are represented as Linux devices) and
|
||||
binding objects to drivers.
|
16
drivers/bus/fsl-mc/Makefile
Normal file
16
drivers/bus/fsl-mc/Makefile
Normal file
@ -0,0 +1,16 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Freescale Management Complex (MC) bus drivers
|
||||
#
|
||||
# Copyright (C) 2014 Freescale Semiconductor, Inc.
|
||||
#
|
||||
obj-$(CONFIG_FSL_MC_BUS) += mc-bus-driver.o
|
||||
|
||||
mc-bus-driver-objs := fsl-mc-bus.o \
|
||||
mc-sys.o \
|
||||
mc-io.o \
|
||||
dprc.o \
|
||||
dprc-driver.o \
|
||||
fsl-mc-allocator.o \
|
||||
fsl-mc-msi.o \
|
||||
dpmcp.o
|
@ -4,7 +4,7 @@
|
||||
*
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
#include "../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
|
||||
#include "fsl-mc-private.h"
|
||||
|
@ -11,7 +11,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/msi.h>
|
||||
#include "../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
|
||||
#include "fsl-mc-private.h"
|
||||
|
@ -4,7 +4,8 @@
|
||||
*
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
#include "../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
|
||||
#include "fsl-mc-private.h"
|
||||
|
||||
/**
|
@ -8,7 +8,7 @@
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/msi.h>
|
||||
#include "../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
|
||||
#include "fsl-mc-private.h"
|
||||
|
@ -13,6 +13,7 @@
|
||||
#include <linux/irq.h>
|
||||
#include <linux/irqdomain.h>
|
||||
#include <linux/msi.h>
|
||||
|
||||
#include "fsl-mc-private.h"
|
||||
|
||||
#ifdef GENERIC_MSI_DOMAIN_OPS
|
@ -8,7 +8,7 @@
|
||||
#ifndef _FSL_MC_PRIVATE_H_
|
||||
#define _FSL_MC_PRIVATE_H_
|
||||
|
||||
#include "../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
/*
|
@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/io.h>
|
||||
#include "../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
|
||||
#include "fsl-mc-private.h"
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include <linux/device.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/io-64-nonatomic-hi-lo.h>
|
||||
#include "../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
|
||||
#include "fsl-mc-private.h"
|
||||
|
@ -36,7 +36,7 @@ are treated as internal resources of other objects.
|
||||
|
||||
For a more detailed description of the DPAA2 architecture and its object
|
||||
abstractions see:
|
||||
drivers/staging/fsl-mc/README.txt
|
||||
Documentation/networking/dpaa2/overview.rst
|
||||
|
||||
Each Linux net device is built on top of a Datapath Network Interface (DPNI)
|
||||
object and uses Buffer Pools (DPBPs), I/O Portals (DPIOs) and Concentrators
|
||||
|
@ -39,7 +39,7 @@
|
||||
#include <linux/kthread.h>
|
||||
#include <linux/iommu.h>
|
||||
|
||||
#include "../../fsl-mc/include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
#include "dpaa2-eth.h"
|
||||
|
||||
/* CREATE_TRACE_POINTS only needs to be defined once. Other dpa files
|
||||
|
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/errno.h>
|
||||
#include "../../fsl-mc/include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
#include "dpni.h"
|
||||
#include "dpni-cmd.h"
|
||||
|
||||
|
@ -1,18 +0,0 @@
|
||||
* Add at least one device driver for a DPAA2 object (child device of the
|
||||
fsl-mc bus). Most likely candidate for this is adding DPAA2 Ethernet
|
||||
driver support, which depends on drivers for several objects: DPNI,
|
||||
DPIO, DPMAC. Other pre-requisites include:
|
||||
|
||||
* MC firmware uprev. The MC firmware upon which the fsl-mc
|
||||
bus driver and DPAA2 object drivers are based is continuing
|
||||
to evolve, so minor updates are needed to keep in sync with binary
|
||||
interface changes to the MC.
|
||||
|
||||
* Cleanup
|
||||
|
||||
Please send any patches to Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
|
||||
german.rivera@freescale.com, devel@driverdev.osuosl.org,
|
||||
linux-kernel@vger.kernel.org
|
||||
|
||||
[1] https://lkml.org/lkml/2015/7/9/93
|
||||
[2] https://lkml.org/lkml/2015/7/7/712
|
@ -5,16 +5,6 @@
|
||||
# Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
|
||||
#
|
||||
|
||||
config FSL_MC_BUS
|
||||
bool "QorIQ DPAA2 fsl-mc bus driver"
|
||||
depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86 || PPC)))
|
||||
select GENERIC_MSI_IRQ_DOMAIN
|
||||
help
|
||||
Driver to enable the bus infrastructure for the QorIQ DPAA2
|
||||
architecture. The fsl-mc bus driver handles discovery of
|
||||
DPAA2 objects (which are represented as Linux devices) and
|
||||
binding objects to drivers.
|
||||
|
||||
config FSL_MC_DPIO
|
||||
tristate "QorIQ DPAA2 DPIO driver"
|
||||
depends on FSL_MC_BUS && ARCH_LAYERSCAPE
|
||||
|
@ -4,19 +4,9 @@
|
||||
#
|
||||
# Copyright (C) 2014 Freescale Semiconductor, Inc.
|
||||
#
|
||||
obj-$(CONFIG_FSL_MC_BUS) += mc-bus-driver.o
|
||||
|
||||
mc-bus-driver-objs := fsl-mc-bus.o \
|
||||
mc-sys.o \
|
||||
mc-io.o \
|
||||
dprc.o \
|
||||
dprc-driver.o \
|
||||
fsl-mc-allocator.o \
|
||||
fsl-mc-msi.o \
|
||||
irq-gic-v3-its-fsl-mc-msi.o \
|
||||
dpmcp.o \
|
||||
dpbp.o \
|
||||
dpcon.o
|
||||
obj-$(CONFIG_FSL_MC_BUS) += irq-gic-v3-its-fsl-mc-msi.o \
|
||||
dpbp.o \
|
||||
dpcon.o
|
||||
|
||||
# MC DPIO driver
|
||||
obj-$(CONFIG_FSL_MC_DPIO) += dpio/
|
||||
|
@ -4,7 +4,7 @@
|
||||
*
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
#include "../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
#include "../include/dpbp.h"
|
||||
|
||||
#include "dpbp-cmd.h"
|
||||
|
@ -4,7 +4,7 @@
|
||||
*
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
#include "../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
#include "../include/dpcon.h"
|
||||
|
||||
#include "dpcon-cmd.h"
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
#include "../../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
#include "../../include/dpaa2-io.h"
|
||||
|
||||
#include "qbman-portal.h"
|
||||
|
@ -5,7 +5,7 @@
|
||||
*
|
||||
*/
|
||||
#include <linux/types.h>
|
||||
#include "../../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
#include "../../include/dpaa2-io.h"
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
|
@ -5,7 +5,7 @@
|
||||
*
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
#include "../../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
|
||||
#include "dpio.h"
|
||||
#include "dpio-cmd.h"
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include <linux/msi.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include "../include/mc.h"
|
||||
#include <linux/fsl/mc.h>
|
||||
|
||||
static struct irq_chip its_msi_irq_chip = {
|
||||
.name = "ITS-fMSI",
|
||||
|
Loading…
Reference in New Issue
Block a user