diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-28 11:28:43 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-28 11:28:43 (GMT) |
| commit | cc555bd4f40a652471df4a3621d45ee57df0ca11 (patch) | |
| tree | 6f1f21e7d5cf9cb29d0169aa4377eea9c0981f98 /include/spi.h | |
| parent | 86e6f7eaa15f0aca03bb7c961902563348c2dd05 (diff) | |
| parent | c650ca7b4c160193791dc7a52381c71c6a29e871 (diff) | |
| download | u-boot-fsl-qoriq-cc555bd4f40a652471df4a3621d45ee57df0ca11.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include/spi.h')
| -rw-r--r-- | include/spi.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/include/spi.h b/include/spi.h index c58e453..9495ca5 100644 --- a/include/spi.h +++ b/include/spi.h @@ -38,11 +38,12 @@ /* SPI RX operation modes */ #define SPI_OPM_RX_AS (1 << 0) -#define SPI_OPM_RX_DOUT (1 << 1) -#define SPI_OPM_RX_DIO (1 << 2) -#define SPI_OPM_RX_QOF (1 << 3) -#define SPI_OPM_RX_QIOF (1 << 4) -#define SPI_OPM_RX_EXTN (SPI_OPM_RX_AS | SPI_OPM_RX_DOUT | \ +#define SPI_OPM_RX_AF (1 << 1) +#define SPI_OPM_RX_DOUT (1 << 2) +#define SPI_OPM_RX_DIO (1 << 3) +#define SPI_OPM_RX_QOF (1 << 4) +#define SPI_OPM_RX_QIOF (1 << 5) +#define SPI_OPM_RX_EXTN (SPI_OPM_RX_AS | SPI_OPM_RX_AF | SPI_OPM_RX_DOUT | \ SPI_OPM_RX_DIO | SPI_OPM_RX_QOF | \ SPI_OPM_RX_QIOF) @@ -385,12 +386,12 @@ struct dm_spi_ops { * allowed to claim the same bus for several slaves without releasing * the bus in between. * - * @bus: The SPI slave + * @dev: The SPI slave * * Returns: 0 if the bus was claimed successfully, or a negative value * if it wasn't. */ - int (*claim_bus)(struct udevice *bus); + int (*claim_bus)(struct udevice *dev); /** * Release the SPI bus @@ -399,9 +400,9 @@ struct dm_spi_ops { * all transfers have finished. It may disable any SPI hardware as * appropriate. * - * @bus: The SPI slave + * @dev: The SPI slave */ - int (*release_bus)(struct udevice *bus); + int (*release_bus)(struct udevice *dev); /** * Set the word length for SPI transactions @@ -413,7 +414,7 @@ struct dm_spi_ops { * * Returns: 0 on success, -ve on failure. */ - int (*set_wordlen)(struct udevice *bus, unsigned int wordlen); + int (*set_wordlen)(struct udevice *dev, unsigned int wordlen); /** * SPI transfer |