ARM: zynq: Remove ZYNQ_BOOT_FREEBSD option

[u-boot] / include / spi.h

diff --git a/include/spi.h b/include/spi.h
index 80f85230765a7e75708754daf8dc3c93f4de1339..4b88d3986e78cea0e3bf117a5b6351f88c011146 100644 (file)
--- a/include/spi.h
+++ b/include/spi.h
@@ -24,13 +24,14 @@
 #define SPI_SLAVE      BIT(6)                  /* slave mode */
 #define SPI_PREAMBLE   BIT(7)                  /* Skip preamble bytes */
 #define SPI_TX_BYTE    BIT(8)                  /* transmit with 1 wire byte */
-#define SPI_TX_QUAD    BIT(9)                  /* transmit with 4 wires */
+#define SPI_TX_DUAL    BIT(9)                  /* transmit with 2 wires */
+#define SPI_TX_QUAD    BIT(10)                 /* transmit with 4 wires */
 
 /* SPI mode_rx flags */
 #define SPI_RX_SLOW    BIT(0)                  /* receive with 1 wire slow */
 #define SPI_RX_FAST    BIT(1)                  /* receive with 1 wire fast */
 #define SPI_RX_DUAL    BIT(2)                  /* receive with 2 wires */
-#define SPI_RX_QUAD    BIT(4)                  /* receive with 4 wires */
+#define SPI_RX_QUAD    BIT(3)                  /* receive with 4 wires */
 
 /* SPI bus connection options - see enum spi_dual_flash */
 #define SPI_CONN_DUAL_SHARED           (1 << 0)
@@ -60,11 +61,13 @@ struct dm_spi_bus {
  * @cs:                Chip select number (0..n-1)
  * @max_hz:    Maximum bus speed that this slave can tolerate
  * @mode:      SPI mode to use for this device (see SPI mode flags)
+ * @mode_rx:   SPI RX mode to use for this slave (see SPI mode_rx flags)
  */
 struct dm_spi_slave_platdata {
        unsigned int cs;
        uint max_hz;
        uint mode;
+       u8 mode_rx;
 };
 
 #endif /* CONFIG_DM_SPI */