spi: uapi: unify SPI modes into a single spi.h header

[sfrench/cifs-2.6.git] / include / linux / spi / spi.h

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index aa09fdc8042dbdc7ba96d67a2522d50d2b865a41..a08c3f37e2024c60e20e125e22af1d575920488e 100644 (file)
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -15,6 +15,8 @@
 #include <linux/gpio/consumer.h>
 #include <linux/ptp_clock_kernel.h>
 
+#include <uapi/linux/spi/spi.h>
+
 struct dma_chan;
 struct property_entry;
 struct spi_controller;
@@ -165,27 +167,6 @@ struct spi_device {
        u8                      bits_per_word;
        bool                    rt;
        u32                     mode;
-#define        SPI_CPHA        0x01                    /* clock phase */
-#define        SPI_CPOL        0x02                    /* clock polarity */
-#define        SPI_MODE_0      (0|0)                   /* (original MicroWire) */
-#define        SPI_MODE_1      (0|SPI_CPHA)
-#define        SPI_MODE_2      (SPI_CPOL|0)
-#define        SPI_MODE_3      (SPI_CPOL|SPI_CPHA)
-#define        SPI_MODE_X_MASK (SPI_CPOL|SPI_CPHA)
-#define        SPI_CS_HIGH     0x04                    /* chipselect active high? */
-#define        SPI_LSB_FIRST   0x08                    /* per-word bits-on-wire */
-#define        SPI_3WIRE       0x10                    /* SI/SO signals shared */
-#define        SPI_LOOP        0x20                    /* loopback mode */
-#define        SPI_NO_CS       0x40                    /* 1 dev/bus, no chipselect */
-#define        SPI_READY       0x80                    /* slave pulls low to pause */
-#define        SPI_TX_DUAL     0x100                   /* transmit with 2 wires */
-#define        SPI_TX_QUAD     0x200                   /* transmit with 4 wires */
-#define        SPI_RX_DUAL     0x400                   /* receive with 2 wires */
-#define        SPI_RX_QUAD     0x800                   /* receive with 4 wires */
-#define        SPI_CS_WORD     0x1000                  /* toggle cs after each word */
-#define        SPI_TX_OCTAL    0x2000                  /* transmit with 8 wires */
-#define        SPI_RX_OCTAL    0x4000                  /* receive with 8 wires */
-#define        SPI_3WIRE_HIZ   0x8000                  /* high impedance turnaround */
        int                     irq;
        void                    *controller_state;
        void                    *controller_data;