staging: greybus: move es2 to drivers/greybus/

The es2 Greybus host controller has long been stable, so move it out of
drivers/staging/ to drivers/greybus/

Cc: Johan Hovold <johan@kernel.org>
Cc: greybus-dev@lists.linaro.org
Cc: linux-kernel@vger.kernel.org
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Alex Elder <elder@kernel.org>
Link: https://lore.kernel.org/r/20190825055429.18547-10-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/greybus/Kconfig b/drivers/greybus/Kconfig
index 158d8893114ccd6ffaf3a51132ee8c631b6cc7ee..b84fcaf8b105cf030be181dae737245ab03fd0ef 100644 (file)
--- a/drivers/greybus/Kconfig
+++ b/drivers/greybus/Kconfig
@@ -14,3 +14,19 @@ menuconfig GREYBUS
 
          To compile this code as a module, chose M here: the module
          will be called greybus.ko
+
+if GREYBUS
+
+config GREYBUS_ES2
+       tristate "Greybus ES3 USB host controller"
+       depends on USB
+       ---help---
+         Select this option if you have a Toshiba ES3 USB device that
+         acts as a Greybus "host controller".  This device is a bridge
+         from a USB device to a Unipro network.
+
+         To compile this code as a module, chose M here: the module
+         will be called gb-es2.ko
+
+endif  # GREYBUS
+

diff --git a/drivers/greybus/Makefile b/drivers/greybus/Makefile
index 03b22616ec7db20ad190117a6e7b263006767778..9bccdd229aa2ee6d77cb16763c9bca2a2092a2d2 100644 (file)
--- a/drivers/greybus/Makefile
+++ b/drivers/greybus/Makefile
@@ -17,3 +17,10 @@ obj-$(CONFIG_GREYBUS)                += greybus.o
 
 # needed for trace events
 ccflags-y += -I$(src)
+
+# Greybus Host controller drivers
+gb-es2-y := es2.o
+
+obj-$(CONFIG_GREYBUS_ES2)      += gb-es2.o
+
+

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

diff --git a/drivers/staging/greybus/es2.c b/drivers/greybus/es2.c
similarity index 99%
rename from drivers/staging/greybus/es2.c
rename to drivers/greybus/es2.c
index 5b755e76d8a4dc92a8c9414e8d289401dd0749b0..366716f11b1a5087a6263fe5f0d9d08873839848 100644 (file)
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/greybus/es2.c
@@ -15,7 +15,7 @@
 #include <asm/unaligned.h>
 
 #include "arpc.h"
-#include "../../greybus/greybus_trace.h"
+#include "greybus_trace.h"
 
 
 /* Default timeout for USB vendor requests. */

diff --git a/drivers/staging/greybus/Kconfig b/drivers/staging/greybus/Kconfig
index d03c37e1e6e88ef1c127a34e0a6a93580c3c0457..d4777f5a8b90d96565d5e6dfb0a67cd60fcf499c 100644 (file)
--- a/drivers/staging/greybus/Kconfig
+++ b/drivers/staging/greybus/Kconfig
@@ -1,17 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 if GREYBUS
 
-config GREYBUS_ES2
-       tristate "Greybus ES3 USB host controller"
-       depends on USB
-       ---help---
-         Select this option if you have a Toshiba ES3 USB device that
-         acts as a Greybus "host controller".  This device is a bridge
-         from a USB device to a Unipro network.
-
-         To compile this code as a module, chose M here: the module
-         will be called gb-es2.ko
-
 config GREYBUS_AUDIO
        tristate "Greybus Audio Class driver"
        depends on SOUND

diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index d16853399c9abfa24d5ded90e64238b476e74494..627e44f2a983cdb9f4b39352405110bc50a3d0a2 100644 (file)
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -2,11 +2,6 @@
 # needed for trace events
 ccflags-y += -I$(src)
 
-# Greybus Host controller drivers
-gb-es2-y := es2.o
-
-obj-$(CONFIG_GREYBUS_ES2)      += gb-es2.o
-
 # Greybus class drivers
 gb-bootrom-y           := bootrom.o
 gb-camera-y            := camera.o