From patchwork Fri Jan 4 20:56:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10748827 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D352A746 for ; Fri, 4 Jan 2019 20:57:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C452828599 for ; Fri, 4 Jan 2019 20:57:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7ECD28676; Fri, 4 Jan 2019 20:57:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BDF528599 for ; Fri, 4 Jan 2019 20:57:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726266AbfADU4k (ORCPT ); Fri, 4 Jan 2019 15:56:40 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:32908 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726253AbfADU4j (ORCPT ); Fri, 4 Jan 2019 15:56:39 -0500 Received: by mail-pf1-f193.google.com with SMTP id c123so18830074pfb.0 for ; Fri, 04 Jan 2019 12:56:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jkv+KKhij9Erx9l7SBMC7LanjV56Iw/ajdYdzBZJLX8=; b=EqNw1S/fQaKgVv4J60j++aJJzgDL4dSEOTQvE5Zq3OmcQ5nshcdWlQL6oHlzla50wA y6hnyD+vhk8D1Yr5tq6+k2MQLwyD1qe5jxmnv4J9Z9ZL5GfJ+saygSHldfn13G0eH2t3 pqY003UzQYoJTQlMRykk/MmNFGsrAcwQOqueY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jkv+KKhij9Erx9l7SBMC7LanjV56Iw/ajdYdzBZJLX8=; b=POaMKqS7lf2I4w12WViI135eV5smH8aiTr22enCTMryFFZrS5hHtUDyCpEWIZ3iu3v HmIcJy/v6FdGYBRvpzJGOUqM4JswLLP8PJH35Ky43GH1fDA5M1Y5JvPq6REtHaKI4Hev XP+08uJbUveA6qC5iLIvyNAxPm1b5X+xDlzIa/3lWTvlA4InPFMj0i7E4Z39Qe+yIxUs 9024AESdab8VbtKAWOvoL+Rb1FHIXQChYvapg45DWlDqhcqSwja0BbUUoaFJ7iuKX9Yn QAzdxCQ26c0j7RWbZ7RfuhGYaL2vA2X3tdkJ+aKRTvnVfZWmEUaujS8FymBRxCKxmZOF Z+Kw== X-Gm-Message-State: AJcUukc4fcYxOL9A9efafB61yLpXGhTS1qnvdRy4nTdpjVL/h1hfJYwj Dkmj6hae+qrrI9dsvn+2UvVhDw== X-Google-Smtp-Source: ALg8bN6HxDW9gGC8/qDPWUFCcBsGFAASOGUaQ4hqkmk0VglGMaTxj6/z77WLotjj8Kx+clYr98+RAA== X-Received: by 2002:a63:6a05:: with SMTP id f5mr49261866pgc.72.1546635398861; Fri, 04 Jan 2019 12:56:38 -0800 (PST) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l3sm98058334pga.92.2019.01.04.12.56.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jan 2019 12:56:37 -0800 (PST) From: John Stultz To: lkml Cc: Li Yu , Dan Williams , Vinod Koul , Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, Guodong Xu , John Stultz Subject: [PATCH 4/8 v2] dma: k3dma: Delete axi_config Date: Fri, 4 Jan 2019 12:56:24 -0800 Message-Id: <1546635388-13795-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> References: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Li Yu 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 Cc: Vinod Koul Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: dmaengine@vger.kernel.org Signed-off-by: Li Yu Signed-off-by: Guodong Xu [jstultz: Minor tweaks to commit message] Signed-off-by: John Stultz Acked-by: Manivannan Sadhasivam --- drivers/dma/k3dma.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index df61406..b2060bf 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 @@ -168,7 +166,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); }