qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: spi: Move cmd device code into its own function 

In preparation for changing the error handling in this code for driver
model, move it into its own function.

Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2014-09-15 06:33:22 -06:00
parent 5e74934d40
commit df3b23ae3a
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
common/cmd_spi.c
View File

@ -11,6 +11,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <errno.h>
#include <spi.h> #include <spi.h>
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
@ -38,6 +39,35 @@ static int bitlen;
static uchar dout[MAX_SPI_BYTES]; static uchar dout[MAX_SPI_BYTES];
static uchar din[MAX_SPI_BYTES]; static uchar din[MAX_SPI_BYTES];
static int do_spi_xfer(int bus, int cs)
{
struct spi_slave *slave;
int rcode = 0;
slave = spi_setup_slave(bus, cs, 1000000, mode);
if (!slave) {
printf("Invalid device %d:%d\n", bus, cs);
return -EINVAL;
}
spi_claim_bus(slave);
if (spi_xfer(slave, bitlen, dout, din,
SPI_XFER_BEGIN | SPI_XFER_END) != 0) {
printf("Error during SPI transaction\n");
rcode = -EIO;
} else {
int j;
for (j = 0; j < ((bitlen + 7) / 8); j++)
printf("%02X", din[j]);
printf("\n");
}
spi_release_bus(slave);
spi_free_slave(slave);
return rcode;
}
/* /*
* SPI read/write * SPI read/write
* *
@ -51,11 +81,9 @@ static uchar din[MAX_SPI_BYTES];
int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
struct spi_slave *slave;
char *cp = 0; char *cp = 0;
uchar tmp; uchar tmp;
int j; int j;
int rcode = 0;
/* /*
* We use the last specified parameters, unless new ones are * We use the last specified parameters, unless new ones are
@ -103,27 +131,10 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 1; return 1;
} }
slave = spi_setup_slave(bus, cs, 1000000, mode); if (do_spi_xfer(bus, cs))
if (!slave) {
printf("Invalid device %d:%d\n", bus, cs);
return 1; return 1;
}
spi_claim_bus(slave); return 0;
if(spi_xfer(slave, bitlen, dout, din,
SPI_XFER_BEGIN | SPI_XFER_END) != 0) {
printf("Error during SPI transaction\n");
rcode = 1;
} else {
for(j = 0; j < ((bitlen + 7) / 8); j++) {
printf("%02X", din[j]);
}
printf("\n");
}
spi_release_bus(slave);
spi_free_slave(slave);
return rcode;
} }
/***************************************************/ /***************************************************/