dm: Adjust lists_bind_fdt() to return the bound device

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

diff --git a/common/cmd_spi.c b/common/cmd_spi.c
index 7b6faf79c5a3d3863b47623e9436192b9e08a048..3c8e913be564cee3e905dee4f63c5afec515f070 100644 (file)
--- a/common/cmd_spi.c
+++ b/common/cmd_spi.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2002
  * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -29,8 +13,6 @@
 #include <command.h>
 #include <spi.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_SPI)
-
 /*-----------------------------------------------------------------------
  * Definitions
  */
@@ -39,20 +21,22 @@
 #   define MAX_SPI_BYTES 32    /* Maximum number of bytes we can handle */
 #endif
 
-/*
- * External table of chip select functions (see the appropriate board
- * support for the actual definition of the table).
- */
-extern spi_chipsel_type spi_chipsel[];
-extern int spi_chipsel_cnt;
+#ifndef CONFIG_DEFAULT_SPI_BUS
+#   define CONFIG_DEFAULT_SPI_BUS      0
+#endif
+#ifndef CONFIG_DEFAULT_SPI_MODE
+#   define CONFIG_DEFAULT_SPI_MODE     SPI_MODE_0
+#endif
 
 /*
  * Values from last command.
  */
-static int   device;
-static int   bitlen;
-static uchar dout[MAX_SPI_BYTES];
-static uchar din[MAX_SPI_BYTES];
+static unsigned int    bus;
+static unsigned int    cs;
+static unsigned int    mode;
+static int             bitlen;
+static uchar           dout[MAX_SPI_BYTES];
+static uchar           din[MAX_SPI_BYTES];
 
 /*
  * SPI read/write
@@ -65,8 +49,9 @@ static uchar din[MAX_SPI_BYTES];
  * The command prints out the hexadecimal string received via SPI.
  */
 
-int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+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;
@@ -79,8 +64,18 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        if ((flag & CMD_FLAG_REPEAT) == 0)
        {
-               if (argc >= 2)
-                       device = simple_strtoul(argv[1], NULL, 10);
+               if (argc >= 2) {
+                       mode = CONFIG_DEFAULT_SPI_MODE;
+                       bus = simple_strtoul(argv[1], &cp, 10);
+                       if (*cp == ':') {
+                               cs = simple_strtoul(cp+1, &cp, 10);
+                       } else {
+                               cs = bus;
+                               bus = CONFIG_DEFAULT_SPI_BUS;
+                       }
+                       if (*cp == '.')
+                               mode = simple_strtoul(cp+1, NULL, 10);
+               }
                if (argc >= 3)
                        bitlen = simple_strtoul(argv[2], NULL, 10);
                if (argc >= 4) {
@@ -92,7 +87,7 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                if(tmp > 15)
                                        tmp -= ('a' - 'A');
                                if(tmp > 15) {
-                                       printf("Hex conversion error on %c, giving up.\n", *cp);
+                                       printf("Hex conversion error on %c\n", *cp);
                                        return 1;
                                }
                                if((j % 2) == 0)
@@ -103,28 +98,30 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                }
        }
 
-       if ((device < 0) || (device >=  spi_chipsel_cnt)) {
-               printf("Invalid device %d, giving up.\n", device);
-               return 1;
-       }
        if ((bitlen < 0) || (bitlen >  (MAX_SPI_BYTES * 8))) {
-               printf("Invalid bitlen %d, giving up.\n", bitlen);
+               printf("Invalid bitlen %d\n", bitlen);
                return 1;
        }
 
-       debug ("spi_chipsel[%d] = %08X\n",
-               device, (uint)spi_chipsel[device]);
+       slave = spi_setup_slave(bus, cs, 1000000, mode);
+       if (!slave) {
+               printf("Invalid device %d:%d\n", bus, cs);
+               return 1;
+       }
 
-       if(spi_xfer(spi_chipsel[device], bitlen, dout, din) != 0) {
-               printf("Error with the SPI transaction.\n");
+       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 {
-               cp = din;
                for(j = 0; j < ((bitlen + 7) / 8); j++) {
-                       printf("%02X", *cp++);
+                       printf("%02X", din[j]);
                }
                printf("\n");
        }
+       spi_release_bus(slave);
+       spi_free_slave(slave);
 
        return rcode;
 }
@@ -133,11 +130,11 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        sspi,   5,      1,      do_spi,
-       "sspi    - SPI utility commands\n",
-       "<device> <bit_len> <dout> - Send <bit_len> bits from <dout> out the SPI\n"
-       "<device>  - Identifies the chip select of the device\n"
+       "SPI utility command",
+       "[<bus>:]<cs>[.<mode>] <bit_len> <dout> - Send and receive bits\n"
+       "<bus>     - Identifies the SPI bus\n"
+       "<cs>      - Identifies the chip select\n"
+       "<mode>    - Identifies the SPI mode to use\n"
        "<bit_len> - Number of bits to send (base 10)\n"
-       "<dout>    - Hexadecimal string that gets sent\n"
+       "<dout>    - Hexadecimal string that gets sent"
 );
-
-#endif /* CFG_CMD_SPI */