dwc2 USB controller hangs with lan78xx

[u-boot] / drivers / spi / spi.c

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 7d81fbd7f8f52c31dd9503241e721c9ec8ce6bd8..22910de0dd93581d3cddfd4f32e6d98acb96c812 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -12,7 +11,7 @@
 int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen)
 {
        if (wordlen == 0 || wordlen > 32) {
-               printf("spi: invalid wordlen %d\n", wordlen);
+               printf("spi: invalid wordlen %u\n", wordlen);
                return -1;
        }
 
@@ -24,11 +23,12 @@ int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen)
 void *spi_do_alloc_slave(int offset, int size, unsigned int bus,
                         unsigned int cs)
 {
-       struct spi_slave *slave;
-       void *ptr;
+       u8 *ptr;
 
        ptr = malloc(size);
        if (ptr) {
+               struct spi_slave *slave;
+
                memset(ptr, '\0', size);
                slave = (struct spi_slave *)(ptr + offset);
                slave->bus = bus;
@@ -38,23 +38,3 @@ void *spi_do_alloc_slave(int offset, int size, unsigned int bus,
 
        return ptr;
 }
-
-#ifdef CONFIG_OF_SPI
-struct spi_slave *spi_base_setup_slave_fdt(const void *blob, int busnum,
-                                          int node)
-{
-       int cs, max_hz, mode = 0;
-
-       cs = fdtdec_get_int(blob, node, "reg", -1);
-       max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", 100000);
-       if (fdtdec_get_bool(blob, node, "spi-cpol"))
-               mode |= SPI_CPOL;
-       if (fdtdec_get_bool(blob, node, "spi-cpha"))
-               mode |= SPI_CPHA;
-       if (fdtdec_get_bool(blob, node, "spi-cs-high"))
-               mode |= SPI_CS_HIGH;
-       if (fdtdec_get_bool(blob, node, "spi-half-duplex"))
-               mode |= SPI_PREAMBLE;
-       return spi_setup_slave(busnum, cs, max_hz, mode);
-}
-#endif