vme: move back to staging

The VME subsystem graduated from staging into a top-level subsystem in
2012, with commit db3b9e990e ("Staging: VME: move VME drivers out of
staging") stating:

    The VME device drivers have not moved out yet due to some API
    questions they are still working through, that should happen soon,
    hopefully.

However, this never happened: maintenance of drivers/vme effectively
stopped in 2017, with all subsequent changes being treewide cleanups.
No hardware driver remains in staging, only the limited user-level
access, and I just removed one of the two bridge drivers and the only
remaining board.

drivers/staging/vme/devices/ was recently moved to
drivers/staging/vme_user/, but as the vme_user driver is the only one
remaining for this subsystem, it is easier to just move the remaining
three source files into this directory rather than keeping the original
hierarchy.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20220606084109.4108188-3-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2022-06-06 10:41:05 +02:00 committed by Greg Kroah-Hartman
parent 3493536142
commit 35ba63b8f6
17 changed files with 40 additions and 58 deletions

View File

@ -290,8 +290,8 @@ The function :c:func:`vme_bus_num` returns the bus ID of the provided bridge.
VME API
-------
.. kernel-doc:: include/linux/vme.h
.. kernel-doc:: drivers/staging/vme_user/vme.h
:internal:
.. kernel-doc:: drivers/vme/vme.c
.. kernel-doc:: drivers/staging/vme_user/vme.c
:export:

View File

@ -21230,12 +21230,10 @@ M: Martyn Welch <martyn@welchs.me.uk>
M: Manohar Vanga <manohar.vanga@gmail.com>
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
L: linux-kernel@vger.kernel.org
S: Maintained
S: Odd fixes
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
F: Documentation/driver-api/vme.rst
F: drivers/staging/vme_user/
F: drivers/vme/
F: include/linux/vme*
VM SOCKETS (AF_VSOCK)
M: Stefano Garzarella <sgarzare@redhat.com>

View File

@ -183,8 +183,6 @@ source "drivers/iio/Kconfig"
source "drivers/ntb/Kconfig"
source "drivers/vme/Kconfig"
source "drivers/pwm/Kconfig"
source "drivers/irqchip/Kconfig"

View File

@ -165,7 +165,6 @@ obj-$(CONFIG_PM_DEVFREQ) += devfreq/
obj-$(CONFIG_EXTCON) += extcon/
obj-$(CONFIG_MEMORY) += memory/
obj-$(CONFIG_IIO) += iio/
obj-$(CONFIG_VME_BUS) += vme/
obj-$(CONFIG_IPACK_BUS) += ipack/
obj-$(CONFIG_NTB) += ntb/
obj-$(CONFIG_POWERCAP) += powercap/

View File

@ -1,4 +1,29 @@
# SPDX-License-Identifier: GPL-2.0
menuconfig VME_BUS
bool "VME bridge support"
depends on STAGING && PCI
help
If you say Y here you get support for the VME bridge Framework.
if VME_BUS
comment "VME Bridge Drivers"
config VME_TSI148
tristate "Tempe"
depends on HAS_DMA
help
If you say Y here you get support for the Tundra TSI148 VME bridge
chip.
config VME_FAKE
tristate "Fake"
help
If you say Y here you get support for the fake VME bridge. This
provides a virtualised VME Bus for devices with no VME bridge. This
is mainly useful for VME development (in the absence of VME
hardware).
comment "VME Device Drivers"
config VME_USER
@ -11,3 +36,5 @@ config VME_USER
To compile this driver as a module, choose M here. The module will
be called vme_user. If unsure, say N.
endif

View File

@ -3,4 +3,7 @@
# Makefile for the VME device drivers.
#
obj-$(CONFIG_VME_BUS) += vme.o
obj-$(CONFIG_VME_USER) += vme_user.o
obj-$(CONFIG_VME_TSI148) += vme_tsi148.o
obj-$(CONFIG_VME_FAKE) += vme_fake.o

View File

@ -26,8 +26,8 @@
#include <linux/mutex.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/vme.h>
#include "vme.h"
#include "vme_bridge.h"
/* Bitmask and list of registered buses both protected by common mutex */

View File

@ -2,7 +2,7 @@
#ifndef _VME_BRIDGE_H_
#define _VME_BRIDGE_H_
#include <linux/vme.h>
#include "vme.h"
#define VME_CRCSR_BUF_SIZE (508*1024)
/*

View File

@ -29,9 +29,9 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/types.h>
#include <linux/vme.h>
#include "../vme_bridge.h"
#include "vme.h"
#include "vme_bridge.h"
/*
* Define the number of each that the fake driver supports.

View File

@ -26,9 +26,9 @@
#include <linux/io.h>
#include <linux/uaccess.h>
#include <linux/byteorder/generic.h>
#include <linux/vme.h>
#include "../vme_bridge.h"
#include "vme.h"
#include "vme_bridge.h"
#include "vme_tsi148.h"
static int tsi148_probe(struct pci_dev *, const struct pci_device_id *);

View File

@ -33,8 +33,8 @@
#include <linux/io.h>
#include <linux/uaccess.h>
#include <linux/vme.h>
#include "vme.h"
#include "vme_user.h"
static const char driver_name[] = "vme_user";

View File

@ -1,16 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# VME configuration.
#
menuconfig VME_BUS
bool "VME bridge support"
depends on PCI
help
If you say Y here you get support for the VME bridge Framework.
if VME_BUS
source "drivers/vme/bridges/Kconfig"
endif # VME

View File

@ -1,7 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# Makefile for the VME bridge device drivers.
#
obj-$(CONFIG_VME_BUS) += vme.o
obj-y += bridges/

View File

@ -1,17 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-only
comment "VME Bridge Drivers"
config VME_TSI148
tristate "Tempe"
depends on HAS_DMA
help
If you say Y here you get support for the Tundra TSI148 VME bridge
chip.
config VME_FAKE
tristate "Fake"
help
If you say Y here you get support for the fake VME bridge. This
provides a virtualised VME Bus for devices with no VME bridge. This
is mainly useful for VME development (in the absence of VME
hardware).

View File

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_VME_TSI148) += vme_tsi148.o
obj-$(CONFIG_VME_FAKE) += vme_fake.o