2 files changed, 6 insertions, 1 deletions

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 1cea4a6799fe..ed1cdf6ac8f3 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -210,6 +210,7 @@ spi_new_device(struct spi_master *master, struct spi_board_info *chip)
         proxy->master = master;
         proxy->chip_select = chip->chip_select;
         proxy->max_speed_hz = chip->max_speed_hz;
+        proxy->mode = chip->mode;
         proxy->irq = chip->irq;
         proxy->modalias = chip->modalias;
 
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index e928c0dcc297..c8bb68099eb9 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -642,10 +642,14 @@ struct spi_board_info {
         u16             bus_num;
         u16             chip_select;
 
+        /* mode becomes spi_device.mode, and is essential for chips
+         * where the default of SPI_CS_HIGH = 0 is wrong.
+         */
+        u8              mode;
+
         /* ... may need additional spi_device chip config data here.
          * avoid stuff protocol drivers can set; but include stuff
          * needed to behave without being bound to a driver:
-         *  - chipselect polarity
          *  - quirks like clock rate mattering when not selected
          */
 };