X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fjlink.c;h=807bdba965350d80707f4613a9ea7dfd162dba3b;hp=1db1a711e7e9c9d4e48137bdf00e44849fed01c3;hb=4b608d7fea61855b9a284c5a8e0a2fc167bd7d1f;hpb=442f1540d5066b9ef091cab677b505f2c8196313

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 1db1a711e7..807bdba965 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -216,11 +216,23 @@ static int jlink_execute_queue(void)
 static int jlink_speed(int speed)
 {
 	int ret;
+	uint32_t freq;
+	uint16_t div;
+	int max_speed;
+
+	if (jaylink_has_cap(caps, JAYLINK_DEV_CAP_GET_SPEEDS)) {
+		ret = jaylink_get_speeds(devh, &freq, &div);
 
-	if (speed > JLINK_MAX_SPEED) {
-		LOG_INFO("Reduce speed from %d kHz to %d kHz (maximum).", speed,
-			JLINK_MAX_SPEED);
-		speed = JLINK_MAX_SPEED;
+		if (ret != JAYLINK_OK) {
+			LOG_ERROR("jaylink_get_speeds() failed: %s.",
+				jaylink_strerror_name(ret));
+			return ERROR_JTAG_DEVICE_ERROR;
+		}
+
+		freq = freq / 1000;
+		max_speed = freq / div;
+	} else {
+		max_speed = JLINK_MAX_SPEED;
 	}
 
 	if (!speed) {
@@ -230,6 +242,10 @@ static int jlink_speed(int speed)
 		}
 
 		speed = JAYLINK_SPEED_ADAPTIVE_CLOCKING;
+	} else if (speed > max_speed) {
+		LOG_INFO("Reduced speed from %d kHz to %d kHz (maximum).", speed,
+			max_speed);
+		speed = max_speed;
 	}
 
 	ret = jaylink_set_speed(devh, speed);