From patchwork Wed Jan 16 17:10:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155733 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp901488jaa; Wed, 16 Jan 2019 09:10:50 -0800 (PST) X-Received: by 2002:a63:c051:: with SMTP id z17mr9599848pgi.20.1547658649973; Wed, 16 Jan 2019 09:10:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547658649; cv=none; d=google.com; s=arc-20160816; b=03USvL14+2vl/GfBDXZHlkF6HyGLlFc+RtjombQ5Xd6/VzbpMw/0897q0lI/zI132T e9C0HHBTONsnVBrwhd3U6UGkdQpsQtENBi1Hnkh7OZaxPLhTuIgSvj/y4hz78E/xvoGM UTINJtthHsQ4xTAf0KdaTzVIz5S6iTH6hzNYAK3V3ulRqZH/yiRwh2rCwM/xgrP0+4S/ YqHIQ9LEk5IT9xYWi12c7EmDal76DThBs/PZA7IuzXFTEVginQclM3PIluZ8u5O+Oqp7 zF2w7VzIEEGLjF7V6qN78m5quK6WDNXRA1am39jPMeFgooB/Ynddlgu1qQQH57JkTdxO jFog== 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=OJHa5wzlqx/knbABIewgYzsl0j+9o++oI7YFvzXfRY7+IU30ZBCjGBIsoNUm9A+xRE yaHcyonMNMWrUApouJEijG+iIoSZlzFLX1j4TAQjqO2WfgEhEQbJGX0HHavo8LZyQ7rn D2xN+gbEVPCT4dJOYlYkhwYzktmht997mcKmSpCnwY2bFX7FbLSbnM2PO2hqHoG9u5Ff jfGBZV04lpb1lfYmXnqlcPWsz58vkRHsiuHapHb8XXmh5vHHAzoE+w/Crfw27x7samHd XqD/amx7fAwp0MBHt1Kc3bblzVv7+Gkkf/jdaNrIl+xmqAmCRSUC1dhuGKyBsOZzIbM5 FwOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z5fkpDZ4; 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 v13sor10434026pgn.66.2019.01.16.09.10.49 for (Google Transport Security); Wed, 16 Jan 2019 09:10:49 -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=Z5fkpDZ4; 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=Z5fkpDZ4b5JbyklHDHH6gvem0MfBvX4qsqUi4fVqQKQ59GG1s+jrR/2RKqFdnz+YXV DmvO0ufG1StGxto256QlzqATW/s2kUPVorRCbdtDYe6DmKla8ZAYIQ1+unFN7XIPwtSp j+QU9fVMf+fuEYtM3x8tICsMYiBne4i2Y6LmM= 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=UqCgUBQ0joxuKWODBuVKdxaUF3RqcDxWDYLeCYw2Assm5+iCth3gi4a1WQebds+g5z N058cQIAlBRMJmL2y68nHHKHPb0knNJj4X+kY4uW7Z+ZrinzXySiNgv2w287e6c4Rkg/ bgp6RxxxDLf9XKGySuJb8b1QB/vyEvMr5HLk0pd6hkO9oR6kpTEBj7mJA87gSYvb3Xll oG7hQKyip87rR1hKhyC1+2JPBW1COAZn8tsJ1MvdSVHRQjohfNjq1h8AVEHXfPRzV5k6 1MdJa8fb5mhR1AM6Fb+5w0vJdfWn1JEJ44vKS9GDlK1j+4jH5/B53CjHiJ+j4XWby+QG Wb9A== X-Gm-Message-State: AJcUukcpkvEGMENfVYwP096Ru8+VwBpI3MNCAypSWa00YLTWqaqAdsxp V39Juv6XL3sw0ChJFtUPhEVH9by2 X-Google-Smtp-Source: ALg8bN5YTCRPAPyEAHSrDhwBPRWMDltlu7Lq7S/LJmFqSAi9sEsbGYN4AxKAA7scsUXo4VHpgGyqUQ== X-Received: by 2002:a63:9e19:: with SMTP id s25mr9779115pgd.203.1547658649609; Wed, 16 Jan 2019 09:10:49 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id h129sm17914023pfb.110.2019.01.16.09.10.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 09:10:48 -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 v4] dma: k3dma: Delete axi_config Date: Wed, 16 Jan 2019 09:10:25 -0800 Message-Id: <1547658629-25378-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> References: <1547658629-25378-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); }