diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-26 12:34:58 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-26 12:34:58 -0700 |
commit | db3b9e990e75573402cda22faf933760f076c033 (patch) | |
tree | 4e742e97f7bd71adc61ce23938e361d80b61a45d | |
parent | 8176df8e95df4c867457076190cfb18f2d7ff18c (diff) | |
download | kernel_goldelico_gta04-db3b9e990e75573402cda22faf933760f076c033.zip kernel_goldelico_gta04-db3b9e990e75573402cda22faf933760f076c033.tar.gz kernel_goldelico_gta04-db3b9e990e75573402cda22faf933760f076c033.tar.bz2 |
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>
-rw-r--r-- | drivers/Kconfig | 2 | ||||
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/vme/Makefile | 7 | ||||
-rw-r--r-- | drivers/staging/vme/TODO | 5 | ||||
-rw-r--r-- | drivers/staging/vme/devices/Kconfig | 3 | ||||
-rw-r--r-- | drivers/staging/vme/devices/vme_pio2_cntr.c | 2 | ||||
-rw-r--r-- | drivers/staging/vme/devices/vme_pio2_core.c | 2 | ||||
-rw-r--r-- | drivers/staging/vme/devices/vme_pio2_gpio.c | 2 | ||||
-rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 2 | ||||
-rw-r--r-- | drivers/vme/Kconfig (renamed from drivers/staging/vme/Kconfig) | 6 | ||||
-rw-r--r-- | drivers/vme/Makefile | 7 | ||||
-rw-r--r-- | drivers/vme/boards/Kconfig (renamed from drivers/staging/vme/boards/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/vme/boards/Makefile (renamed from drivers/staging/vme/boards/Makefile) | 0 | ||||
-rw-r--r-- | drivers/vme/boards/vme_vmivme7805.c (renamed from drivers/staging/vme/boards/vme_vmivme7805.c) | 0 | ||||
-rw-r--r-- | drivers/vme/boards/vme_vmivme7805.h (renamed from drivers/staging/vme/boards/vme_vmivme7805.h) | 0 | ||||
-rw-r--r-- | drivers/vme/bridges/Kconfig (renamed from drivers/staging/vme/bridges/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/vme/bridges/Makefile (renamed from drivers/staging/vme/bridges/Makefile) | 0 | ||||
-rw-r--r-- | drivers/vme/bridges/vme_ca91cx42.c (renamed from drivers/staging/vme/bridges/vme_ca91cx42.c) | 2 | ||||
-rw-r--r-- | drivers/vme/bridges/vme_ca91cx42.h (renamed from drivers/staging/vme/bridges/vme_ca91cx42.h) | 0 | ||||
-rw-r--r-- | drivers/vme/bridges/vme_tsi148.c (renamed from drivers/staging/vme/bridges/vme_tsi148.c) | 2 | ||||
-rw-r--r-- | drivers/vme/bridges/vme_tsi148.h (renamed from drivers/staging/vme/bridges/vme_tsi148.h) | 0 | ||||
-rw-r--r-- | drivers/vme/vme.c (renamed from drivers/staging/vme/vme.c) | 2 | ||||
-rw-r--r-- | drivers/vme/vme_api.txt (renamed from drivers/staging/vme/vme_api.txt) | 0 | ||||
-rw-r--r-- | drivers/vme/vme_bridge.h (renamed from drivers/staging/vme/vme_bridge.h) | 0 | ||||
-rw-r--r-- | include/linux/vme.h (renamed from drivers/staging/vme/vme.h) | 0 |
26 files changed, 22 insertions, 25 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 0265cb1..e245779 100644 --- 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 cdbe362..08b78e0 100644 --- 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 8d406b5..60221ef 100644 --- 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 b4ea3f8..accdb72 100644 --- 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 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 55ec30c..d0cab17 100644 --- 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 08e0d59..6335471 100644 --- 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 d476b2e..78228d4 100644 --- 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 9c459c1..ad76a47 100644 --- 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 10269d5..e24a6f9 100644 --- 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 index 6411ae5..c5c2246 100644 --- 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 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 index 7616313..7616313 100644 --- a/drivers/staging/vme/boards/Kconfig +++ b/drivers/vme/boards/Kconfig diff --git a/drivers/staging/vme/boards/Makefile b/drivers/vme/boards/Makefile index 4365834..4365834 100644 --- a/drivers/staging/vme/boards/Makefile +++ b/drivers/vme/boards/Makefile diff --git a/drivers/staging/vme/boards/vme_vmivme7805.c b/drivers/vme/boards/vme_vmivme7805.c index 8e05bb4..8e05bb4 100644 --- a/drivers/staging/vme/boards/vme_vmivme7805.c +++ b/drivers/vme/boards/vme_vmivme7805.c diff --git a/drivers/staging/vme/boards/vme_vmivme7805.h b/drivers/vme/boards/vme_vmivme7805.h index 44c2c44..44c2c44 100644 --- a/drivers/staging/vme/boards/vme_vmivme7805.h +++ b/drivers/vme/boards/vme_vmivme7805.h diff --git a/drivers/staging/vme/bridges/Kconfig b/drivers/vme/bridges/Kconfig index 9331064..9331064 100644 --- a/drivers/staging/vme/bridges/Kconfig +++ b/drivers/vme/bridges/Kconfig diff --git a/drivers/staging/vme/bridges/Makefile b/drivers/vme/bridges/Makefile index 59638af..59638af 100644 --- a/drivers/staging/vme/bridges/Makefile +++ b/drivers/vme/bridges/Makefile diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c index 515b8b8..a3c0f84 100644 --- 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 index 02a7c79..02a7c79 100644 --- a/drivers/staging/vme/bridges/vme_ca91cx42.h +++ b/drivers/vme/bridges/vme_ca91cx42.h diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c index ced5942..081e9c4 100644 --- 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 index f5ed143..f5ed143 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.h +++ b/drivers/vme/bridges/vme_tsi148.h diff --git a/drivers/staging/vme/vme.c b/drivers/vme/vme.c index fd51c2d..95a9f71 100644 --- 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 index 856efa3..856efa3 100644 --- a/drivers/staging/vme/vme_api.txt +++ b/drivers/vme/vme_api.txt diff --git a/drivers/staging/vme/vme_bridge.h b/drivers/vme/vme_bridge.h index 934949a..934949a 100644 --- a/drivers/staging/vme/vme_bridge.h +++ b/drivers/vme/vme_bridge.h diff --git a/drivers/staging/vme/vme.h b/include/linux/vme.h index c9d65bf..c9d65bf 100644 --- a/drivers/staging/vme/vme.h +++ b/include/linux/vme.h |