From patchwork Thu Jan 10 17:34:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155231 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2159314jaa; Thu, 10 Jan 2019 09:34:22 -0800 (PST) X-Received: by 2002:a62:6cc9:: with SMTP id h192mr11033053pfc.223.1547141662169; Thu, 10 Jan 2019 09:34:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547141662; cv=none; d=google.com; s=arc-20160816; b=cLsDA6KpvEx2pKxdB33eEtnACm8dGwZoGmvobV3BoHutw/cLMdugr8K59IU6upGe6i xNmdCmICUP28x8CJBXUvlv8dxJIvRPsA6Yn89ihNRx6O/PYN2JdFCelPlABZBZXo6Syf HPVZzaBPrLy1qGxvvF/VJ21ppfWa8KeFRHFYT/N6+cqsx1nK7B/M1Ud9UBwydnGmLGmk 3xuqYj4BCMIiIpmXuwmvehxw15nzk/PbOF3h9/TQ5LH0b7ntjaqtry8SLSjymQGd62Je hZByyiZ9SCPNEgB11e7D+izn9RR2J3H0jB6KOR6MybS6NyGdafEUVUrgnCv2NGqLZtLU aBLQ== 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=9+fP/xi0ogaPcZ5aUHlMSoUJnZJ6VWVBpkuoagJMFKE=; b=x3ZZVzFvT/+mW0UA15TJ+l7G2I3Hx6zD8ojoq9ikHEgo3YzO9kBxvcfH3DacLNnMe1 bk0bFgQewjapq1cj80qTRnqyXzMO6CDrPEh4X6Ke1uJ2SomRStNwka1HIOtsFvmOwYOB 2Xiaj/zwpRJZHL3jOcn3UYT75sBQwh/pSPgUFQorVlBnEfYfQBgtICukXW0XkKi648Ua Z38oAs1KnnlVDMwMij42E4Wmkipt1dyLR9ToiuwV6YE20PS9BFtIt7A2eCK9WwgnXM4p /tzZ1RwUsNvNtJNa9iFvNH62ZIlAPPBu9153XJww6xceJ+9Bkl6PCDQcu5mfzwY4aNGv C+AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VWO7NR8w; 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 n6sor52644142pgv.69.2019.01.10.09.34.21 for (Google Transport Security); Thu, 10 Jan 2019 09:34:22 -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=VWO7NR8w; 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=9+fP/xi0ogaPcZ5aUHlMSoUJnZJ6VWVBpkuoagJMFKE=; b=VWO7NR8wXtFW4Qlf63tIXxHJOiol4rHIv6edeuFVZUZGFLoaQ/L5sMXEC6Gnj0ecqg ntEl4sSyjfnQ6ux4tIHo4pTkDDOIB7JgToE7egW6Jvdnh8YnlDOzaw7XERuLV+tUBlUl uK6+LA6fjyzNrvXKDqGMTLvkzZztdPd9Jy5/Q= 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=9+fP/xi0ogaPcZ5aUHlMSoUJnZJ6VWVBpkuoagJMFKE=; b=kmV7pUlIq6Cxf7eYdsVRlwVseHa2kZNvpkBM2+5pCKQ47HBUwqjeIbUMQxxfco/mk8 ziTmdRkyoa4rRqU84/qwQH8KVeO4I0teY8/mBPPB0jHJrmecGISalmnqWGn6zBA9wUZj F+KQgAXbXwZPEwO7PIS77yRlQnZw7pzovqkL3wff3gYFnJg6oV3TpEgycAna98eAXacH 3XLniEzVlbdRm60SOII+rTlIHPy6pqf/XEfmb9esYB+WNoq2OYmSdMKYAbnZvNig/SVK hCk0DXg79ce3dN0PUJgle5OX9OAvLj6hN6Blay2jRARmPHyqM/feTUayl0qBCjs4QxwW hPAg== X-Gm-Message-State: AJcUukchQc8jH06Js/r9q91QWqcMR7WTtFMOw0RHYbMAvIMReJQNOrBS 4ZAYl361JGT6AjkQZz3z/oJHSD+3 X-Google-Smtp-Source: ALg8bN55NhBvyLBl8QSVRq6gfls6ISMWyizSgdLOnG4pIi6rCxlD/gk0Mu3cye+141YUVCqSqC9gTg== X-Received: by 2002:a63:ac46:: with SMTP id z6mr10182577pgn.162.1547141661687; Thu, 10 Jan 2019 09:34:21 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id k15sm125977409pfb.147.2019.01.10.09.34.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 09:34:20 -0800 (PST) From: John Stultz To: lkml Cc: Dan Williams , Vinod Koul , Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, Li Yu , Guodong Xu , John Stultz Subject: [PATCH 4/8 v3] dma: k3dma: Delete axi_config Date: Thu, 10 Jan 2019 09:34:08 -0800 Message-Id: <1547141652-8660-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547141652-8660-1-git-send-email-john.stultz@linaro.org> References: <1547141652-8660-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 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); }