From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Li Yu <liyu65@hisilicon.com>,
Dan Williams <dan.j.williams@intel.com>,
Vinod Koul <vkoul@kernel.org>,
Tanglei Han <hantanglei@huawei.com>,
Zhuangluan Su <suzhuangluan@hisilicon.com>,
Ryan Grachek <ryan@edited.us>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
dmaengine@vger.kernel.org, Guodong Xu <guodong.xu@linaro.org>,
John Stultz <john.stultz@linaro.org>
Subject: [PATCH 4/8 v5] dma: k3dma: Delete axi_config
Date: Thu, 24 Jan 2019 12:24:19 -0800 [thread overview]
Message-ID: <1548361463-28372-5-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1548361463-28372-1-git-send-email-john.stultz@linaro.org>
From: Li Yu <liyu65@hisilicon.com>
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>
---
drivers/dma/k3dma.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index 4dce532..e415c85 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);
}
--
2.7.4
next prev parent reply other threads:[~2019-01-24 20:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 20:24 [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 John Stultz
2019-01-24 20:24 ` [PATCH 1/8 v5] Documentation: bindings: k3dma: Extend the k3dma driver binding to support hisi-asp John Stultz
2019-01-24 20:24 ` [PATCH 2/8 v5] Documentation: bindings: dma: Add binding for dma-channel-mask John Stultz
2019-01-24 20:24 ` [PATCH 3/8 v5] dma: k3dma: Upgrade k3dma driver to support hisi_asp_dma hardware John Stultz
2019-01-24 20:24 ` John Stultz [this message]
2019-01-24 20:24 ` [PATCH 5/8 v5] dma: k3dma: Add support for dma-channel-mask John Stultz
2019-02-04 8:59 ` Vinod Koul
2019-01-24 20:24 ` [PATCH 6/8 v5] arm64: dts: hi3660: Add dma to uart nodes John Stultz
2019-01-24 20:24 ` [PATCH 7/8 v5] arm64: dts: hi3660: Add hisi asp dma device John Stultz
2019-01-24 20:24 ` [PATCH 8/8 v5] arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-channel-mask John Stultz
2019-02-04 9:01 ` [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 Vinod Koul
2019-02-04 19:15 ` John Stultz
2019-02-05 5:01 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1548361463-28372-5-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=guodong.xu@linaro.org \
--cc=hantanglei@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liyu65@hisilicon.com \
--cc=manivannan.sadhasivam@linaro.org \
--cc=ryan@edited.us \
--cc=suzhuangluan@hisilicon.com \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).