summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/whiteheat.c
diff options
context:
space:
mode:
authorRene Buergel <rene.buergel@sohard.de>2012-09-18 09:00:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-18 17:23:47 +0100
commitcc183e2a5ebfdddc8d3498149cae6b4c40551a68 (patch)
treec1e07cdd398ac4f535da041ada1cb9f145a36357 /drivers/usb/serial/whiteheat.c
parent9fa5780beea1274d498a224822397100022da7d4 (diff)
downloadblackbird-op-linux-cc183e2a5ebfdddc8d3498149cae6b4c40551a68.tar.gz
blackbird-op-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 'drivers/usb/serial/whiteheat.c')
-rw-r--r--drivers/usb/serial/whiteheat.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 80555fc8c95d..8172ea3aead0 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -32,6 +32,7 @@
#include <linux/serial_reg.h>
#include <linux/serial.h>
#include <linux/usb/serial.h>
+#include <linux/usb/ezusb.h>
#include <linux/firmware.h>
#include <linux/ihex.h>
#include "whiteheat.h" /* WhiteHEAT specific commands */
@@ -211,7 +212,7 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
goto out;
}
ret = 0;
- response = ezusb_set_reset(serial->dev, 1);
+ response = ezusb_fx1_set_reset(serial->dev, 1);
record = (const struct ihex_binrec *)loader_fw->data;
while (record) {
@@ -228,7 +229,7 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
record = ihex_next_binrec(record);
}
- response = ezusb_set_reset(serial->dev, 0);
+ response = ezusb_fx1_set_reset(serial->dev, 0);
record = (const struct ihex_binrec *)firmware_fw->data;
while (record && be32_to_cpu(record->addr) < 0x1b40)
@@ -248,7 +249,7 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
++record;
}
- response = ezusb_set_reset(serial->dev, 1);
+ response = ezusb_fx1_set_reset(serial->dev, 1);
record = (const struct ihex_binrec *)firmware_fw->data;
while (record && be32_to_cpu(record->addr) < 0x1b40) {
@@ -266,7 +267,7 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
++record;
}
ret = 0;
- response = ezusb_set_reset(serial->dev, 0);
+ response = ezusb_fx1_set_reset(serial->dev, 0);
out:
release_firmware(loader_fw);
release_firmware(firmware_fw);
OpenPOWER on IntegriCloud