Merge branch 'for-5.12' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.13

2021-04-15 19:29:40 +01:00
parent 58eaa7b2d0 8c4ffe4d02
commit c7ed5fd5fb
5 changed files with 12 additions and 8 deletions
--- 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;