V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: spi: Adjust cmd_spi to work with driver model 

Driver model uses a different way to find the SPI bus and slave from the
numbered devices given on the command line. Adjust the code to suit.

We use a generic SPI device, and attach it to the SPI bus before performing
the transaction.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
This commit is contained in:
Simon Glass 2014-10-13 23:41:56 -06:00
parent 843c9e8796
commit 1157a161b0
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
common/cmd_spi.c
View File

@ -11,6 +11,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <dm.h>
#include <errno.h> #include <errno.h>
#include <spi.h> #include <spi.h>
@ -42,19 +43,38 @@ static uchar din[MAX_SPI_BYTES];
static int do_spi_xfer(int bus, int cs) static int do_spi_xfer(int bus, int cs)
{ {
struct spi_slave *slave; struct spi_slave *slave;
int rcode = 0; int ret = 0;
#ifdef CONFIG_DM_SPI
char name[30], *str;
struct udevice *dev;
snprintf(name, sizeof(name), "generic_%d:%d", bus, cs);
str = strdup(name);
ret = spi_get_bus_and_cs(bus, cs, 1000000, mode, "spi_generic_drv",
str, &dev, &slave);
if (ret)
return ret;
#else
slave = spi_setup_slave(bus, cs, 1000000, mode); slave = spi_setup_slave(bus, cs, 1000000, mode);
if (!slave) { if (!slave) {
printf("Invalid device %d:%d\n", bus, cs); printf("Invalid device %d:%d\n", bus, cs);
return -EINVAL; return -EINVAL;
} }
#endif
spi_claim_bus(slave); ret = spi_claim_bus(slave);
if (spi_xfer(slave, bitlen, dout, din, if (ret)
SPI_XFER_BEGIN | SPI_XFER_END) != 0) { goto done;
printf("Error during SPI transaction\n"); ret = spi_xfer(slave, bitlen, dout, din,
rcode = -EIO; SPI_XFER_BEGIN | SPI_XFER_END);
#ifndef CONFIG_DM_SPI
/* We don't get an error code in this case */
if (ret)
ret = -EIO;
#endif
if (ret) {
printf("Error %d during SPI transaction\n", ret);
} else { } else {
int j; int j;
@ -62,10 +82,13 @@ static int do_spi_xfer(int bus, int cs)
printf("%02X", din[j]); printf("%02X", din[j]);
printf("\n"); printf("\n");
} }
done:
spi_release_bus(slave); spi_release_bus(slave);
#ifndef CONFIG_DM_SPI
spi_free_slave(slave); spi_free_slave(slave);
#endif
return rcode; return ret;
} }
/* /*