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>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 0265cb12cdaad4c38e1e274c53ec3e90eca99d6f..e245779443da2a120f42afab2d7f9a438637693d 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -142,4 +142,6 @@ source "drivers/devfreq/Kconfig"
 
 source "drivers/iio/Kconfig"
 
+source "drivers/vme/Kconfig"
+
 endmenu

diff --git a/drivers/Makefile b/drivers/Makefile
index cdbe362df0ec079f95ccb14c9969cf0696a1e512..08b78e035468c1b0cbbcf7e1504d9cbd90a1732e 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -135,3 +135,4 @@ obj-$(CONFIG_HYPERV)                += hv/
 
 obj-$(CONFIG_PM_DEVFREQ)       += devfreq/
 obj-$(CONFIG_IIO)              += iio/
+obj-$(CONFIG_VME_BUS)          += vme/

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 8d406b5938c005af15432c77c82209ae0c36f114..60221efc417bb8576027ccc0ff3c9c67a79d1e73 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -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"

diff --git a/drivers/staging/vme/Makefile b/drivers/staging/vme/Makefile
index b4ea3f8d0a50cc0ce0946385b4d9662ed7b39bbf..accdb72e39e2fa64efed27617695e7c065c24550 100644 (file)
--- a/drivers/staging/vme/Makefile
+++ b/drivers/staging/vme/Makefile
@@ -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/

diff --git a/drivers/staging/vme/TODO b/drivers/staging/vme/TODO
deleted file mode 100644 (file)
index 79f0033..0000000
--- a/drivers/staging/vme/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-                               TODO
-                               ====
-
-- Add one or more device drivers which use the VME framework.
-

diff --git a/drivers/staging/vme/devices/Kconfig b/drivers/staging/vme/devices/Kconfig
index 55ec30cb1fa2ddafab7f720d1b8185c78e38b7b7..d0cab17661906724b1a085d1471056f91176c7b6 100644 (file)
--- a/drivers/staging/vme/devices/Kconfig
+++ b/drivers/staging/vme/devices/Kconfig
@@ -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

diff --git a/drivers/staging/vme/devices/vme_pio2_cntr.c b/drivers/staging/vme/devices/vme_pio2_cntr.c
index 08e0d59806caca886428d78c99b975518c0e88eb..6335471faa3687f4adba5a3fd6f67ed079172f66 100644 (file)
--- a/drivers/staging/vme/devices/vme_pio2_cntr.c
+++ b/drivers/staging/vme/devices/vme_pio2_cntr.c
@@ -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)

diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
index d476b2e9d39faf7468c615c4e0f29f6c17babf96..78228d447f257a98becbff2c1d68d0b440a54bbc 100644 (file)
--- a/drivers/staging/vme/devices/vme_pio2_core.c
+++ b/drivers/staging/vme/devices/vme_pio2_core.c
@@ -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"
 
 

diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
index 9c459c1b6eb896471044607ba0c787af92f96044..ad76a477825b441bbe53e1d060639585717d0cfd 100644 (file)
--- a/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -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";

diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index 10269d59942f1d778c18d7368b7a4e634d197ab0..e24a6f95db126342c910f565588fb2c5a5840729 100644 (file)
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -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);

diff --git a/drivers/staging/vme/Kconfig b/drivers/vme/Kconfig
similarity index 73%
rename from drivers/staging/vme/Kconfig
rename to drivers/vme/Kconfig
index 6411ae51ed3f724ce048b467d7c6b73aa2b2349d..c5c22465a80518e2905b2939a002f124f25f5500 100644 (file)
--- a/drivers/staging/vme/Kconfig
+++ b/drivers/vme/Kconfig
@@ -10,10 +10,10 @@ menuconfig VME_BUS
 
 if VME_BUS
 
-source "drivers/staging/vme/bridges/Kconfig"
+source "drivers/vme/bridges/Kconfig"
 
-source "drivers/staging/vme/devices/Kconfig"
+source "drivers/vme/boards/Kconfig"
 
-source "drivers/staging/vme/boards/Kconfig"
+source "drivers/staging/vme/devices/Kconfig"
 
 endif # VME

