Commit-ID:  57fb47279a04cd53641dc5ae55a6d47e4f32a2fd
Gitweb:     http://git.kernel.org/tip/57fb47279a04cd53641dc5ae55a6d47e4f32a2fd
Author:     Lu Baolu <baolu...@linux.intel.com>
AuthorDate: Tue, 21 Mar 2017 16:01:32 +0800
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Tue, 21 Mar 2017 12:30:17 +0100

usb/serial: Add DBC debug device support to usb_debug

This patch adds DBC debug device support to the usb_debug driver.

Signed-off-by: Lu Baolu <baolu...@linux.intel.com>
Acked-by: Thomas Gleixner <t...@linutronix.de>
Acked-by: Johan Hovold <jo...@kernel.org>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Mathias Nyman <mathias.ny...@linux.intel.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: linux-...@vger.kernel.org
Link: 
http://lkml.kernel.org/r/1490083293-3792-5-git-send-email-baolu...@linux.intel.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 drivers/usb/serial/usb_debug.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
index ca2fa5b..92f7e5c 100644
--- a/drivers/usb/serial/usb_debug.c
+++ b/drivers/usb/serial/usb_debug.c
@@ -32,7 +32,18 @@ static const struct usb_device_id id_table[] = {
        { USB_DEVICE(0x0525, 0x127a) },
        { },
 };
-MODULE_DEVICE_TABLE(usb, id_table);
+
+static const struct usb_device_id dbc_id_table[] = {
+       { USB_DEVICE(0x1d6b, 0x0004) },
+       { },
+};
+
+static const struct usb_device_id id_table_combined[] = {
+       { USB_DEVICE(0x0525, 0x127a) },
+       { USB_DEVICE(0x1d6b, 0x0004) },
+       { },
+};
+MODULE_DEVICE_TABLE(usb, id_table_combined);
 
 /* This HW really does not support a serial break, so one will be
  * emulated when ever the break state is set to true.
@@ -71,9 +82,20 @@ static struct usb_serial_driver debug_device = {
        .process_read_urb =     usb_debug_process_read_urb,
 };
 
+static struct usb_serial_driver dbc_device = {
+       .driver = {
+               .owner =        THIS_MODULE,
+               .name =         "xhci_dbc",
+       },
+       .id_table =             dbc_id_table,
+       .num_ports =            1,
+       .break_ctl =            usb_debug_break_ctl,
+       .process_read_urb =     usb_debug_process_read_urb,
+};
+
 static struct usb_serial_driver * const serial_drivers[] = {
-       &debug_device, NULL
+       &debug_device, &dbc_device, NULL
 };
 
-module_usb_serial_driver(serial_drivers, id_table);
+module_usb_serial_driver(serial_drivers, id_table_combined);
 MODULE_LICENSE("GPL");

Reply via email to