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: 154796 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1020909ljp; Fri, 4 Jan 2019 12:56:39 -0800 (PST) X-Received: by 2002:a17:902:f082:: with SMTP id go2mr52309309plb.115.1546635399387; Fri, 04 Jan 2019 12:56:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546635399; cv=none; d=google.com; s=arc-20160816; b=hrIuEnZs3sM+81/SXMQXMhHgKQ/Ap3ZLqAsHRIxErAMRcwyY4gxi+aLnrn4phhFJF6 1bkxvoyHnPp478rJW+oj7OUQ0tpSeyLmHhyCt4nrhokzdpMVGJjFnqzlX+NMib6PD6Kt Se0o7q+kk9LDdM+u3pmeoOGoXwy6DF05+l+3AyfGotZwRx79Fpl7/x9md2ixYGVDmYeN dx9ba7PvJ8Ng5PAhOdTJW0C/rq2c5XBCt7yYzQOJ4iWYway1VeFKOnbzvZegN+6YJDrv H0RSGqmtR+BUstwRgZiOv6qOuNFBaUKZggXqgNZuhsizexh/mhSuSd/z4wo10TngKRvU tcGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jkv+KKhij9Erx9l7SBMC7LanjV56Iw/ajdYdzBZJLX8=; b=LOlx6e77FYYHzx2P2xQH+OEo5CupPbKcFfW9gcyLkUJrDfMxzPw32PZMGGV0T67eoi j9E18mQgFBr/WZzUip310hPe9QkqvEcgSG1GkbAZbpBDXjamMRzOTmU8gcCYrc72qDV+ sAeGSKkCuz+ap4oplk++PFBmTEjjUAxhC77K2qyMg/LDcCc+J7l5iprwwHrPoPrzgaCc v947cNKOM1Lj8DJVPEz5UTidZABAi7oWhACG8bCsf/fPUOylIvYKH96qwWOEWju2ZlgW Rq301wfncryRkjRSDAh9BqWLEPo2A59USkg+1tuldHcDMgKbfHB9JJ9U14Xvk7QkxUJb 7K5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="EqNw1S/f"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id a72sor28939055pge.21.2019.01.04.12.56.39 for (Google Transport Security); Fri, 04 Jan 2019 12:56:39 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="EqNw1S/f"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=oWF39HHqCJrDcuQfa2KxLTpUTzePHg3aK+UZSV79DXytd/J1fk/TffC00vQxcdTlW0 fGOGt6RgmFoRrRYPCmEPHFZHYrjvNsl8x8QBA6wZJHP2CNu8+0orZ17+dNEcF3DjAWsg vrbiYI5lMxeYq+jty/VHcOITx3nQR+U8VQpXdGrtJPneZ1kzvSxKpRHZRm4L/zz87bRS l5yBcDMfhGA1a714NI3CSHaQgARaWLGe5bT7970hozDIN969eibacbt3y84fBCVx2jbR DqLlU1Kp0zlpmN9WQgNal27ET2tI5J7uqRL4pD+V3bIhDZgicgp+7VJLnD/IVb/xJbjn mRjg== X-Gm-Message-State: AJcUukcvScFmuOHJXg40czaORCgxRKanDKWgbkehbKQz5ictiMrX1wac wTqA6x5EaZnFZVm9C+s96Xgh1pyj 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) Return-Path: 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> 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 --- drivers/dma/k3dma.c | 3 --- 1 file changed, 3 deletions(-) -- 2.7.4 Acked-by: Manivannan Sadhasivam 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); }