summaryrefslogtreecommitdiff
path: root/drivers/staging/ccg/Kconfig
AgeCommit message (Collapse)Author
2012-10-01Merge tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbLinus Torvalds
Pull USB changes from Greg Kroah-Hartman: "Here is the big USB pull request for 3.7-rc1 There are lots of gadget driver changes (including copying a bunch of files into the drivers/staging/ccg/ directory so that the other gadget drivers can be fixed up properly without breaking that driver), and we remove the old obsolete ub.c driver from the tree. There are also the usual XHCI set of updates, and other various driver changes and updates. We also are trying hard to remove the old dbg() macro, but the final bits of that removal will be coming in through the networking tree before we can delete it for good. All of these patches have been in the linux-next tree. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fix up several annoying - but fairly mindless - conflicts due to the termios structure having moved into the tty device, and often clashing with dbg -> dev_dbg conversion. * tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (339 commits) USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc USB: uas: fix gcc warning USB: uas: fix locking USB: Fix race condition when removing host controllers USB: uas: add locking USB: uas: fix abort USB: uas: remove aborted field, replace with status bit. USB: uas: fix task management USB: uas: keep track of command urbs xhci: Intel Panther Point BEI quirk. powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY USB: ftdi_sio: add TIAO USB Multi-Protocol Adapter (TUMPA) support Revert "usb : Add sysfs files to control port power." USB: serial: remove vizzini driver usb: host: xhci: Fix Null pointer dereferencing with 71c731a for non-x86 systems Increase XHCI suspend timeout to 16ms USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq USB: sierra_ms: don't keep unused variable fsl/usb: Add support for USB controller version 2.4 USB: qcaux: add Pantech vendor class match ...
2012-09-10staging: fix ccg build when NET is not enabledRandy Dunlap
Fix build errors in ccg when CONFIG_NET is not enabled by adding "depends on NET": ERROR: "netif_carrier_on" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "netif_carrier_off" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "skb_realloc_headroom" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "skb_trim" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "netif_rx" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "ethtool_op_get_link" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "free_netdev" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "register_netdev" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "skb_push" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "skb_pull" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "dev_kfree_skb_any" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "skb_queue_tail" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "__alloc_skb" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "eth_type_trans" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "eth_validate_addr" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "skb_dequeue" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "unregister_netdev" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "__netif_schedule" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "skb_put" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "eth_mac_addr" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "dev_get_stats" [drivers/staging/ccg/g_ccg.ko] undefined! ERROR: "alloc_etherdev_mqs" [drivers/staging/ccg/g_ccg.ko] undefined! Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Cc: Mike Lockwood <lockwood@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-10staging: ccg: Add a note about compatibility issues.Sebastian Andrzej Siewior
The first item on the todo list is a new user interface. Put this information into Kconfig's help entry to people are not too confusing once an user API changes which does not happen in kernel otherwise. Cc: devel@driverdev.osuosl.org Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com>
2012-06-12staging: usb: gadget: Configurable Composite Gadget depends on BLOCKAndrzej Pietrasiewicz
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-16staging: usb: gadget: Add Configurable Composite Gadget driverMike Lockwood
The Configurable Gadget driver is a composite driver that allows userspace to change at runtime the list of functions enabled in its configuration and to configure these functions. It supports multiple functions: acm, rndis, and mass storage. It is usually controlled by a daemon that changes the configuration based on user settings. For example, rndis is enabled when the user enables sharing the phone data connection. As an example on how to use it, the following shell commands will make the gadget disconnect from the host and make it be re-enumerated as a composite with 1 rndis and 2 acm interfaces, and a different product id: echo 0 > /sys/class/ccg_usb/ccg0/enable echo rndis,acm > /sys/class/ccg_usb/ccg0/functions echo 2 > /sys/class/ccg_usb/ccg0/f_acm/instances echo -n 0x2d01 > /sys/module/g_ccg/parameters/idProduct echo 1 > /sys/class/ccg_usb/ccg0/enable The driver requires a gadget controller that supports software control of the D+ pullup and the controller driver must support disabling the pullup during composite_bind. Signed-off-by: Mike Lockwood <lockwood@android.com> Signed-off-by: Benoit Goby <benoit@android.com> [import from android.c, implement review comments, remove adb,mtp,ptp,accessory] Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>