summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRene Buergel2012-09-18 09:00:41 +0200
committerGreg Kroah-Hartman2012-09-18 18:23:47 +0200
commitcc183e2a5ebfdddc8d3498149cae6b4c40551a68 (patch)
treec1e07cdd398ac4f535da041ada1cb9f145a36357 /include
parentUSB EHCI/Xen: propagate controller reset information to hypervisor (diff)
downloadkernel-qcow2-linux-cc183e2a5ebfdddc8d3498149cae6b4c40551a68.tar.gz
kernel-qcow2-linux-cc183e2a5ebfdddc8d3498149cae6b4c40551a68.tar.xz
kernel-qcow2-linux-cc183e2a5ebfdddc8d3498149cae6b4c40551a68.zip
USB: ezusb: add support for Cypress FX2LP
This Patch adds support for the newer Cypress FX2LP. It also adapts three drivers currently using ezusb to the interface change. (whiteheat and keyspan[_pda]) Signed-off-by: René Bürgel <rene.buergel@sohard.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/usb/ezusb.h16
-rw-r--r--include/linux/usb/serial.h4
2 files changed, 16 insertions, 4 deletions
diff --git a/include/linux/usb/ezusb.h b/include/linux/usb/ezusb.h
new file mode 100644
index 000000000000..fc618d8d1e92
--- /dev/null
+++ b/include/linux/usb/ezusb.h
@@ -0,0 +1,16 @@
+#ifndef __EZUSB_H
+#define __EZUSB_H
+
+
+extern int ezusb_writememory(struct usb_device *dev, int address,
+ unsigned char *data, int length, __u8 bRequest);
+
+extern int ezusb_fx1_set_reset(struct usb_device *dev, unsigned char reset_bit);
+extern int ezusb_fx2_set_reset(struct usb_device *dev, unsigned char reset_bit);
+
+extern int ezusb_fx1_ihex_firmware_download(struct usb_device *dev,
+ const char *firmware_path);
+extern int ezusb_fx2_ihex_firmware_download(struct usb_device *dev,
+ const char *firmware_path);
+
+#endif /* __EZUSB_H */
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 5808713aa492..ef9be7e1e190 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -301,10 +301,6 @@ extern void usb_serial_port_softint(struct usb_serial_port *port);
extern int usb_serial_suspend(struct usb_interface *intf, pm_message_t message);
extern int usb_serial_resume(struct usb_interface *intf);
-extern int ezusb_writememory(struct usb_device *dev, int address,
- unsigned char *data, int length, __u8 bRequest);
-extern int ezusb_set_reset(struct usb_device *dev, unsigned char reset_bit);
-
/* USB Serial console functions */
#ifdef CONFIG_USB_SERIAL_CONSOLE
extern void usb_serial_console_init(int minor);