]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
dmaengine: k3dma: Delete axi_config
authorLi Yu <liyu65@hisilicon.com>
Thu, 24 Jan 2019 20:24:19 +0000 (12:24 -0800)
committerVinod Koul <vkoul@kernel.org>
Mon, 4 Feb 2019 09:00:50 +0000 (14:30 +0530)
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>
drivers/dma/k3dma.c

index 4dce53227274fa7ea233d5719e421a0ef90f00bc..e415c854e291df7ea21baa6a609512a4217c51bc 100644 (file)
@@ -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);
 }