dm: spi: Adjust cmd_spi to work with driver model

[karo-tx-uboot.git] / common / cmd_spi.c

diff --git a/common/cmd_spi.c b/common/cmd_spi.c
index 3c8e913be564cee3e905dee4f63c5afec515f070..64c3ffcf423b35fc1b0a65daccb99d490a053c5f 100644 (file)
--- a/common/cmd_spi.c
+++ b/common/cmd_spi.c
@@ -11,6 +11,8 @@
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
+#include <errno.h>
 #include <spi.h>
 
 /*-----------------------------------------------------------------------
@@ -38,6 +40,57 @@ static int                   bitlen;
 static uchar           dout[MAX_SPI_BYTES];
 static uchar           din[MAX_SPI_BYTES];
 
+static int do_spi_xfer(int bus, int cs)
+{
+       struct spi_slave *slave;
+       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);
+       if (!slave) {
+               printf("Invalid device %d:%d\n", bus, cs);
+               return -EINVAL;
+       }
+#endif
+
+       ret = spi_claim_bus(slave);
+       if (ret)
+               goto done;
+       ret = spi_xfer(slave, bitlen, dout, din,
+                      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 {
+               int j;
+
+               for (j = 0; j < ((bitlen + 7) / 8); j++)
+                       printf("%02X", din[j]);
+               printf("\n");
+       }
+done:
+       spi_release_bus(slave);
+#ifndef CONFIG_DM_SPI
+       spi_free_slave(slave);
+#endif
+
+       return ret;
+}
+
 /*
  * SPI read/write
  *
@@ -51,11 +104,9 @@ static uchar                din[MAX_SPI_BYTES];
 
 int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       struct spi_slave *slave;
        char  *cp = 0;
        uchar tmp;
        int   j;
-       int   rcode = 0;
 
        /*
         * We use the last specified parameters, unless new ones are
@@ -103,27 +154,10 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return 1;
        }
 
-       slave = spi_setup_slave(bus, cs, 1000000, mode);
-       if (!slave) {
-               printf("Invalid device %d:%d\n", bus, cs);
+       if (do_spi_xfer(bus, cs))
                return 1;
-       }
-
-       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 = 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;
+       return 0;
 }
 
 /***************************************************/