From cb24ddbe128eb2ad7ef6e0ef11c4cec461dbbe44 Mon Sep 17 00:00:00 2001
From: Sven Schnelle <svens@stackframe.org>
Date: Wed, 7 Sep 2011 20:48:34 +0000
Subject: [PATCH] Small fixes for the linux_spi programmer code
Corresponding to flashrom svn r1432.
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
---
linux_spi.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/linux_spi.c b/linux_spi.c
index d120754..de82def 100644
--- a/linux_spi.c
+++ b/linux_spi.c
@@ -54,7 +54,7 @@ static const struct spi_programmer spi_programmer_linux = {
int linux_spi_init(void)
{
char *p, *endp, *dev;
- int speed = 0;
+ uint32_t speed = 0;
dev = extract_programmer_param("dev");
if (!dev || !strlen(dev)) {
@@ -65,24 +65,29 @@ int linux_spi_init(void)
p = extract_programmer_param("speed");
if (p && strlen(p)) {
- speed = strtoul(p, &endp, 10) * 1024;
+ speed = (uint32_t)strtoul(p, &endp, 10) * 1024;
if (p == endp) {
msg_perr("%s: invalid clock: %s kHz\n", __func__, p);
return 1;
}
}
+ msg_pdbg("Using device %s\n", dev);
if ((fd = open(dev, O_RDWR)) == -1) {
msg_perr("%s: failed to open %s: %s\n", __func__,
dev, strerror(errno));
return 1;
}
- if (speed > 0 && ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed) == -1) {
- msg_perr("%s: failed to set speed %dHz: %s\n",
- __func__, speed, strerror(errno));
- close(fd);
- return 1;
+ if (speed > 0) {
+ if (ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed) == -1) {
+ msg_perr("%s: failed to set speed %dHz: %s\n",
+ __func__, speed, strerror(errno));
+ close(fd);
+ return 1;
+ }
+
+ msg_pdbg("Using %d kHz clock\n", speed);
}
if (register_shutdown(linux_spi_shutdown, NULL))
--
GitLab