From patchwork Thu Jan 24 20:24:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 156512 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2398981jaa; Thu, 24 Jan 2019 12:24:34 -0800 (PST) X-Received: by 2002:a17:902:aa0a:: with SMTP id be10mr7895757plb.266.1548361474355; Thu, 24 Jan 2019 12:24:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548361474; cv=none; d=google.com; s=arc-20160816; b=v2WgKhk3oAxtfVH+HwOBa5V4zLnjKzneOcdAscQdY2t/GKNeYItqhJI1nc5arWRk+K 0sTqmFrXH0H7jvMCHEABsNl1PUsogJ9147Yb7sFYlOlMVViyLb1i3AExiAT++h8QNMqx KNMh0njG4sEYofxZIKWnAKC1La1WzfA3XRWOJ1gdqPDlP+9di6/n/yvpsrJ/KfZYFhmr Jmxo9bj7fv9s6iK5KCdONBYbdfa9p8P6UOhzwY7nMoJb/9SkEIAXCIvO9X1oBiLdnSuH CVYHK9F7aVASxV8Os0x5MwFuDqRdnr18ffamUTALx2OcVVKmXVdXM3gDTMrCxUoO8EVE ndSQ== 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=047J1k0/mUcjNgmvRUyCPtpz6N3HyINo5R4EX4aYjSs=; b=e74vCanqe1HmXBQjSzxv6dLebBreDspjwgAoIv5/R1M6FiIyiSlLk4SOhdgTECE4rL pJmMWgZl/5o0015y4PGDzHNgioFyz4TNOP9pjNqd0uCyuDP+kwUOQJcSibUJuRWSw6tS 7yxYI0Nb8AK8D273GQqdFNFkwleOVYTEBdtMxfmZVLePfnp9rlxZkUvZxJh4ab5B6ssW xLZNa7c3uWS4Ffk4M7CAwEl0a1e0Ibeyv0c5+aQ/vWv5my8tK7yDtxeHz5CXqOxaofo6 6ETYN8buCFaMLxQDjpb72QDpqWTURYpwz98/b/FOhE89ZBR5idug1YrFQzx3XBQHm9cG fsOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FxmoAdm1; 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 z1sor12454610pfl.9.2019.01.24.12.24.34 for (Google Transport Security); Thu, 24 Jan 2019 12:24:34 -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=FxmoAdm1; 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=047J1k0/mUcjNgmvRUyCPtpz6N3HyINo5R4EX4aYjSs=; b=FxmoAdm15J9jmB9nUS/eH4yx3ojUDV8+yI0dYQNVqxuIDrQ0Yymglbt8B61ufqfo6c LtA+KYn9997gWwA6mQm2aydPKf+J41p9PIGjKs5ZTn4y1MaGCGjTQ4cl6LF3K/Z8m1/o 9lGp0YpQsia/DMIPOmizrFEq6fBug74EO5Svg= 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=047J1k0/mUcjNgmvRUyCPtpz6N3HyINo5R4EX4aYjSs=; b=XdPTCFsNjZYCpVoZKnt/zrRei/ODdf6j+Ifm9BQ+s4r40rKaMEY4O3fO1Awma6zLXT 6mXWIH02/cpFDG/DEHjq2UbQto6dESpcKkC/8bwWbT4mwYuMl06Ix8OKrYjKVn57jv77 eadOmENusbFXmXMDOyD+LvGsalpwdTwS2Ep84Klb4VT+iiYC7l0E3HW+5r4zQBhAdAm7 +NOpfkauoRW0BlsaxAc2kFvXzs9izMSyVM+xlstzplQDcfKFSWJt3/YcDdpa4kHym8v8 yGepuq1+OB+WfwK2Te71wJYaeDvcF91dnZp33xMFfjXDAbvIolzLGMVF36b1Yd74LgOd K+PA== X-Gm-Message-State: AJcUukd6I2RoikJUAeIUpPUk++9bKOyXdTfhYcceCNQn7vIZbBT6BPw1 llARDHmOZg5zt4eJhpaK3z6hKDV9 X-Google-Smtp-Source: ALg8bN7ET00M0k5VI8lVBzNMdi6A83CsHr2S1loHivH85R+UbopGmB+DDRz1YtH+K4Wh6NildFcxZg== X-Received: by 2002:a62:39cb:: with SMTP id u72mr7937322pfj.223.1548361473976; Thu, 24 Jan 2019 12:24:33 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c72sm45263309pfb.107.2019.01.24.12.24.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 12:24:33 -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 v5] dma: k3dma: Delete axi_config Date: Thu, 24 Jan 2019 12:24:19 -0800 Message-Id: <1548361463-28372-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548361463-28372-1-git-send-email-john.stultz@linaro.org> References: <1548361463-28372-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 Acked-by: Manivannan Sadhasivam 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 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); }