diff options
| author | Tom Rini <[email protected]> | 2015-05-08 10:46:59 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2015-05-08 10:46:59 -0400 |
| commit | 02ffb580e6ab7aaa7f6703ed35f489e97439cb65 (patch) | |
| tree | 77cea28c53d54583a3acfa5534a8aa10054eb29c /drivers/misc | |
| parent | 57cc4e64c13bc5f42cb5e8572d2c46e25cf7aea1 (diff) | |
| parent | a5e1bcdeebebabdc5d013fbd488f87a4e62ff411 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/cros_ec.c | 3 | ||||
| -rw-r--r-- | drivers/misc/cros_ec_spi.c | 23 |
2 files changed, 22 insertions, 4 deletions
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 982bac788d5..4b6ac6a6c01 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -986,7 +986,8 @@ int cros_ec_register(struct udevice *dev) } /* Remember this device for use by the cros_ec command */ - debug("Google Chrome EC CROS-EC driver ready, id '%s'\n", id); + debug("Google Chrome EC v%d CROS-EC driver ready, id '%s'\n", + cdev->protocol_version, id); return 0; } diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c index ac2ee86edae..0686925aaf1 100644 --- a/drivers/misc/cros_ec_spi.c +++ b/drivers/misc/cros_ec_spi.c @@ -25,6 +25,8 @@ int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes) { struct cros_ec_dev *dev = dev_get_uclass_priv(udev); struct spi_slave *slave = dev_get_parentdata(dev->dev); + ulong start; + uint8_t byte; int rv; /* Do the transfer */ @@ -33,10 +35,25 @@ int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes) return -1; } - rv = spi_xfer(slave, max(out_bytes, in_bytes) * 8, - dev->dout, dev->din, - SPI_XFER_BEGIN | SPI_XFER_END); + rv = spi_xfer(slave, out_bytes * 8, dev->dout, NULL, SPI_XFER_BEGIN); + if (rv) + goto done; + start = get_timer(0); + while (1) { + rv = spi_xfer(slave, 8, NULL, &byte, 0); + if (byte == SPI_PREAMBLE_END_BYTE) + break; + if (rv) + goto done; + if (get_timer(start) > 100) { + rv = -ETIMEDOUT; + goto done; + } + } + rv = spi_xfer(slave, in_bytes * 8, NULL, dev->din, 0); +done: + spi_xfer(slave, 0, NULL, NULL, SPI_XFER_END); spi_release_bus(slave); if (rv) { |