aboutsummaryrefslogtreecommitdiff
path: root/src/jtag
diff options
context:
space:
mode:
authorAngus Gratton <gus@projectgus.com>2014-07-19 18:50:55 +1000
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>2014-08-19 20:26:26 +0000
commitd50cc1bfea61b161deca9af20d6871dc53bca93b (patch)
tree7e3bd664843914809b7860bab279f5ca09270b3f /src/jtag
parent32e0fa6bcb3ffe39c60a040bd6e95751a7a96ff9 (diff)
jtag/drivers/ftdi: Use adapter_khz value for initial clock speed (was default 1kHz)
nrf51822 doesn't like a 1kHz initial clock rate, puts the DAP into a bad state. Mailing list discussion thread: http://sourceforge.net/p/openocd/mailman/openocd-devel/thread/20140718081528.GA5554%40ex2.lan/#msg32621853 Change-Id: I71aa75505cc1b41ee80c7b9db415f6ac738c2916 Signed-off-by: Angus Gratton <gus@projectgus.com> Reviewed-on: http://openocd.zylin.com/2223 Tested-by: jenkins Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'src/jtag')
-rw-r--r--src/jtag/drivers/ftdi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 0debc2dc..6406406a 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -653,8 +653,7 @@ static int ftdi_initialize(void)
mpsse_loopback_config(mpsse_ctx, false);
- /* Set a low default */
- freq = mpsse_set_frequency(mpsse_ctx, 1000);
+ freq = mpsse_set_frequency(mpsse_ctx, jtag_get_speed_khz() * 1000);
if (swd_mode)
ftdi_swd_switch_seq(NULL, JTAG_TO_SWD);