From 24de7c29e5f70863a2962de79521b60bce4dce2f Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Sun, 3 Mar 2019 20:23:31 +0100 Subject: ipq40xx: backport I2C QUP driver changes from 4.17 Backport below changes for I2C QUP driver from v4.17: 0668bc44a426 i2c: qup: fix copyrights and update to SPDX identifier 7239872fb340 i2c: qup: fixed releasing dma without flush operation completion eb422b539c1f i2c: qup: minor code reorganization for use_dma 6d5f37f166bb i2c: qup: remove redundant variables for BAM SG count c5adc0fa63a9 i2c: qup: schedule EOT and FLUSH tags at the end of transfer 7e6c35fe602d i2c: qup: fix the transfer length for BAM RX EOT FLUSH tags 3f450d3eea14 i2c: qup: proper error handling for i2c error in BAM mode 08f15963bc75 i2c: qup: use the complete transfer length to choose DMA mode ecb6e1e5f435 i2c: qup: change completion timeout according to transfer length 6f2f0f6465ac i2c: qup: fix buffer overflow for multiple msg of maximum xfer len f7714b4e451b i2c: qup: send NACK for last read sub transfers fbfab1ab0658 i2c: qup: reorganization of driver code to remove polling for qup v1 7545c7dba169 i2c: qup: reorganization of driver code to remove polling for qup v2 This fixes various I2C issues observed on AP120C-AC board equipped with Atmel/Microchip AT97SC3205T TPM module. Tested-by: Christian Lamparter Signed-off-by: Piotr Dymacz --- ...-the-transfer-length-for-BAM-RX-EOT-FLUSH.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 target/linux/ipq40xx/patches-4.14/088-0006-i2c-qup-fix-the-transfer-length-for-BAM-RX-EOT-FLUSH.patch (limited to 'target/linux/ipq40xx/patches-4.14/088-0006-i2c-qup-fix-the-transfer-length-for-BAM-RX-EOT-FLUSH.patch') diff --git a/target/linux/ipq40xx/patches-4.14/088-0006-i2c-qup-fix-the-transfer-length-for-BAM-RX-EOT-FLUSH.patch b/target/linux/ipq40xx/patches-4.14/088-0006-i2c-qup-fix-the-transfer-length-for-BAM-RX-EOT-FLUSH.patch new file mode 100644 index 0000000000..6eb2d6a7b1 --- /dev/null +++ b/target/linux/ipq40xx/patches-4.14/088-0006-i2c-qup-fix-the-transfer-length-for-BAM-RX-EOT-FLUSH.patch @@ -0,0 +1,33 @@ +From 7e6c35fe602df6821b3e7db5b1ba656162750fda Mon Sep 17 00:00:00 2001 +From: Abhishek Sahu +Date: Mon, 12 Mar 2018 18:44:55 +0530 +Subject: [PATCH 06/13] i2c: qup: fix the transfer length for BAM RX EOT FLUSH + tags + +In case of FLUSH operation, BAM copies INPUT EOT FLUSH (0x94) +instead of normal EOT (0x93) tag in input data stream when an +input EOT tag is received during flush operation. So only one tag +will be written instead of 2 separate tags. + +Signed-off-by: Abhishek Sahu +Reviewed-by: Andy Gross +Signed-off-by: Wolfram Sang +--- + drivers/i2c/busses/i2c-qup.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/i2c/busses/i2c-qup.c ++++ b/drivers/i2c/busses/i2c-qup.c +@@ -774,10 +774,10 @@ static int qup_i2c_bam_do_xfer(struct qu + qup->btx.tag.start[0] = QUP_BAM_INPUT_EOT; + len++; + +- /* scratch buf to read the BAM EOT and FLUSH tags */ ++ /* scratch buf to read the BAM EOT FLUSH tags */ + ret = qup_sg_set_buf(&qup->brx.sg[rx_cnt++], + &qup->brx.tag.start[0], +- 2, qup, DMA_FROM_DEVICE); ++ 1, qup, DMA_FROM_DEVICE); + if (ret) + return ret; + } -- cgit v1.2.3