Staging: VME: move VME drivers out of staging
This moves the VME core, VME board drivers, and VME bridge drivers out of the drivers/staging/vme/ area to drivers/vme/. The VME device drivers have not moved out yet due to some API questions they are still working through, that should happen soon, hopefully. Cc: Martyn Welch <martyn.welch@ge.com> Cc: Manohar Vanga <manohar.vanga@cern.ch> Cc: Vincent Bossier <vincent.bossier@gmail.com> Cc: "Emilio G. Cota" <cota@braap.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
8176df8e95
Коммит
db3b9e990e
|
@ -142,4 +142,6 @@ source "drivers/devfreq/Kconfig"
|
|||
|
||||
source "drivers/iio/Kconfig"
|
||||
|
||||
source "drivers/vme/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
|
|
@ -135,3 +135,4 @@ obj-$(CONFIG_HYPERV) += hv/
|
|||
|
||||
obj-$(CONFIG_PM_DEVFREQ) += devfreq/
|
||||
obj-$(CONFIG_IIO) += iio/
|
||||
obj-$(CONFIG_VME_BUS) += vme/
|
||||
|
|
|
@ -72,8 +72,6 @@ source "drivers/staging/vt6655/Kconfig"
|
|||
|
||||
source "drivers/staging/vt6656/Kconfig"
|
||||
|
||||
source "drivers/staging/vme/Kconfig"
|
||||
|
||||
source "drivers/staging/sep/Kconfig"
|
||||
|
||||
source "drivers/staging/iio/Kconfig"
|
||||
|
|
|
@ -1,8 +1 @@
|
|||
#
|
||||
# Makefile for the VME bridge device drivers.
|
||||
#
|
||||
obj-$(CONFIG_VME_BUS) += vme.o
|
||||
|
||||
obj-y += bridges/
|
||||
obj-y += devices/
|
||||
obj-y += boards/
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
TODO
|
||||
====
|
||||
|
||||
- Add one or more device drivers which use the VME framework.
|
||||
|
|
@ -2,6 +2,7 @@ comment "VME Device Drivers"
|
|||
|
||||
config VME_USER
|
||||
tristate "VME user space access driver"
|
||||
depends on STAGING
|
||||
help
|
||||
If you say Y here you want to be able to access a limited number of
|
||||
VME windows in a manner at least semi-compatible with the interface
|
||||
|
@ -9,7 +10,7 @@ config VME_USER
|
|||
|
||||
config VME_PIO2
|
||||
tristate "GE PIO2 VME"
|
||||
depends on GPIOLIB
|
||||
depends on STAGING && GPIOLIB
|
||||
help
|
||||
Say Y here to include support for the GE PIO2. The PIO2 is a 6U VME
|
||||
slave card, implementing 32 solid-state relay switched IO lines, in
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
#include <linux/device.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/vme.h>
|
||||
|
||||
#include "../vme.h"
|
||||
#include "vme_pio2.h"
|
||||
|
||||
static int pio2_cntr_irq_set(struct pio2_card *card, int id)
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
#include <linux/ctype.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/vme.h>
|
||||
|
||||
#include "../vme.h"
|
||||
#include "vme_pio2.h"
|
||||
|
||||
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
#include <linux/ctype.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/vme.h>
|
||||
|
||||
#include "../vme.h"
|
||||
#include "vme_pio2.h"
|
||||
|
||||
static const char driver_name[] = "pio2_gpio";
|
||||
|
|
|
@ -36,8 +36,8 @@
|
|||
|
||||
#include <linux/io.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/vme.h>
|
||||
|
||||
#include "../vme.h"
|
||||
#include "vme_user.h"
|
||||
|
||||
static DEFINE_MUTEX(vme_user_mutex);
|
||||
|
|
|
@ -10,10 +10,10 @@ menuconfig VME_BUS
|
|||
|
||||
if VME_BUS
|
||||
|
||||
source "drivers/staging/vme/bridges/Kconfig"
|
||||
source "drivers/vme/bridges/Kconfig"
|
||||
|
||||
source "drivers/vme/boards/Kconfig"
|
||||
|
||||
source "drivers/staging/vme/devices/Kconfig"
|
||||
|
||||
source "drivers/staging/vme/boards/Kconfig"
|
||||
|
||||
endif # VME
|
|
@ -0,0 +1,7 @@
|
|||
#
|
||||
# Makefile for the VME bridge device drivers.
|
||||
#
|
||||
obj-$(CONFIG_VME_BUS) += vme.o
|
||||
|
||||
obj-y += bridges/
|
||||
obj-y += boards/
|
|
@ -29,8 +29,8 @@
|
|||
#include <linux/time.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/vme.h>
|
||||
|
||||
#include "../vme.h"
|
||||
#include "../vme_bridge.h"
|
||||
#include "vme_ca91cx42.h"
|
||||
|
|
@ -30,8 +30,8 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/byteorder/generic.h>
|
||||
#include <linux/vme.h>
|
||||
|
||||
#include "../vme.h"
|
||||
#include "../vme_bridge.h"
|
||||
#include "vme_tsi148.h"
|
||||
|
|
@ -30,8 +30,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 */
|
Загрузка…
Ссылка в новой задаче