From db3b9e990e75573402cda22faf933760f076c033 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 26 Apr 2012 12:34:58 -0700 Subject: [PATCH] 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 Cc: Manohar Vanga Cc: Vincent Bossier Cc: "Emilio G. Cota" Signed-off-by: Greg Kroah-Hartman --- drivers/Kconfig | 2 ++ drivers/Makefile | 1 + drivers/staging/Kconfig | 2 -- drivers/staging/vme/Makefile | 7 ------- drivers/staging/vme/TODO | 5 ----- drivers/staging/vme/devices/Kconfig | 3 ++- drivers/staging/vme/devices/vme_pio2_cntr.c | 2 +- drivers/staging/vme/devices/vme_pio2_core.c | 2 +- drivers/staging/vme/devices/vme_pio2_gpio.c | 2 +- drivers/staging/vme/devices/vme_user.c | 2 +- drivers/{staging => }/vme/Kconfig | 6 +++--- drivers/vme/Makefile | 7 +++++++ drivers/{staging => }/vme/boards/Kconfig | 0 drivers/{staging => }/vme/boards/Makefile | 0 drivers/{staging => }/vme/boards/vme_vmivme7805.c | 0 drivers/{staging => }/vme/boards/vme_vmivme7805.h | 0 drivers/{staging => }/vme/bridges/Kconfig | 0 drivers/{staging => }/vme/bridges/Makefile | 0 drivers/{staging => }/vme/bridges/vme_ca91cx42.c | 2 +- drivers/{staging => }/vme/bridges/vme_ca91cx42.h | 0 drivers/{staging => }/vme/bridges/vme_tsi148.c | 2 +- drivers/{staging => }/vme/bridges/vme_tsi148.h | 0 drivers/{staging => }/vme/vme.c | 2 +- drivers/{staging => }/vme/vme_api.txt | 0 drivers/{staging => }/vme/vme_bridge.h | 0 {drivers/staging/vme => include/linux}/vme.h | 0 26 files changed, 22 insertions(+), 25 deletions(-) delete mode 100644 drivers/staging/vme/TODO rename drivers/{staging => }/vme/Kconfig (73%) create mode 100644 drivers/vme/Makefile rename drivers/{staging => }/vme/boards/Kconfig (100%) rename drivers/{staging => }/vme/boards/Makefile (100%) rename drivers/{staging => }/vme/boards/vme_vmivme7805.c (100%) rename drivers/{staging => }/vme/boards/vme_vmivme7805.h (100%) rename drivers/{staging => }/vme/bridges/Kconfig (100%) rename drivers/{staging => }/vme/bridges/Makefile (100%) rename drivers/{staging => }/vme/bridges/vme_ca91cx42.c (99%) rename drivers/{staging => }/vme/bridges/vme_ca91cx42.h (100%) rename drivers/{staging => }/vme/bridges/vme_tsi148.c (99%) rename drivers/{staging => }/vme/bridges/vme_tsi148.h (100%) rename drivers/{staging => }/vme/vme.c (99%) rename drivers/{staging => }/vme/vme_api.txt (100%) rename drivers/{staging => }/vme/vme_bridge.h (100%) rename {drivers/staging/vme => include/linux}/vme.h (100%) diff --git a/drivers/Kconfig b/drivers/Kconfig index 0265cb12cdaa..e245779443da 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 cdbe362df0ec..08b78e035468 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 8d406b5938c0..60221efc417b 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 b4ea3f8d0a50..accdb72e39e2 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 79f00333e7ef..000000000000 --- 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 55ec30cb1fa2..d0cab1766190 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 08e0d59806ca..6335471faa36 100644 --- a/drivers/staging/vme/devices/vme_pio2_cntr.c +++ b/drivers/staging/vme/devices/vme_pio2_cntr.c @@ -17,8 +17,8 @@ #include #include #include +#include -#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 d476b2e9d39f..78228d447f25 100644 --- a/drivers/staging/vme/devices/vme_pio2_core.c +++ b/drivers/staging/vme/devices/vme_pio2_core.c @@ -19,8 +19,8 @@ #include #include #include +#include -#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 9c459c1b6eb8..ad76a477825b 100644 --- a/drivers/staging/vme/devices/vme_pio2_gpio.c +++ b/drivers/staging/vme/devices/vme_pio2_gpio.c @@ -20,8 +20,8 @@ #include #include #include +#include -#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 10269d59942f..e24a6f95db12 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -36,8 +36,8 @@ #include #include +#include -#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 6411ae51ed3f..c5c22465a805 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 000000000000..d7bfcb9fd5a1 --- /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 515b8b8e32a8..a3c0f84e2fa1 100644 --- a/drivers/staging/vme/bridges/vme_ca91cx42.c +++ b/drivers/vme/bridges/vme_ca91cx42.c @@ -29,8 +29,8 @@ #include #include #include +#include -#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 ced59421302e..081e9c4c5e71 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.c +++ b/drivers/vme/bridges/vme_tsi148.c @@ -30,8 +30,8 @@ #include #include #include +#include -#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 fd51c2d44718..95a9f71d793e 100644 --- a/drivers/staging/vme/vme.c +++ b/drivers/vme/vme.c @@ -30,8 +30,8 @@ #include #include #include +#include -#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 -- 2.34.1