diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:26 +0100 |
| commit | 1bee1ecf232cd90ad112d78ab5124850b4e5ea09 (patch) | |
| tree | 850cf42ea49ec040c2042fdd8bc61d332461e948 /include/linux/spi/spi.h | |
| parent | edf978a5a17dc9e38625b33821dc71f10c46f694 (diff) | |
| parent | b470e10eb43f19e08245cd87dd3192a8141cfbb5 (diff) | |
Merge remote-tracking branch 'spi/for-5.14' into spi-next
Diffstat (limited to 'include/linux/spi/spi.h')
| -rw-r--r-- | include/linux/spi/spi.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 74239d65c7fd..97b8d12b5f2b 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -299,6 +299,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) driver_unregister(&sdrv->driver); } +extern struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 chip_select); + /* use a define to avoid include chaining to get THIS_MODULE */ #define spi_register_driver(driver) \ __spi_register_driver(THIS_MODULE, driver) @@ -586,6 +588,7 @@ struct spi_controller { bool (*can_dma)(struct spi_controller *ctlr, struct spi_device *spi, struct spi_transfer *xfer); + struct device *dma_map_dev; /* * These hooks are for drivers that want to use the generic @@ -1108,11 +1111,6 @@ static inline void spi_message_free(struct spi_message *m) kfree(m); } -extern int spi_set_cs_timing(struct spi_device *spi, - struct spi_delay *setup, - struct spi_delay *hold, - struct spi_delay *inactive); - extern int spi_setup(struct spi_device *spi); extern int spi_async(struct spi_device *spi, struct spi_message *message); extern int spi_async_locked(struct spi_device *spi, |