diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-03 14:45:16 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-03 14:45:16 -0800 |
| commit | 84a73014d86fd660822a20c032625e3afe99ca58 (patch) | |
| tree | 9e42a2d3c40730947ae18363d00e8a0ee2743792 /drivers/spi/spi-omap2-mcspi.c | |
| parent | Input: alps - only the Dell Latitude D420/430/620/630 have separate stick button bits (diff) | |
| parent | Input: evdev - fix bug in checking duplicate clock change request (diff) | |
| download | wireguard-linux-84a73014d86fd660822a20c032625e3afe99ca58.tar.xz wireguard-linux-84a73014d86fd660822a20c032625e3afe99ca58.zip | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.3 merge window.
Diffstat (limited to '')
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 58673841286c..3d09e0b69b73 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -245,6 +245,7 @@ static void omap2_mcspi_set_enable(const struct spi_device *spi, int enable) static void omap2_mcspi_set_cs(struct spi_device *spi, bool enable) { + struct omap2_mcspi *mcspi = spi_master_get_devdata(spi->master); u32 l; /* The controller handles the inverted chip selects @@ -255,6 +256,12 @@ static void omap2_mcspi_set_cs(struct spi_device *spi, bool enable) enable = !enable; if (spi->controller_state) { + int err = pm_runtime_get_sync(mcspi->dev); + if (err < 0) { + dev_err(mcspi->dev, "failed to get sync: %d\n", err); + return; + } + l = mcspi_cached_chconf0(spi); if (enable) @@ -263,6 +270,9 @@ static void omap2_mcspi_set_cs(struct spi_device *spi, bool enable) l |= OMAP2_MCSPI_CHCONF_FORCE; mcspi_write_chconf0(spi, l); + + pm_runtime_mark_last_busy(mcspi->dev); + pm_runtime_put_autosuspend(mcspi->dev); } } |