From 63fc2625d029bb01844f3b6cd4510cb1fffcac27 Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Tue, 19 Apr 2011 20:37:33 -0700 Subject: usb: gadget: android: Update android gadget driver * Functions and the device descriptor are configured from user space: echo 0 > /sys/class/android_usb/android0/enable echo adb,acm > /sys/class/android_usb/android0/functions echo 2 > /sys/class/android_usb/android0/f_acm/instances echo 1 > /sys/class/android_usb/android0/enable * Driver does not require platform data anymore * Moved function initialization to android.c instead of each function file * Replaced switches by uevents Signed-off-by: Benoit Goby Signed-off-by: Mike Lockwood Change-Id: If5ad9267c111ad0a442f0d87a0d31082dc5381b6 --- drivers/usb/gadget/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'drivers/usb/gadget/Makefile') diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 51eca09484db..9f23214a94df 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -51,6 +51,7 @@ g_dbgp-y := dbgp.o g_nokia-y := nokia.o g_webcam-y := webcam.o g_ncm-y := ncm.o +g_android-y := android.o obj-$(CONFIG_USB_ZERO) += g_zero.o obj-$(CONFIG_USB_AUDIO) += g_audio.o @@ -69,10 +70,4 @@ obj-$(CONFIG_USB_G_MULTI) += g_multi.o obj-$(CONFIG_USB_G_NOKIA) += g_nokia.o obj-$(CONFIG_USB_G_WEBCAM) += g_webcam.o obj-$(CONFIG_USB_G_NCM) += g_ncm.o -obj-$(CONFIG_USB_ANDROID) += android.o -obj-$(CONFIG_USB_ANDROID_ACM) += f_acm.o u_serial.o -obj-$(CONFIG_USB_ANDROID_ADB) += f_adb.o -obj-$(CONFIG_USB_ANDROID_MASS_STORAGE) += f_mass_storage.o -obj-$(CONFIG_USB_ANDROID_MTP) += f_mtp.o -obj-$(CONFIG_USB_ANDROID_RNDIS) += f_rndis.o u_ether.o -obj-$(CONFIG_USB_ANDROID_ACCESSORY) += f_accessory.o +obj-$(CONFIG_USB_G_ANDROID) += g_android.o -- cgit v1.2.3