Commit 896fa735 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown

spi: spidev_test: Add support for Octal mode data transfers

Add support for octal transfers using the -8/--octal command line
parameter.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200416101835.14573-3-geert+renesas@glider.beSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 66ec7b3b
...@@ -128,18 +128,22 @@ static void transfer(int fd, uint8_t const *tx, uint8_t const *rx, size_t len) ...@@ -128,18 +128,22 @@ static void transfer(int fd, uint8_t const *tx, uint8_t const *rx, size_t len)
.bits_per_word = bits, .bits_per_word = bits,
}; };
if (mode & SPI_TX_QUAD) if (mode & SPI_TX_OCTAL)
tr.tx_nbits = 8;
else if (mode & SPI_TX_QUAD)
tr.tx_nbits = 4; tr.tx_nbits = 4;
else if (mode & SPI_TX_DUAL) else if (mode & SPI_TX_DUAL)
tr.tx_nbits = 2; tr.tx_nbits = 2;
if (mode & SPI_RX_QUAD) if (mode & SPI_RX_OCTAL)
tr.rx_nbits = 8;
else if (mode & SPI_RX_QUAD)
tr.rx_nbits = 4; tr.rx_nbits = 4;
else if (mode & SPI_RX_DUAL) else if (mode & SPI_RX_DUAL)
tr.rx_nbits = 2; tr.rx_nbits = 2;
if (!(mode & SPI_LOOP)) { if (!(mode & SPI_LOOP)) {
if (mode & (SPI_TX_QUAD | SPI_TX_DUAL)) if (mode & (SPI_TX_OCTAL | SPI_TX_QUAD | SPI_TX_DUAL))
tr.rx_buf = 0; tr.rx_buf = 0;
else if (mode & (SPI_RX_QUAD | SPI_RX_DUAL)) else if (mode & (SPI_RX_OCTAL | SPI_RX_QUAD | SPI_RX_DUAL))
tr.tx_buf = 0; tr.tx_buf = 0;
} }
...@@ -187,6 +191,7 @@ static void print_usage(const char *prog) ...@@ -187,6 +191,7 @@ static void print_usage(const char *prog)
" -R --ready slave pulls low to pause\n" " -R --ready slave pulls low to pause\n"
" -2 --dual dual transfer\n" " -2 --dual dual transfer\n"
" -4 --quad quad transfer\n" " -4 --quad quad transfer\n"
" -8 --octal octal transfer\n"
" -S --size transfer size\n" " -S --size transfer size\n"
" -I --iter iterations\n"); " -I --iter iterations\n");
exit(1); exit(1);
...@@ -213,13 +218,14 @@ static void parse_opts(int argc, char *argv[]) ...@@ -213,13 +218,14 @@ static void parse_opts(int argc, char *argv[])
{ "dual", 0, 0, '2' }, { "dual", 0, 0, '2' },
{ "verbose", 0, 0, 'v' }, { "verbose", 0, 0, 'v' },
{ "quad", 0, 0, '4' }, { "quad", 0, 0, '4' },
{ "octal", 0, 0, '8' },
{ "size", 1, 0, 'S' }, { "size", 1, 0, 'S' },
{ "iter", 1, 0, 'I' }, { "iter", 1, 0, 'I' },
{ NULL, 0, 0, 0 }, { NULL, 0, 0, 0 },
}; };
int c; int c;
c = getopt_long(argc, argv, "D:s:d:b:i:o:lHOLC3NR24p:vS:I:", c = getopt_long(argc, argv, "D:s:d:b:i:o:lHOLC3NR248p:vS:I:",
lopts, NULL); lopts, NULL);
if (c == -1) if (c == -1)
...@@ -280,6 +286,9 @@ static void parse_opts(int argc, char *argv[]) ...@@ -280,6 +286,9 @@ static void parse_opts(int argc, char *argv[])
case '4': case '4':
mode |= SPI_TX_QUAD; mode |= SPI_TX_QUAD;
break; break;
case '8':
mode |= SPI_TX_OCTAL;
break;
case 'S': case 'S':
transfer_size = atoi(optarg); transfer_size = atoi(optarg);
break; break;
...@@ -295,6 +304,8 @@ static void parse_opts(int argc, char *argv[]) ...@@ -295,6 +304,8 @@ static void parse_opts(int argc, char *argv[])
mode |= SPI_RX_DUAL; mode |= SPI_RX_DUAL;
if (mode & SPI_TX_QUAD) if (mode & SPI_TX_QUAD)
mode |= SPI_RX_QUAD; mode |= SPI_RX_QUAD;
if (mode & SPI_TX_OCTAL)
mode |= SPI_RX_OCTAL;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment