1 files changed, 25 insertions, 18 deletions

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index 7db6555ed3ba..e8ea7107932e 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -835,7 +835,7 @@ int gpmi_send_command(struct gpmi_nand_data *this)
                 | BM_GPMI_CTRL0_ADDRESS_INCREMENT
                 | BF_GPMI_CTRL0_XFER_COUNT(this->command_length);
         pio[1] = pio[2] = 0;
-        desc = channel->device->device_prep_slave_sg(channel,
+        desc = dmaengine_prep_slave_sg(channel,
                                         (struct scatterlist *)pio,
                                         ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
         if (!desc) {
@@ -848,8 +848,10 @@ int gpmi_send_command(struct gpmi_nand_data *this)
 
         sg_init_one(sgl, this->cmd_buffer, this->command_length);
         dma_map_sg(this->dev, sgl, 1, DMA_TO_DEVICE);
-        desc = channel->device->device_prep_slave_sg(channel,
-                                        sgl, 1, DMA_MEM_TO_DEV, 1);
+        desc = dmaengine_prep_slave_sg(channel,
+                                sgl, 1, DMA_MEM_TO_DEV,
+                                DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+
         if (!desc) {
                 pr_err("step 2 error\n");
                 return -1;
@@ -880,8 +882,7 @@ int gpmi_send_data(struct gpmi_nand_data *this)
                 | BF_GPMI_CTRL0_ADDRESS(address)
                 | BF_GPMI_CTRL0_XFER_COUNT(this->upper_len);
         pio[1] = 0;
-        desc = channel->device->device_prep_slave_sg(channel,
-                                        (struct scatterlist *)pio,
+        desc = dmaengine_prep_slave_sg(channel, (struct scatterlist *)pio,
                                         ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
         if (!desc) {
                 pr_err("step 1 error\n");
@@ -890,8 +891,9 @@ int gpmi_send_data(struct gpmi_nand_data *this)
 
         /* [2] send DMA request */
         prepare_data_dma(this, DMA_TO_DEVICE);
-        desc = channel->device->device_prep_slave_sg(channel, &this->data_sgl,
-                                                1, DMA_MEM_TO_DEV, 1);
+        desc = dmaengine_prep_slave_sg(channel, &this->data_sgl,
+                                        1, DMA_MEM_TO_DEV,
+                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 pr_err("step 2 error\n");
                 return -1;
@@ -916,7 +918,7 @@ int gpmi_read_data(struct gpmi_nand_data *this)
                 | BF_GPMI_CTRL0_ADDRESS(BV_GPMI_CTRL0_ADDRESS__NAND_DATA)
                 | BF_GPMI_CTRL0_XFER_COUNT(this->upper_len);
         pio[1] = 0;
-        desc = channel->device->device_prep_slave_sg(channel,
+        desc = dmaengine_prep_slave_sg(channel,
                                         (struct scatterlist *)pio,
                                         ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
         if (!desc) {
@@ -926,8 +928,9 @@ int gpmi_read_data(struct gpmi_nand_data *this)
 
         /* [2] : send DMA request */
         prepare_data_dma(this, DMA_FROM_DEVICE);
-        desc = channel->device->device_prep_slave_sg(channel, &this->data_sgl,
-                                                1, DMA_DEV_TO_MEM, 1);
+        desc = dmaengine_prep_slave_sg(channel, &this->data_sgl,
+                                        1, DMA_DEV_TO_MEM,
+                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 pr_err("step 2 error\n");
                 return -1;
@@ -972,9 +975,10 @@ int gpmi_send_page(struct gpmi_nand_data *this,
         pio[4] = payload;
         pio[5] = auxiliary;
 
-        desc = channel->device->device_prep_slave_sg(channel,
+        desc = dmaengine_prep_slave_sg(channel,
                                         (struct scatterlist *)pio,
-                                        ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
+                                        ARRAY_SIZE(pio), DMA_TRANS_NONE,
+                                        DMA_CTRL_ACK);
         if (!desc) {
                 pr_err("step 2 error\n");
                 return -1;
@@ -1007,7 +1011,7 @@ int gpmi_read_page(struct gpmi_nand_data *this,
                 | BF_GPMI_CTRL0_ADDRESS(address)
                 | BF_GPMI_CTRL0_XFER_COUNT(0);
         pio[1] = 0;
-        desc = channel->device->device_prep_slave_sg(channel,
+        desc = dmaengine_prep_slave_sg(channel,
                                 (struct scatterlist *)pio, 2,
                                 DMA_TRANS_NONE, 0);
         if (!desc) {
@@ -1036,9 +1040,10 @@ int gpmi_read_page(struct gpmi_nand_data *this,
         pio[3] = geo->page_size;
         pio[4] = payload;
         pio[5] = auxiliary;
-        desc = channel->device->device_prep_slave_sg(channel,
+        desc = dmaengine_prep_slave_sg(channel,
                                         (struct scatterlist *)pio,
-                                        ARRAY_SIZE(pio), DMA_TRANS_NONE, 1);
+                                        ARRAY_SIZE(pio), DMA_TRANS_NONE,
+                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 pr_err("step 2 error\n");
                 return -1;
@@ -1055,9 +1060,11 @@ int gpmi_read_page(struct gpmi_nand_data *this,
                 | BF_GPMI_CTRL0_ADDRESS(address)
                 | BF_GPMI_CTRL0_XFER_COUNT(geo->page_size);
         pio[1] = 0;
-        desc = channel->device->device_prep_slave_sg(channel,
-                                (struct scatterlist *)pio, 2,
-                                DMA_TRANS_NONE, 1);
+        pio[2] = 0; /* clear GPMI_HW_GPMI_ECCCTRL, disable the BCH. */
+        desc = dmaengine_prep_slave_sg(channel,
+                                (struct scatterlist *)pio, 3,
+                                DMA_TRANS_NONE,
+                                DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 pr_err("step 3 error\n");
                 return -1;