History

Merge branch 'spi-5.7' into spi-next

Mark Brown committed 6 years ago

Commit 1ba0b522 parents 16fbf79 ebb3b9a54 files · +3724 −1272Browse files

Showing the changes to include/linux (1 of 54 files). Show all

Unified · Split

include/linux/spi/spi.h+7−2
@@ -135,6 +135,8 @@ extern int spi_delay_exec(struct spi_delay *_delay, struct spi_transfer *xfer); · 134 unmodified lines
135 * @modalias: Name of the driver to use with this device, or an alias135 * @modalias: Name of the driver to use with this device, or an alias
136 * for that name. This appears in the sysfs "modalias" attribute136 * for that name. This appears in the sysfs "modalias" attribute
137 * for driver coldplugging, and in uevents used for hotplugging137 * for driver coldplugging, and in uevents used for hotplugging
138 * @driver_override: If the name of a driver is written to this attribute, then
139 * the device will bind to the named driver and only the named driver.
138 * @cs_gpio: LEGACY: gpio number of the chipselect line (optional, -ENOENT when140 * @cs_gpio: LEGACY: gpio number of the chipselect line (optional, -ENOENT when
139 * not using a GPIO line) use cs_gpiod in new drivers by opting in on141 * not using a GPIO line) use cs_gpiod in new drivers by opting in on
140 * the spi_master.142 * the spi_master.
@@ -443,6 +445,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) · 302 unmodified lines
443 * @spi_transfer->ptp_sts_word_post were transmitted.445 * @spi_transfer->ptp_sts_word_post were transmitted.
444 * If the driver does not set this, the SPI core takes the snapshot as446 * If the driver does not set this, the SPI core takes the snapshot as
445 * close to the driver hand-over as possible.447 * close to the driver hand-over as possible.
448 * @irq_flags: Interrupt enable state during PTP system timestamping
446 *449 *
447 * Each SPI controller can communicate with one or more @spi_device450 * Each SPI controller can communicate with one or more @spi_device
448 * children. These make a small bus, sharing MOSI, MISO and SCK signals451 * children. These make a small bus, sharing MOSI, MISO and SCK signals
@@ -481,6 +484,9 @@ struct spi_controller { · 32 unmodified lines
481 /* spi_device.mode flags understood by this controller driver */484 /* spi_device.mode flags understood by this controller driver */
482 u32 mode_bits;485 u32 mode_bits;
483 486
487 /* spi_device.mode flags override flags for this controller */
488 u32 buswidth_override_bits;
489
484 /* bitmask of supported bits_per_word for transfers */490 /* bitmask of supported bits_per_word for transfers */
485 u32 bits_per_word_mask;491 u32 bits_per_word_mask;
486#define SPI_BPW_MASK(bits) BIT((bits) - 1)492#define SPI_BPW_MASK(bits) BIT((bits) - 1)
@@ -930,8 +936,7 @@ struct spi_transfer { · 443 unmodified lines
930 936
931 struct ptp_system_timestamp *ptp_sts;937 struct ptp_system_timestamp *ptp_sts;
932 938
933 bool timestamped_pre;939 bool timestamped;
934 bool timestamped_post;
935 940
936 struct list_head transfer_list;941 struct list_head transfer_list;
937};942};