misc: i2c_eeprom: Add compatible for 24AA02E48

[people/ms/u-boot.git] / drivers / misc / cros_ec_spi.c

diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index 9359c56e876d03ed2f798e137df43975afcd2f5d..253d91a5537d5df1c60e87cd50d3d38fc6d7b8c8 100644 (file)
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -23,8 +23,10 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
 {
-       struct cros_ec_dev *dev = udev->uclass_priv;
-       struct spi_slave *slave = dev_get_parentdata(dev->dev);
+       struct cros_ec_dev *dev = dev_get_uclass_priv(udev);
+       struct spi_slave *slave = dev_get_parent_priv(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) {
@@ -66,8 +83,8 @@ int cros_ec_spi_command(struct udevice *udev, uint8_t cmd, int cmd_version,
                     const uint8_t *dout, int dout_len,
                     uint8_t **dinp, int din_len)
 {
-       struct cros_ec_dev *dev = udev->uclass_priv;
-       struct spi_slave *slave = dev_get_parentdata(dev->dev);
+       struct cros_ec_dev *dev = dev_get_uclass_priv(udev);
+       struct spi_slave *slave = dev_get_parent_priv(dev->dev);
        int in_bytes = din_len + 4;     /* status, length, checksum, trailer */
        uint8_t *out;
        uint8_t *p;
@@ -165,12 +182,12 @@ static struct dm_cros_ec_ops cros_ec_ops = {
 };
 
 static const struct udevice_id cros_ec_ids[] = {
-       { .compatible = "google,cros-ec" },
+       { .compatible = "google,cros-ec-spi" },
        { }
 };
 
 U_BOOT_DRIVER(cros_ec_spi) = {
-       .name           = "cros_ec",
+       .name           = "cros_ec_spi",
        .id             = UCLASS_CROS_EC,
        .of_match       = cros_ec_ids,
        .probe          = cros_ec_probe,