openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

linux_spi: Stop messing up the units of SPI speed

Browse Source 
'speed' is stored in Hz, so rename the variable to 'speed_hz' to
clarify any potential confusion. Also, when printing the speed after
setting it with an ioctl, convert it to kHz to match the units given
in the message.

Corresponding to flashrom svn r1769.

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Alexandru Gagniuc 2014-03-19 17:17:06 +00:00 committed by Stefan Tauner
parent d29806ffde
commit 69dd09d881
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux_spi.c
View File

@ -60,7 +60,7 @@ static const struct spi_programmer spi_programmer_linux = {
int linux_spi_init(void) int linux_spi_init(void)
{ {
char *p, *endp, *dev; char *p, *endp, *dev;
uint32_t speed = 0; uint32_t speed_hz = 0;
/* FIXME: make the following configurable by CLI options. */ /* FIXME: make the following configurable by CLI options. */
/* SPI mode 0 (beware this also includes: MSB first, CS active low and others */ /* SPI mode 0 (beware this also includes: MSB first, CS active low and others */
const uint8_t mode = SPI_MODE_0; const uint8_t mode = SPI_MODE_0;
@ -68,7 +68,7 @@ int linux_spi_init(void)
p = extract_programmer_param("spispeed"); p = extract_programmer_param("spispeed");
if (p && strlen(p)) { if (p && strlen(p)) {
speed = (uint32_t)strtoul(p, &endp, 10) * 1000; speed_hz = (uint32_t)strtoul(p, &endp, 10) * 1000;
if (p == endp) { if (p == endp) {
msg_perr("%s: invalid clock: %s kHz\n", __func__, p); msg_perr("%s: invalid clock: %s kHz\n", __func__, p);
free(p); free(p);
@ -98,14 +98,14 @@ int linux_spi_init(void)
return 1; return 1;
/* We rely on the shutdown function for cleanup from here on. */ /* We rely on the shutdown function for cleanup from here on. */
if (speed > 0) { if (speed_hz > 0) {
if (ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed) == -1) { if (ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed_hz) == -1) {
msg_perr("%s: failed to set speed to %d Hz: %s\n", msg_perr("%s: failed to set speed to %d Hz: %s\n",
__func__, speed, strerror(errno)); __func__, speed_hz, strerror(errno));
return 1; return 1;
} }
msg_pdbg("Using %d kHz clock\n", speed); msg_pdbg("Using %d kHz clock\n", speed_hz/1000);
} }
if (ioctl(fd, SPI_IOC_WR_MODE, &mode) == -1) { if (ioctl(fd, SPI_IOC_WR_MODE, &mode) == -1) {