Merge "usb: gadget: Enable HID function for charging mode" (81b002a3) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/gadget/android.c

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -74,6 +74,7 @@
	#include "f_uac1.c"		#include "f_uac1.c"
	#endif		#endif
	#include "f_ncm.c"		#include "f_ncm.c"
			#include "f_charger.c"

	MODULE_AUTHOR("Mike Lockwood");		MODULE_AUTHOR("Mike Lockwood");
	MODULE_DESCRIPTION("Android Composite USB Driver");		MODULE_DESCRIPTION("Android Composite USB Driver");
	@@ -1743,6 +1744,19 @@ static struct android_usb_function ccid_function = {
	.bind_config = ccid_function_bind_config,		.bind_config = ccid_function_bind_config,
	};		};

			/* Charger */
			static int charger_function_bind_config(struct android_usb_function *f,
			struct usb_configuration *c)
			{
			return charger_bind_config(c);
			}

			static struct android_usb_function charger_function = {
			.name = "charging",
			.bind_config = charger_function_bind_config,
			};


	static int		static int
	mtp_function_init(struct android_usb_function *f,		mtp_function_init(struct android_usb_function *f,
	struct usb_composite_dev *cdev)		struct usb_composite_dev *cdev)
	@@ -2641,6 +2655,7 @@ static struct android_usb_function *supported_functions[] = {
	&audio_source_function,		&audio_source_function,
	#endif		#endif
	&uasp_function,		&uasp_function,
			&charger_function,
	NULL		NULL
	};		};

+165 −569

File changed.

Preview size limit exceeded, changes collapsed.