Merge branch '2020-06-15-misc-bugfixes'

[oweals/u-boot.git] / drivers / spi / atmel_spi.h

diff --git a/drivers/spi/atmel_spi.h b/drivers/spi/atmel_spi.h
index 6167bd164bb0accdd4106ea9dfd11e234f0852fa..9663cca5e6657107d84223757f8dc9fd3db9f643 100644 (file)
--- a/drivers/spi/atmel_spi.h
+++ b/drivers/spi/atmel_spi.h
@@ -79,23 +79,8 @@
 #define ATMEL_SPI_BITS_15              7
 #define ATMEL_SPI_BITS_16              8
 
-struct atmel_spi_slave {
-       struct spi_slave slave;
-       void            *regs;
-       u32             mr;
-};
-
-static inline struct atmel_spi_slave *to_atmel_spi(struct spi_slave *slave)
-{
-       return container_of(slave, struct atmel_spi_slave, slave);
-}
-
 /* Register access macros */
 #define spi_readl(as, reg)                                     \
        readl(as->regs + ATMEL_SPI_##reg)
 #define spi_writel(as, reg, value)                             \
        writel(value, as->regs + ATMEL_SPI_##reg)
-
-#if !defined(CONFIG_SYS_SPI_WRITE_TOUT)
-#define CONFIG_SYS_SPI_WRITE_TOUT      (5 * CONFIG_SYS_HZ)
-#endif