summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-gpio.c
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-08-12 15:14:03 +0200
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-08-12 15:14:03 +0200
commit181ae8844578d0a80f188c1d195fd6bb91bcec81 (patch)
treebd6ebfb8eb390ea6927603ca4e33c263c82b2cd7 /drivers/spi/spi-gpio.c
parent8f1c748b9a7751ee1297b4880788a09f7c802eb4 (diff)
parentd45331b00ddb179e291766617259261c112db872 (diff)
downloadlinux-181ae8844578d0a80f188c1d195fd6bb91bcec81.tar.bz2
Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes
Backport requested for omap dma mask fix. I'm not sure it still requires it, but just in case. :) Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/spi/spi-gpio.c')
-rw-r--r--drivers/spi/spi-gpio.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index eca9d52ecf65..9eb82150666e 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -410,6 +410,12 @@ static int spi_gpio_probe(struct platform_device *pdev)
bb = &spi_gpio->bitbang;
bb->master = master;
+ /*
+ * There is some additional business, apart from driving the CS GPIO
+ * line, that we need to do on selection. This makes the local
+ * callback for chipselect always get called.
+ */
+ master->flags |= SPI_MASTER_GPIO_SS;
bb->chipselect = spi_gpio_chipselect;
bb->set_line_direction = spi_gpio_set_direction;