aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/whiteheat.c
diff options
context:
space:
mode:
authorRene Buergel <rene.buergel@sohard.de>2012-09-18 03:00:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-18 12:23:47 -0400
commitcc183e2a5ebfdddc8d3498149cae6b4c40551a68 (patch)
treec1e07cdd398ac4f535da041ada1cb9f145a36357 /drivers/usb/serial/whiteheat.c
parent9fa5780beea1274d498a224822397100022da7d4 (diff)
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 @@
32#include <linux/serial_reg.h> 32#include <linux/serial_reg.h>
33#include <linux/serial.h> 33#include <linux/serial.h>
34#include <linux/usb/serial.h> 34#include <linux/usb/serial.h>
35#include <linux/usb/ezusb.h>
35#include <linux/firmware.h> 36#include <linux/firmware.h>
36#include <linux/ihex.h> 37#include <linux/ihex.h>
37#include "whiteheat.h" /* WhiteHEAT specific commands */ 38#include "whiteheat.h" /* WhiteHEAT specific commands */
@@ -211,7 +212,7 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
211 goto out; 212 goto out;
212 } 213 }
213 ret = 0; 214 ret = 0;
214 response = ezusb_set_reset(serial->dev, 1); 215 response = ezusb_fx1_set_reset(serial->dev, 1);
215 216
216 record = (const struct ihex_binrec *)loader_fw->data; 217 record = (const struct ihex_binrec *)loader_fw->data;
217 while (record) { 218 while (record) {
@@ -228,7 +229,7 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
228 record = ihex_next_binrec(record); 229 record = ihex_next_binrec(record);
229 } 230 }
230 231
231 response = ezusb_set_reset(serial->dev, 0); 232 response = ezusb_fx1_set_reset(serial->dev, 0);
232 233
233 record = (const struct ihex_binrec *)firmware_fw->data; 234 record = (const struct ihex_binrec *)firmware_fw->data;
234 while (record && be32_to_cpu(record->addr) < 0x1b40) 235 while (record && be32_to_cpu(record->addr) < 0x1b40)
@@ -248,7 +249,7 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
248 ++record; 249 ++record;
249 } 250 }
250 251
251 response = ezusb_set_reset(serial->dev, 1); 252 response = ezusb_fx1_set_reset(serial->dev, 1);
252 253
253 record = (const struct ihex_binrec *)firmware_fw->data; 254 record = (const struct ihex_binrec *)firmware_fw->data;
254 while (record && be32_to_cpu(record->addr) < 0x1b40) { 255 while (record && be32_to_cpu(record->addr) < 0x1b40) {
@@ -266,7 +267,7 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
266 ++record; 267 ++record;
267 } 268 }
268 ret = 0; 269 ret = 0;
269 response = ezusb_set_reset(serial->dev, 0); 270 response = ezusb_fx1_set_reset(serial->dev, 0);
270 out: 271 out:
271 release_firmware(loader_fw); 272 release_firmware(loader_fw);
272 release_firmware(firmware_fw); 273 release_firmware(firmware_fw);