Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b81beec9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarAlex Elder <elder@kernel.org>
Link: https://lore.kernel.org/r/20190825055429.18547-10-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8465def4

drivers/greybus/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -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

drivers/greybus/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -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

drivers/staging/greybus/arpc.h→drivers/greybus/arpc.h

+0 −0

File moved.

View file

drivers/staging/greybus/es2.c→drivers/greybus/es2.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */

drivers/staging/greybus/Kconfig

+0 −11
Original line number Diff line number Diff line 
# 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