summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-davinci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-29 11:30:16 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-29 11:30:16 -0800
commit8e3264710c1c5a3052618bb1b5ef11e13c67a932 (patch)
tree8f8f2b7ae02cefed146dc9457d023b378a43a590 /drivers/spi/spi-davinci.c
parent0bae60fceeab6958ecd56ba5dbb41fb199babec3 (diff)
parent35a8f1a94d12631afcd55a2a518faa112324f8d1 (diff)
downloadtalos-op-linux-8e3264710c1c5a3052618bb1b5ef11e13c67a932.tar.gz
talos-op-linux-8e3264710c1c5a3052618bb1b5ef11e13c67a932.zip
Merge tag 'spi-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi updates from Mark Brown: "Quite a quiet release for SPI, there are no changes at all to the core and not that many changes to drivers. Highlights of those driver changes include: - SH MSIOF support for GPIO chip selects contributed by Geert Uytterhoeven. - Full duplex support for a3700 contributed by Maxime Chevallier. - Support for DMA transfers on Atmel devices that require a bounce buffer contributed by Radu Pirea" * tag 'spi-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (31 commits) spi: dw: Remove unused members from struct chip_data spi: orion: Fix a resource leak if the optional "axi" clk is deferred spi: a3700: Remove endianness swapping for full-duplex transfers spi: a3700: Remove endianness swapping functions when accessing FIFOs spi: a3700: Add full-duplex support spi: a3700: Allow to enable or disable FIFO mode spi: a3700: Set frequency limits at startup spi: a3700: Clear DATA_OUT when performing a read spi: orion: Fix clock resource by adding an optional bus clock spi: s3c64xx: add SPDX identifier spi: imx: do not access registers while clocks disabled spi: atmel: Implements transfers with bounce buffer spi: sh-msiof: Fix timeout failures for TX-only DMA transfers spi: spi-fsl-dspi: account for const type of of_device_id.data spi: bcm53xx: simplify reading SPI data spi: sirf: account for const type of of_device_id.data spi: pxa2xx: Use gpiod_put() not gpiod_free() spi: pxa2xx: avoid redundant gpio_to_desc(desc_to_gpio()) round-trip spi: sh-msiof: Document hardware limitations related to chip selects spi: sh-msiof: Implement cs-gpios configuration ...
Diffstat (limited to 'drivers/spi/spi-davinci.c')
-rw-r--r--drivers/spi/spi-davinci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 6ddb6ef1fda4..60d59b003aa4 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -945,6 +945,8 @@ static int davinci_spi_probe(struct platform_device *pdev)
goto free_master;
}
+ init_completion(&dspi->done);
+
ret = platform_get_irq(pdev, 0);
if (ret == 0)
ret = -EINVAL;
@@ -1021,8 +1023,6 @@ static int davinci_spi_probe(struct platform_device *pdev)
dspi->get_rx = davinci_spi_rx_buf_u8;
dspi->get_tx = davinci_spi_tx_buf_u8;
- init_completion(&dspi->done);
-
/* Reset In/OUT SPI module */
iowrite32(0, dspi->base + SPIGCR0);
udelay(100);
OpenPOWER on IntegriCloud