summaryrefslogtreecommitdiff
path: root/include/linux/spi/spi.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-04-15 19:29:40 +0100
committerMark Brown <broonie@kernel.org>2021-04-15 19:29:40 +0100
commitc7ed5fd5fbb279a75a58cf641b873f57ef906ac7 (patch)
tree4aac1ad717ce4a757b872463bbfd75f0a182a75e /include/linux/spi/spi.h
parent58eaa7b2d07d3c25e1068b0bf42ca7e7464f4bca (diff)
parent8c4ffe4d023d7a3153c1d3d1084d98d17bf684b9 (diff)
Merge branch 'for-5.12' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.13
Diffstat (limited to 'include/linux/spi/spi.h')
-rw-r--r--include/linux/spi/spi.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 4b192e74f024..360a3bc767ca 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -509,6 +509,9 @@ struct spi_controller {
#define SPI_MASTER_GPIO_SS BIT(5) /* GPIO CS must select slave */
+ /* flag indicating this is a non-devres managed controller */
+ bool devm_allocated;
+
/* flag indicating this is an SPI slave controller */
bool slave;