msm: dma: remove crci conflict checking
The crci conflict checking code was designed for a system where a crci's
mux could be changed at runtime. In reality, our chips configure these
statically, so it is not necessary.
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
diff --git a/drivers/mtd/devices/msm_nand.c b/drivers/mtd/devices/msm_nand.c
index 29b44df..5ced423 100644
--- a/drivers/mtd/devices/msm_nand.c
+++ b/drivers/mtd/devices/msm_nand.c
@@ -41,7 +41,6 @@
uint32_t dual_nand_ctlr_present;
uint32_t interleave_enable;
uint32_t enable_bch_ecc;
-unsigned crci_mask;
#define MSM_NAND_DMA_BUFFER_SIZE SZ_8K
#define MSM_NAND_DMA_BUFFER_SLOTS \
@@ -294,7 +293,7 @@
mb();
msm_dmov_exec_cmd(
- chip->dma_channel, crci_mask, DMOV_CMD_PTR_LIST |
+ chip->dma_channel, DMOV_CMD_PTR_LIST |
DMOV_CMD_ADDR(msm_virt_to_dma(chip, &dma_buffer->cmdptr)));
mb();
@@ -328,7 +327,7 @@
mb();
msm_dmov_exec_cmd(
- chip->dma_channel, crci_mask, DMOV_CMD_PTR_LIST |
+ chip->dma_channel, DMOV_CMD_PTR_LIST |
DMOV_CMD_ADDR(msm_virt_to_dma(chip, &dma_buffer->cmdptr)));
mb();
@@ -413,7 +412,7 @@
) | CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask, DMOV_CMD_PTR_LIST |
+ msm_dmov_exec_cmd(chip->dma_channel, DMOV_CMD_PTR_LIST |
DMOV_CMD_ADDR(msm_virt_to_dma(chip, &dma_buffer->cmdptr)));
mb();
@@ -678,7 +677,7 @@
>> 3) | CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask,
+ msm_dmov_exec_cmd(chip->dma_channel,
DMOV_CMD_PTR_LIST | DMOV_CMD_ADDR(msm_virt_to_dma(chip,
&dma_buffer->cmdptr)));
mb();
@@ -1051,7 +1050,7 @@
| CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask,
+ msm_dmov_exec_cmd(chip->dma_channel,
DMOV_CMD_PTR_LIST | DMOV_CMD_ADDR(msm_virt_to_dma(chip,
&dma_buffer->cmdptr)));
mb();
@@ -1832,7 +1831,7 @@
| CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask,
+ msm_dmov_exec_cmd(chip->dma_channel,
DMOV_CMD_PTR_LIST | DMOV_CMD_ADDR(msm_virt_to_dma(chip,
&dma_buffer->cmdptr)));
mb();
@@ -2276,7 +2275,7 @@
CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask,
+ msm_dmov_exec_cmd(chip->dma_channel,
DMOV_CMD_PTR_LIST | DMOV_CMD_ADDR(
msm_virt_to_dma(chip, &dma_buffer->cmdptr)));
mb();
@@ -2885,7 +2884,7 @@
((msm_virt_to_dma(chip, dma_buffer->cmd) >> 3) | CMD_PTR_LP);
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask,
+ msm_dmov_exec_cmd(chip->dma_channel,
DMOV_CMD_PTR_LIST | DMOV_CMD_ADDR(
msm_virt_to_dma(chip, &dma_buffer->cmdptr)));
mb();
@@ -3079,7 +3078,7 @@
mb();
msm_dmov_exec_cmd(
- chip->dma_channel, crci_mask, DMOV_CMD_PTR_LIST |
+ chip->dma_channel, DMOV_CMD_PTR_LIST |
DMOV_CMD_ADDR(msm_virt_to_dma(chip, &dma_buffer->cmdptr)));
mb();
@@ -3318,7 +3317,7 @@
mb();
msm_dmov_exec_cmd(
- chip->dma_channel, crci_mask, DMOV_CMD_PTR_LIST |
+ chip->dma_channel, DMOV_CMD_PTR_LIST |
DMOV_CMD_ADDR(msm_virt_to_dma(chip, &dma_buffer->cmdptr)));
mb();
@@ -3469,7 +3468,7 @@
dma_buffer->cmd) >> 3) | CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask, DMOV_CMD_PTR_LIST |
+ msm_dmov_exec_cmd(chip->dma_channel, DMOV_CMD_PTR_LIST |
DMOV_CMD_ADDR(msm_virt_to_dma(chip, &dma_buffer->cmdptr)));
mb();
@@ -3726,7 +3725,7 @@
dma_buffer->cmd) >> 3) | CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask, DMOV_CMD_PTR_LIST |
+ msm_dmov_exec_cmd(chip->dma_channel, DMOV_CMD_PTR_LIST |
DMOV_CMD_ADDR(msm_virt_to_dma(chip, &dma_buffer->cmdptr)));
mb();
@@ -3941,7 +3940,7 @@
>> 3) | CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask, DMOV_CMD_PTR_LIST
+ msm_dmov_exec_cmd(chip->dma_channel, DMOV_CMD_PTR_LIST
| DMOV_CMD_ADDR(msm_virt_to_dma(chip,
&dma_buffer->cmdptr)));
mb();
@@ -4570,7 +4569,7 @@
>> 3) | CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask,
+ msm_dmov_exec_cmd(chip->dma_channel,
DMOV_CMD_PTR_LIST | DMOV_CMD_ADDR(msm_virt_to_dma(chip,
&dma_buffer->cmdptr)));
mb();
@@ -5316,7 +5315,7 @@
>> 3) | CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask,
+ msm_dmov_exec_cmd(chip->dma_channel,
DMOV_CMD_PTR_LIST | DMOV_CMD_ADDR(msm_virt_to_dma(chip,
&dma_buffer->cmdptr)));
mb();
@@ -5739,7 +5738,7 @@
>> 3) | CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask, DMOV_CMD_PTR_LIST
+ msm_dmov_exec_cmd(chip->dma_channel, DMOV_CMD_PTR_LIST
| DMOV_CMD_ADDR(msm_virt_to_dma(chip,
&dma_buffer->cmdptr)));
mb();
@@ -6203,7 +6202,7 @@
>> 3) | CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask,
+ msm_dmov_exec_cmd(chip->dma_channel,
DMOV_CMD_PTR_LIST | DMOV_CMD_ADDR(msm_virt_to_dma(chip,
&dma_buffer->cmdptr)));
mb();
@@ -6567,7 +6566,7 @@
>> 3) | CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask,
+ msm_dmov_exec_cmd(chip->dma_channel,
DMOV_CMD_PTR_LIST | DMOV_CMD_ADDR(msm_virt_to_dma(chip,
&dma_buffer->cmdptr)));
mb();
@@ -6919,7 +6918,7 @@
| CMD_PTR_LP;
mb();
- msm_dmov_exec_cmd(chip->dma_channel, crci_mask, DMOV_CMD_PTR_LIST
+ msm_dmov_exec_cmd(chip->dma_channel, DMOV_CMD_PTR_LIST
| DMOV_CMD_ADDR(msm_virt_to_dma(chip,
&dma_buffer->cmdptr)));
mb();
@@ -7036,9 +7035,6 @@
pr_info("%s: allocated dma buffer at %p, dma_addr %x\n",
__func__, info->msm_nand.dma_buffer, info->msm_nand.dma_addr);
- crci_mask = msm_dmov_build_crci_mask(2,
- DMOV_NAND_CRCI_DATA, DMOV_NAND_CRCI_CMD);
-
info->mtd.name = dev_name(&pdev->dev);
info->mtd.priv = &info->msm_nand;
info->mtd.owner = THIS_MODULE;