summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Yu <liyu65@hisilicon.com>2019-01-24 12:24:19 -0800
committerVinod Koul <vkoul@kernel.org>2019-02-04 14:30:50 +0530
commit1200e070d6cc5ae4ab702c460b48fefc6668eafa (patch)
tree8d061425aa81760f640b396416c708e75d5d85aa
parentd4bdc39f5bd00a2fbeb0fbd29c9cb3b595df38a2 (diff)
downloadlinux-stable-1200e070d6cc5ae4ab702c460b48fefc6668eafa.tar.gz
linux-stable-1200e070d6cc5ae4ab702c460b48fefc6668eafa.tar.bz2
linux-stable-1200e070d6cc5ae4ab702c460b48fefc6668eafa.zip
dmaengine: k3dma: Delete axi_config
Axi_config controls whether DMA resources can be accessed in non-secure mode, such as linux kernel. The register should be set by the bootloader stage and depends on the device. Thus, this patch removes axi_config from k3dma driver. Cc: Dan Williams <dan.j.williams@intel.com> Cc: Vinod Koul <vkoul@kernel.org> Cc: Tanglei Han <hantanglei@huawei.com> Cc: Zhuangluan Su <suzhuangluan@hisilicon.com> Cc: Ryan Grachek <ryan@edited.us> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Cc: dmaengine@vger.kernel.org Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Li Yu <liyu65@hisilicon.com> Signed-off-by: Guodong Xu <guodong.xu@linaro.org> [jstultz: Minor tweaks to commit message] Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Vinod Koul <vkoul@kernel.org>
-rw-r--r--drivers/dma/k3dma.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index 4dce53227274..e415c854e291 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -52,8 +52,6 @@
#define CX_SRC 0x814
#define CX_DST 0x818
#define CX_CFG 0x81c
-#define AXI_CFG 0x820
-#define AXI_CFG_DEFAULT 0x201201
#define CX_LLI_CHAIN_EN 0x2
#define CX_CFG_EN 0x1
@@ -169,7 +167,6 @@ static void k3_dma_set_desc(struct k3_dma_phy *phy, struct k3_desc_hw *hw)
writel_relaxed(hw->count, phy->base + CX_CNT0);
writel_relaxed(hw->saddr, phy->base + CX_SRC);
writel_relaxed(hw->daddr, phy->base + CX_DST);
- writel_relaxed(AXI_CFG_DEFAULT, phy->base + AXI_CFG);
writel_relaxed(hw->config, phy->base + CX_CFG);
}