staging: greybus: move the greybus core to drivers/greybus

The Greybus core code has been stable for a long time, and has been
shipping for many years in millions of phones.  With the advent of a
recent Google Summer of Code project, and a number of new devices in the
works from various companies, it is time to get the core greybus code
out of staging as it really is going to be with us for a while.

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f38cba2c581ffb99d5f9f5f24a2cf00341bf4bf..e3242687cd192f4cd3e4a2d0458fc03712b870f7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7003,6 +7003,9 @@ M:        Alex Elder <elder@kernel.org>
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:     Maintained
 F:     drivers/staging/greybus/
+F:     drivers/greybus/
+F:     include/linux/greybus.h
+F:     include/linux/greybus/
 L:     greybus-dev@lists.linaro.org (moderated for non-subscribers)
 
 GREYBUS UART PROTOCOLS DRIVERS

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 61cf4ea2c229b3c03e2fcb5a890def6a15642d31..7dce76ae7369239fbe3d4061ecdbc951d97af986 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -146,6 +146,8 @@ source "drivers/hv/Kconfig"
 
 source "drivers/xen/Kconfig"
 
+source "drivers/greybus/Kconfig"
+
 source "drivers/staging/Kconfig"
 
 source "drivers/platform/Kconfig"

diff --git a/drivers/Makefile b/drivers/Makefile
index 6d37564e783cb2d27f86a5c38b00891dee611cee..73df8e5a2fce30ce8a09381e78bdedba8642aa91 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -148,6 +148,7 @@ obj-$(CONFIG_BCMA)          += bcma/
 obj-$(CONFIG_VHOST_RING)       += vhost/
 obj-$(CONFIG_VHOST)            += vhost/
 obj-$(CONFIG_VLYNQ)            += vlynq/
+obj-$(CONFIG_GREYBUS)          += greybus/
 obj-$(CONFIG_STAGING)          += staging/
 obj-y                          += platform/
 

diff --git a/drivers/greybus/Kconfig b/drivers/greybus/Kconfig
new file mode 100644 (file)
index 0000000..158d889
--- /dev/null
+++ b/drivers/greybus/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0
+menuconfig GREYBUS
+       tristate "Greybus support"
+       depends on SYSFS
+       ---help---
+         This option enables the Greybus driver core.  Greybus is an
+         hardware protocol that was designed to provide Unipro with a
+         sane application layer.  It was originally designed for the
+         ARA project, a module phone system, but has shown up in other
+         phones, and can be tunneled over other busses in order to
+         control hardware devices.
+
+         Say Y here to enable support for these types of drivers.
+
+         To compile this code as a module, chose M here: the module
+         will be called greybus.ko

diff --git a/drivers/greybus/Makefile b/drivers/greybus/Makefile
new file mode 100644 (file)
index 0000000..03b2261
--- /dev/null
+++ b/drivers/greybus/Makefile
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0
+# Greybus core
+greybus-y :=   core.o          \
+               debugfs.o       \
+               hd.o            \
+               manifest.o      \
+               module.o        \
+               interface.o     \
+               bundle.o        \
+               connection.o    \
+               control.o       \
+               svc.o           \
+               svc_watchdog.o  \
+               operation.o
+
+obj-$(CONFIG_GREYBUS)          += greybus.o
+
+# needed for trace events
+ccflags-y += -I$(src)

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/drivers/staging/greybus/Kconfig b/drivers/staging/greybus/Kconfig
index 4894c35149551d241d6754ea1edac8020f2fe1aa..d03c37e1e6e88ef1c127a34e0a6a93580c3c0457 100644 (file)
--- a/drivers/staging/greybus/Kconfig
+++ b/drivers/staging/greybus/Kconfig
@@ -1,20 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-menuconfig GREYBUS
-       tristate "Greybus support"
-       depends on SYSFS
-       ---help---
-         This option enables the Greybus driver core.  Greybus is an
-         hardware protocol that was designed to provide Unipro with a
-         sane application layer.  It was originally designed for the
-         ARA project, a module phone system, but has shown up in other
-         phones, and can be tunneled over other busses in order to
-         control hardware devices.
-
-         Say Y here to enable support for these types of drivers.
-
-         To compile this code as a module, chose M here: the module
-         will be called greybus.ko
-
 if GREYBUS
 
 config GREYBUS_ES2

diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index 2551ed16b7423b1d1706fc3a2aeefc4fb0b9fe41..d16853399c9abfa24d5ded90e64238b476e74494 100644 (file)
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -1,24 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
-# Greybus core
-greybus-y :=   core.o          \
-               debugfs.o       \
-               hd.o            \
-               manifest.o      \
-               module.o        \
-               interface.o     \
-               bundle.o        \
-               connection.o    \
-               control.o       \
-               svc.o           \
-               svc_watchdog.o  \
-               operation.o
-
-obj-$(CONFIG_GREYBUS)          += greybus.o
-
 # needed for trace events
 ccflags-y += -I$(src)
 
-
 # Greybus Host controller drivers
 gb-es2-y := es2.o
 

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