Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h
index 51d8c060e513..b7e021b274dc 100644
--- a/include/linux/spi/spi_bitbang.h
+++ b/include/linux/spi/spi_bitbang.h
@@ -8,7 +8,7 @@ struct spi_bitbang {
         struct mutex            lock;
         u8                      busy;
         u8                      use_dma;
-        u8                      flags;          /* extra spi->mode support */
+        u16                     flags;          /* extra spi->mode support */
 
         struct spi_master       *master;
 
@@ -30,7 +30,8 @@ struct spi_bitbang {
         /* txrx_word[SPI_MODE_*]() just looks like a shift register */
         u32     (*txrx_word[4])(struct spi_device *spi,
                         unsigned nsecs,
-                        u32 word, u8 bits);
+                        u32 word, u8 bits, unsigned flags);
+        int     (*set_line_direction)(struct spi_device *spi, bool output);
 };
 
 /* you can call these default bitbang->master methods from your custom