diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-03-12 12:30:30 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-03-12 15:45:50 +0100 |
| commit | 9a065fcfecbf344812a92dbd9b28298da7ef2b74 (patch) | |
| tree | c01ee36c2d11f00cd1f66953e100c1316bc6453e /target/linux/ipq806x/patches-4.9/0012-spi-qup-refactor-spi_qup_io_config-in-two-functions.patch | |
| parent | f5d403488ed62bb7f0e0017b02890b4d72240a55 (diff) | |
| download | mtk-20170518-9a065fcfecbf344812a92dbd9b28298da7ef2b74.zip mtk-20170518-9a065fcfecbf344812a92dbd9b28298da7ef2b74.tar.gz mtk-20170518-9a065fcfecbf344812a92dbd9b28298da7ef2b74.tar.bz2 | |
kernel: update kernel 4.9 to 4.9.14
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ipq806x/patches-4.9/0012-spi-qup-refactor-spi_qup_io_config-in-two-functions.patch')
| -rw-r--r-- | target/linux/ipq806x/patches-4.9/0012-spi-qup-refactor-spi_qup_io_config-in-two-functions.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/target/linux/ipq806x/patches-4.9/0012-spi-qup-refactor-spi_qup_io_config-in-two-functions.patch b/target/linux/ipq806x/patches-4.9/0012-spi-qup-refactor-spi_qup_io_config-in-two-functions.patch index c88dd9b..7beb5d9 100644 --- a/target/linux/ipq806x/patches-4.9/0012-spi-qup-refactor-spi_qup_io_config-in-two-functions.patch +++ b/target/linux/ipq806x/patches-4.9/0012-spi-qup-refactor-spi_qup_io_config-in-two-functions.patch @@ -67,14 +67,10 @@ Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org> - /* must be zero for BLOCK and BAM */ - writel_relaxed(0, controller->base + QUP_MX_READ_CNT); - writel_relaxed(0, controller->base + QUP_MX_WRITE_CNT); -+ else -+ controller->mode = QUP_IO_M_MODE_BLOCK; - +- - if (!controller->qup_v1) { - void __iomem *input_cnt; -+ return 0; -+} - +- - input_cnt = controller->base + QUP_MX_INPUT_CNT; - /* - * for DMA transfers, both QUP_MX_INPUT_CNT and @@ -86,13 +82,19 @@ Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org> - writel_relaxed(0, input_cnt); - else - writel_relaxed(n_words, input_cnt); ++ else ++ controller->mode = QUP_IO_M_MODE_BLOCK; ++ ++ return 0; ++} + +/* prep qup for another spi transaction of specific type */ +static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) +{ + struct spi_qup *controller = spi_master_get_devdata(spi->master); + u32 config, iomode, control; + unsigned long flags; - ++ + reinit_completion(&controller->done); + reinit_completion(&controller->dma_tx_done); + |