diff --git a/drivers/vme/Makefile b/drivers/vme/Makefile
new file mode 100644 (file)
index 0000000..d7bfcb9
--- /dev/null
+++ b/drivers/vme/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the VME bridge device drivers.
+#
+obj-$(CONFIG_VME_BUS)          += vme.o
+
+obj-y                          += bridges/
+obj-y                          += boards/

diff --git a/drivers/staging/vme/boards/Kconfig b/drivers/vme/boards/Kconfig
similarity index 100%
rename from drivers/staging/vme/boards/Kconfig
rename to drivers/vme/boards/Kconfig

diff --git a/drivers/staging/vme/boards/Makefile b/drivers/vme/boards/Makefile
similarity index 100%
rename from drivers/staging/vme/boards/Makefile
rename to drivers/vme/boards/Makefile

diff --git a/drivers/staging/vme/boards/vme_vmivme7805.c b/drivers/vme/boards/vme_vmivme7805.c
similarity index 100%
rename from drivers/staging/vme/boards/vme_vmivme7805.c
rename to drivers/vme/boards/vme_vmivme7805.c

diff --git a/drivers/staging/vme/boards/vme_vmivme7805.h b/drivers/vme/boards/vme_vmivme7805.h
similarity index 100%
rename from drivers/staging/vme/boards/vme_vmivme7805.h
rename to drivers/vme/boards/vme_vmivme7805.h

diff --git a/drivers/staging/vme/bridges/Kconfig b/drivers/vme/bridges/Kconfig
similarity index 100%
rename from drivers/staging/vme/bridges/Kconfig
rename to drivers/vme/bridges/Kconfig

diff --git a/drivers/staging/vme/bridges/Makefile b/drivers/vme/bridges/Makefile
similarity index 100%
rename from drivers/staging/vme/bridges/Makefile
rename to drivers/vme/bridges/Makefile

diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c
similarity index 99%
rename from drivers/staging/vme/bridges/vme_ca91cx42.c
rename to drivers/vme/bridges/vme_ca91cx42.c
index 515b8b8e32a8fc781acfb0c3fa6dd8b8d91b24db..a3c0f84e2fa1f2d89fd78707abf86f13d8bf931b 100644 (file)
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/vme/bridges/vme_ca91cx42.c
@@ -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"
 

diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.h b/drivers/vme/bridges/vme_ca91cx42.h
similarity index 100%
rename from drivers/staging/vme/bridges/vme_ca91cx42.h
rename to drivers/vme/bridges/vme_ca91cx42.h

diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c
similarity index 99%
rename from drivers/staging/vme/bridges/vme_tsi148.c
rename to drivers/vme/bridges/vme_tsi148.c
index ced59421302e5120f6183c6767eb2730a14fe679..081e9c4c5e71024fd410b652672c92aeb5e48493 100644 (file)
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/vme/bridges/vme_tsi148.c
@@ -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"
 

diff --git a/drivers/staging/vme/bridges/vme_tsi148.h b/drivers/vme/bridges/vme_tsi148.h
similarity index 100%
rename from drivers/staging/vme/bridges/vme_tsi148.h
rename to drivers/vme/bridges/vme_tsi148.h

diff --git a/drivers/staging/vme/vme.c b/drivers/vme/vme.c
similarity index 99%
rename from drivers/staging/vme/vme.c
rename to drivers/vme/vme.c
index fd51c2d447184d7a60c30d6233a6b66a29b3551d..95a9f71d793eb1958fe58313057076f8899e9234 100644 (file)
--- a/drivers/staging/vme/vme.c
+++ b/drivers/vme/vme.c
@@ -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 */

diff --git a/drivers/staging/vme/vme_api.txt b/drivers/vme/vme_api.txt
similarity index 100%
rename from drivers/staging/vme/vme_api.txt
rename to drivers/vme/vme_api.txt

diff --git a/drivers/staging/vme/vme_bridge.h b/drivers/vme/vme_bridge.h
similarity index 100%
rename from drivers/staging/vme/vme_bridge.h
rename to drivers/vme/vme_bridge.h

diff --git a/drivers/staging/vme/vme.h b/include/linux/vme.h
similarity index 100%
rename from drivers/staging/vme/vme.h
rename to include/linux/vme.h