From patchwork Thu Jan 10 17:34:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155228 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2159227jaa; Thu, 10 Jan 2019 09:34:17 -0800 (PST) X-Received: by 2002:a17:902:468:: with SMTP id 95mr11099195ple.3.1547141657527; Thu, 10 Jan 2019 09:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547141657; cv=none; d=google.com; s=arc-20160816; b=Xoad2w9HWbGQPrasfrTwqLLn8nvRZfrEeQqQpjSDZgmKtNs8MdxJfZ1aFRMgC34RrH bkKMKMFAzSlJ4+YC6TjxnHq/3TxphkV3uPPWyL5CSDKGIcJtoWWviP89Q78PMCdE/zZu fXsLx4AmhpyN2561qXAP4RTdeDVTP5j87CgJiIpKFqSa85ifsYiyFDeeB5LAwMJRuqzq apVLJKcBY8mjnrSyg3FqF6ITDAQ9y0otxJMX+s3/4k0BH3BZEvgolBVgu6TyEbiuVe06 0X6FFkSwhJsUvrjsaJ34gwfXHPS6GXRCfWx8Qtq7pogQSDle9JaNyH3cZbQTLZ1ug8LX I1Yg== 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=dcx6eEjMVOZ+Ig9EyGz6+bvTiD4bhQGrPgBuNC1183Y=; b=ShNVqWl+8kXIAMFkCWjIZVAkOXrfweGZ08dHxMfyzvT5iwc3K2X8UvG/cF07zFq925 VCRVZDw8J8HY+g2DpJ4oJIK4PhwSZmJBDJi05kuc+lySZSZ7iPw54oEsm4Ixivwb0ac/ UKb7BaSFmmMwEOZmlPwJwuegRKgZ9FGWJ4MGPKujSRBT9ZiEJHzbjrMj0jDC4X1MTNfJ 7yyTjk6GceS0kbC1VqEUz9xP57vUak/9tnrAnXFAFjMfev5izHoeOva7M/1qVtBoXFrq Ng74670YRHuZQM6/qPHTvqP+0RMtNQQOlL0w35RrhsskovZKSw/HDetTgVJBw34LP4EX p0uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fGVrZvxG; 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 j22sor51050879pll.8.2019.01.10.09.34.17 for (Google Transport Security); Thu, 10 Jan 2019 09:34:17 -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=fGVrZvxG; 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=dcx6eEjMVOZ+Ig9EyGz6+bvTiD4bhQGrPgBuNC1183Y=; b=fGVrZvxGT+yjviq8KD9D7HKXW4EY6Ys3/5ws/n/XoWTXQppyNScmId8EqcbWnONL/E IujSXBN5v3qOF046m5ve9AtsWNKUsd9gFjJCDNdYJMb08b7YGy3R3UFz8lBSJIa8D3Kd S+tq1y5uxy/frm0cy+P+rvdjZgp4P7ERWrRBk= 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=dcx6eEjMVOZ+Ig9EyGz6+bvTiD4bhQGrPgBuNC1183Y=; b=rY6XQxl/u+2oCvSi5FoOUVxEdDMiYzfinaw/uCJSPp7CgttJunlm2cMAi9lXKmwtbr SzzUBMcIAg0un9x0yY348/M+rMy+QojMxqhWVUr9UxylzKb7Rk8jtE45tDX9mBgHFRPH XfLW2vXOa/CAZZlSwxd4ACpwds7AyK9ZtARRyc2laRCL48RNE1YhKBNdO4qEllA1AeIq +1747H/9WNFG9IY4MEqJyI6v9uCIuONFmAFwVA+wx7lH7TvIs7IlM4IR/IoP3sUiJ9a+ xNIPlUCSrHzmVBUf4dVS93Jw4svbqCiCOetJ897GMiQv1RCfu6YgkDJcLF5TijfHyHhb Bf8A== X-Gm-Message-State: AJcUukfUxV6rN7lZT0S6AxQWUkUpgudxXTNJxjuhBJBApTfAZ3hTrK4N DhUo54kIWQWBhMWyIBjkBBdBPX2T X-Google-Smtp-Source: ALg8bN43bqvvSkmwC5b9V3zV4AWPhWXkrMz8YcRTGfeFnh+77pA+FXTl3p5vE0SAtBsKTqyzKZelyQ== X-Received: by 2002:a17:902:850c:: with SMTP id bj12mr10995603plb.46.1547141657129; Thu, 10 Jan 2019 09:34:17 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 09:34:16 -0800 (PST) From: John Stultz To: lkml Cc: Vinod Koul , Rob Herring , Mark Rutland , Zhuangluan Su , Tanglei Han , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, Youlin Wang , John Stultz Subject: [PATCH 1/8 v3] Documentation: bindings: k3dma: Extend the k3dma driver binding to support hisi-asp Date: Thu, 10 Jan 2019 09:34:05 -0800 Message-Id: <1547141652-8660-2-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: Youlin Wang Extend the k3dma driver binding to support hisi-asp hardware variants. Cc: Vinod Koul Cc: Rob Herring Cc: Mark Rutland Cc: Zhuangluan Su Cc: Tanglei Han Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: dmaengine@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: Youlin Wang Signed-off-by: Tanglei Han Signed-off-by: John Stultz --- v2: Simplify patch, removing extranious examples --- Documentation/devicetree/bindings/dma/k3dma.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.7.4 Reviewed-by: Rob Herring diff --git a/Documentation/devicetree/bindings/dma/k3dma.txt b/Documentation/devicetree/bindings/dma/k3dma.txt index 4945aea..10a2f15 100644 --- a/Documentation/devicetree/bindings/dma/k3dma.txt +++ b/Documentation/devicetree/bindings/dma/k3dma.txt @@ -3,7 +3,9 @@ See dma.txt first Required properties: -- compatible: Should be "hisilicon,k3-dma-1.0" +- compatible: Must be one of +- "hisilicon,k3-dma-1.0" +- "hisilicon,hisi-pcm-asp-dma-1.0" - reg: Should contain DMA registers location and length. - interrupts: Should contain one interrupt shared by all channel - #dma-cells: see dma.txt, should be 1, para number From patchwork Thu Jan 10 17:34:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155229 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2159258jaa; Thu, 10 Jan 2019 09:34:19 -0800 (PST) X-Received: by 2002:a17:902:f20d:: with SMTP id gn13mr10755780plb.11.1547141659046; Thu, 10 Jan 2019 09:34:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547141659; cv=none; d=google.com; s=arc-20160816; b=uwvQF3KhBQC5BJ9Gusa0Fcm584Uft9Mv2+OmnaTdD3UwgKGgXnz9e+xLykff6J2NoR HhQMTZxwuxqUlTeB8RARE/LwoGwCwX1x4hTsCmoDmCflLdf1m0bhtcdN36gWF30B6wEL wVJ3lni2kGDtUV75/aKooocJtZRWyoYpi4RPwuynLKuqU+ZPnyQDKL9jgk8BWcn3Rb3b ZpaYk8YSCLrAgTGesFXQOj7Pf4Ae1Yb9QIfuIEaKjSw0jKGnDOF1J03mZwa6TvgjmUiG /WZyt9W2YHJe4jI2uoqZJyJDEiwp3YAOjsBxlCYfZShMC9PyS2FYSZfTn6d0jLAQsyL7 /ATg== 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=scRXab2BdItzSN7N1dJ/E1JYLmZRr6aPorQ+GwZ0j2A=; b=c87WC0iS+ARzv4otdmYaU0PcFDLOng6ZzJNe8bZqW9nzuI0mEGpWZEocObYW+JCMmc aRrElXo6xSHqS+lhqzeVys/+6aGFa4lB5DBGn3ZtO9logRjSZmT895tqFfw/Hf7DQXe9 ZgNXlLr9uzJLoupYkbNGGjIj0pw5rcI7fmuEq9bhAyR0ipByNkYtwM2IApQPVmnL7Lfw 8nGf736YFJaUeyf8fLgGZA8PeOTQ7hClv6e4hwJApGZAhSfAK6/Qay3HyhCNzcRDbdsu 3aXsTrBHS4mS+/FGeK6XwfIWJNweY81pSvzie9n9QWpXAHIH3uykjNFC0nAaYUSZdjMT LatQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Td7fbzWk; 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 l189sor51296173pgd.51.2019.01.10.09.34.18 for (Google Transport Security); Thu, 10 Jan 2019 09:34:19 -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=Td7fbzWk; 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=scRXab2BdItzSN7N1dJ/E1JYLmZRr6aPorQ+GwZ0j2A=; b=Td7fbzWkPt9bckm0kS6rnBoYHYHCKlvh7QFb6oOn+CCUeIMD/22IHUq8NnzFbeQurk MZxTslUUWDC/6JSxlE8MF0x5AoQbDiXjD8B51boKY3w3AvatDNBwIxZT1dzm0KD4COmg /iMTRtaWvDAc7EhrwQ7ncDznFDiLAtBfNTxlo= 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=scRXab2BdItzSN7N1dJ/E1JYLmZRr6aPorQ+GwZ0j2A=; b=cNG7vWNwmiwJvNsKxlouMggpy7q9GQYo7tNAKJWz4K77JfmHHohlJQNfOPzerHR/As b3gYagRcrtXpDETBHzgN9yBJGBiEpq3yWeZu+z308XiLTdP7QBYrvmjrao+qRGFHDh1p ncIw8cNKUHHqAU86eFT4JXLe7KkSUEW09Ch5AjPyU7fPsnefGIo6n90uVVQizwhY9iOg rsNAq6QsK9eoUmY5AO+IfeoSJY17kADe0IrwLgiufUw7WfK6IrD1z7K4E812RkHWdZrc WVWj2n7xiNJblc4M19STUmCdMw/J9ZdY7DflQvXnrz5GYC0i2r6ymakDg53PgYGW3Zo4 dyMQ== X-Gm-Message-State: AJcUuke7Lxhpds0Cm0evzqbhxOk/dd2mSvLc6Xf4/z3MHkSDoFz/FpTF Ll5zj2duTtz8QPxINx3CIz7DBUut X-Google-Smtp-Source: ALg8bN4pGFoTbckpuD5ANArZkBTvgy0LhUQwq8LqprlEYCoap08zvU2dN6+zVMogZ3wsWiy0xyRPBQ== X-Received: by 2002:a63:5518:: with SMTP id j24mr10037682pgb.208.1547141658464; Thu, 10 Jan 2019 09:34:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 09:34:17 -0800 (PST) From: John Stultz To: lkml Cc: Vinod Koul , Rob Herring , Mark Rutland , Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, John Stultz Subject: [PATCH 2/8 v3] Documentation: bindings: k3dma: Add binding for hisi-dma-avail-chan Date: Thu, 10 Jan 2019 09:34:06 -0800 Message-Id: <1547141652-8660-3-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> Some dma channels can be reserved for secure mode or other hardware on the SoC, so provide a binding for a bitmask listing the available channels for the kernel to use. Cc: Vinod Koul Cc: Rob Herring Cc: Mark Rutland Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: dmaengine@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: John Stultz --- v3: Renamed to hisi-dma-avail-chan --- Documentation/devicetree/bindings/dma/k3dma.txt | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 diff --git a/Documentation/devicetree/bindings/dma/k3dma.txt b/Documentation/devicetree/bindings/dma/k3dma.txt index 10a2f15..38825d4 100644 --- a/Documentation/devicetree/bindings/dma/k3dma.txt +++ b/Documentation/devicetree/bindings/dma/k3dma.txt @@ -14,6 +14,9 @@ Required properties: have specific request line - clocks: clock required +Optional properties: +- hisi-dma-avail-chan: Bitmask of available physical channels + Example: Controller: From patchwork Thu Jan 10 17:34:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155230 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2159293jaa; Thu, 10 Jan 2019 09:34:20 -0800 (PST) X-Received: by 2002:a17:902:2a89:: with SMTP id j9mr6434933plb.296.1547141660741; Thu, 10 Jan 2019 09:34:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547141660; cv=none; d=google.com; s=arc-20160816; b=qcBPYHCAWpfM+NE8LdnU7hEWnRyEDnRasQHJs5tu/fJqAuFRwHaIBA8kNveygqZDMI Ca+BcjvJiJwtJ6VDiCDfFd5RRrJDfHIPqi3igbmrY0dtmPpMa/iyHC3fClkImEEbxpEj DJnN1h+WkZ0pRskUmT78kC4xdprXiHDxfDONBbM5p67vA2NCpgHowQH5I1B0Ky0QqYjk DG3dSf51nNElJCS+zKheCXjaHr3wLyJUNfXTH6j3frS7qgxVKpVFrqSieiUQ0rDVB9oL PsC5STqcm3SCvWNwMDeG1w3A17Jm5tcovQ3K58iW9cAUd1E1st94XCrYVBXabC8hVZDH 3Z1A== 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=GvaGd5Qa7PcuxUq/r8GFXFG1FEuIWEy4GqPFolG9iUI=; b=WSAfFUDXqhNIQlo5tVFo2P0mw6yNk67lPsRTC2QX9FwrDkpDtCbqY4ARy+zgn1bZUj zhX7AqSeEezUgOGbT8GgCg752DtwwTmg/MJwKQkWcv1YH1G3q9k3UNBlLdqG2MXwZHsa CdUckf4ui/vQ+USgvxKF+5vpiwbKL5a4d7WUKR0ubH3Zz6PDgV+ph/UbnfwaA/1Zh1Ck ll/cx4cRXSxdfIcGv9/93XwW9dCJXMOQvpG/7f5VdORGds7ARLqHnJAKDt9weEsJjAEK MwGxhYhrfbL6l4zAF1/gzApdeKR2qd99CyQWqfdo/b3kvzj5dCgh1U1bS467J/h7ooRo rj2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jxSRrtci; 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 j193sor52701585pge.29.2019.01.10.09.34.20 for (Google Transport Security); Thu, 10 Jan 2019 09:34:20 -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=jxSRrtci; 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=GvaGd5Qa7PcuxUq/r8GFXFG1FEuIWEy4GqPFolG9iUI=; b=jxSRrtciAFsvPrLOdNPhoVjarHW2x/2/ieNzhzFow+FU0K8BMwZLOe2a4Smu9h1k0R PKW4LIHA2T7w2pM2l3KXg2pwa3HsvR+0UOWMXVWL33Ev0NGPfMeEWNyUEwjuxpLdOihY joAfF444bcis6IgH48l+ZKHNIc3ECmaj1WIeY= 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=GvaGd5Qa7PcuxUq/r8GFXFG1FEuIWEy4GqPFolG9iUI=; b=Lsw+OlBVU6E+WB6vXFWbglgQjCpBcbW2SFavAac4riiVkm52Gl30rYRliD6f14149O PWGhQVm4PqWqgGg6jAhQC2i+FEgfc/XF0GqDA0PqNx02+rZcv+EWIqk+C7yo0FQDoxTx ZISGcjo0qfRYUEIYs/Cpiti92PD3w8MoICZL3XVy2SWGuwBDAZ1wzxtSWM0bw3ZDtKMc 45qjeF9dlKbn4TLJsUunH7/cnpPVLT245/6btrAuan0fxskVgme/HwXVfxoIfXaDVHaL CNUgLyu68zf+ovQQYjiudnL0Qce9Qx+hOt9WQlP6XHO6MN/HxAhfxLHbcIR/ad8zPKr9 kPUA== X-Gm-Message-State: AJcUukf4+69L+izF8S9r+TAFZXpJR1QBedtp9gO6nEQ934+II/kUABNR XBzmQvxyS95DFo7qfI81UQt0S0ie X-Google-Smtp-Source: ALg8bN4hH6OpNpCbHKtQeZyVFIwzVI9NPTlgoq4ItvQtEK7rYgtlbysusiurz+Jp1hkGwNWFvLMIbw== X-Received: by 2002:a63:83c1:: with SMTP id h184mr4506117pge.437.1547141660281; Thu, 10 Jan 2019 09:34:20 -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.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 09:34:19 -0800 (PST) From: John Stultz To: lkml Cc: Dan Williams , Vinod Koul , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, Youlin Wang , Tanglei Han , John Stultz Subject: [PATCH 3/8 v3] dma: k3dma: Upgrade k3dma driver to support hisi_asp_dma hardware Date: Thu, 10 Jan 2019 09:34:07 -0800 Message-Id: <1547141652-8660-4-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: Youlin Wang On the hi3660 hardware there are two (at least) DMA controllers, the DMA-P (Peripherial DMA) and the DMA-A (Audio DMA). The two blocks are similar, but have some slight differences. This resulted in the vendor implementing two separate drivers, which after review, they have been able to condense and re-use the existing k3dma driver. Thus, this patch adds support for the new "hisi-pcm-asp-dma-1.0" compatible string in the binding. One difference with the DMA-A controller, is that it does not need to initialize a clock. So we skip this by adding and using soc data flags. After above this driver will support both k3 and hisi_asp dma hardware. Cc: Dan Williams Cc: Vinod Koul Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: dmaengine@vger.kernel.org Acked-by: Manivannan Sadhasivam Signed-off-by: Youlin Wang Signed-off-by: Tanglei Han [jstultz: Reworked to use of_match_data, commit msg improvements] Signed-off-by: John Stultz --- v2: * Reworked to use of_match_data v3: * Further rework of the commit message --- drivers/dma/k3dma.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index fdec2b6..df61406 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -116,6 +116,13 @@ struct k3_dma_dev { unsigned int irq; }; + +#define K3_FLAG_NOCLK (1<<0) +struct k3dma_soc_data { + unsigned long flags; +}; + + #define to_k3_dma(dmadev) container_of(dmadev, struct k3_dma_dev, slave) static int k3_dma_config_write(struct dma_chan *chan, @@ -790,8 +797,21 @@ static int k3_dma_transfer_resume(struct dma_chan *chan) return 0; } +static const struct k3dma_soc_data k3_v1_dma_data = { + .flags = 0, +}; + +static const struct k3dma_soc_data asp_v1_dma_data = { + .flags = K3_FLAG_NOCLK, +}; + static const struct of_device_id k3_pdma_dt_ids[] = { - { .compatible = "hisilicon,k3-dma-1.0", }, + { .compatible = "hisilicon,k3-dma-1.0", + .data = &k3_v1_dma_data + }, + { .compatible = "hisilicon,hisi-pcm-asp-dma-1.0", + .data = &asp_v1_dma_data + }, {} }; MODULE_DEVICE_TABLE(of, k3_pdma_dt_ids); @@ -810,6 +830,7 @@ static struct dma_chan *k3_of_dma_simple_xlate(struct of_phandle_args *dma_spec, static int k3_dma_probe(struct platform_device *op) { + const struct k3dma_soc_data *soc_data; struct k3_dma_dev *d; const struct of_device_id *of_id; struct resource *iores; @@ -823,6 +844,10 @@ static int k3_dma_probe(struct platform_device *op) if (!d) return -ENOMEM; + soc_data = device_get_match_data(&op->dev); + if (!soc_data) + return -EINVAL; + d->base = devm_ioremap_resource(&op->dev, iores); if (IS_ERR(d->base)) return PTR_ERR(d->base); @@ -835,10 +860,12 @@ static int k3_dma_probe(struct platform_device *op) "dma-requests", &d->dma_requests); } - d->clk = devm_clk_get(&op->dev, NULL); - if (IS_ERR(d->clk)) { - dev_err(&op->dev, "no dma clk\n"); - return PTR_ERR(d->clk); + if (!(soc_data->flags & K3_FLAG_NOCLK)) { + d->clk = devm_clk_get(&op->dev, NULL); + if (IS_ERR(d->clk)) { + dev_err(&op->dev, "no dma clk\n"); + return PTR_ERR(d->clk); + } } irq = platform_get_irq(op, 0); 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); } From patchwork Thu Jan 10 17:34:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155232 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2159338jaa; Thu, 10 Jan 2019 09:34:23 -0800 (PST) X-Received: by 2002:a63:e247:: with SMTP id y7mr7597443pgj.84.1547141663658; Thu, 10 Jan 2019 09:34:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547141663; cv=none; d=google.com; s=arc-20160816; b=a0hU9uejfRAMpVXge/6l3PiXXMC5yPWJrYGlhOOQ0NyZwtBN2fzp2AGUuu46gr6/2i i/FeIApVZCmEaykSusRmjvdSj1rrGmnyRMkGI1ogNMdIbWT9TzD71K1hbhjeII0Fr31X ixhGWMyb/V5CIpuLAg6pSqlZAirY/eGwIDfWFlycfIeBXFjhJreaSL7O7JkVST/1sbqo Z9ao/4h8Fj7VnOrZFiJfAtDSBP2zsRvCF2OELPnsnWqSLfNrz2JqC8qg0B3D3vbFiNd3 K8PO8Rtn9uQNA34/hO1KDXcPUguSwqrWtgqRrmYQ0VyrHolXiFEfpl6trZvJJb7BUDC2 6kNg== 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=Acz25rUAnYOwtdV3EAKACd8ebfPIsH2pLWOoO+LfHkQ=; b=eQqBUT9M5iK3sABOK+0X80REpC2eW+k//nT+b9l1Po6O9KgVLkZKBR2nKhImsdJMQa JO2nsEj/uW4CB8nfCpPFZu4BhhZQOyfKRSbm/pEm5/PD18fhD4OXn5jIcfvpXaKpW80e FV7VbavCHVSGTsB3nErcccTluStdyNUPXQjuRb/FvggMLfwpgh5mQwqPYlUFyeyn8bMX pQjQFa23PUsP855v+5fGC2/QjO8EgxFSXTX5P49lUvioTEUUMZOFCVtWRe5xkQvxxq4u uD3wygC21TFKwnAzY+bcqnJS7LmliGWBopmTo3Tx+okMX8QelPC/Am3zgjlvgEWpjaF0 uMKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HL6eVqd3; 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 z186sor51371025pgd.6.2019.01.10.09.34.23 for (Google Transport Security); Thu, 10 Jan 2019 09:34:23 -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=HL6eVqd3; 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=Acz25rUAnYOwtdV3EAKACd8ebfPIsH2pLWOoO+LfHkQ=; b=HL6eVqd3VAGtKA/ZqhGwc7urfTA9PFdcn3E/aLw3sh22SI6JuaZf+Uh1/+13tBxK9V cOpJ3YGxuk1q1H1+yU4KXo3S6zRVKketPHzEQHMzaXd8LyG1ZpaG2wgofDWOjiJ8+ipG Q8DSr1kPEWC26HS7YbYJUnNvAClIakTFeHkTs= 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=Acz25rUAnYOwtdV3EAKACd8ebfPIsH2pLWOoO+LfHkQ=; b=IC3+AaWIrdfJfdEljQ5q0ZrFJdR8PC9Y50BNQh6pw4l7uTsd3y5ZG+zT9+IpmtmW8g NAFGifHiSPYaIs+8ZSJ07CLKWwILSHMEddcz38g8I8HT4DT/POo1PAIrpZ9HAfuj03f6 3VzTLwp+Ocx7QwJieZ5VbyclCTQooY1UYQUVgqbGY+hQzCUan0yICIrttFGQ/2uJzwo9 ssigx4Vgon1pHhlqd3oYr9BCzB/dyuNhUgA6kNVwhM1CESuc9tG7sphLFs8uWQy/xj35 gjTTDJ1RBhLcKPF+KSJIM7x4hE3rqtU3R1e5HdTxW3fpy8G3xe53SjWEmn1IlDRlUC6q vzzw== X-Gm-Message-State: AJcUukeOnrHbScKXdlYfAlFLnSI/9DHQD5kkJ+b7KQ3oaMMMGFGpx9bS d205O4LGSMUlBtUGzVenHx4dIWni X-Google-Smtp-Source: ALg8bN5fReUPM9X00AxvG4rgs5k/K0xAWLkVnBzRFck8uyETLJK1JUIVJXlP/2orbsTSEM9dCxJDwA== X-Received: by 2002:a63:a91a:: with SMTP id u26mr10042588pge.349.1547141663245; Thu, 10 Jan 2019 09:34:23 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 09:34:22 -0800 (PST) From: John Stultz To: lkml Cc: Dan Williams , Vinod Koul , Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , Guodong Xu , dmaengine@vger.kernel.org, Li Yu , John Stultz Subject: [PATCH 5/8 v3] dma: k3dma: Add support for hisi-dma-avail-chan Date: Thu, 10 Jan 2019 09:34:09 -0800 Message-Id: <1547141652-8660-6-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 Add hisi-dma-avail-chan as a property for k3dma, it defines available dma channels which a non-secure mode driver can use. One sample usage of this is in Hi3660 SoC. DMA channel 0 is reserved to lpm3, which is a coprocessor for power management. So as a result, any request in kernel (which runs on main processor and in non-secure mode) should start from at least channel 1. Cc: Dan Williams Cc: Vinod Koul Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: Guodong Xu Cc: dmaengine@vger.kernel.org Signed-off-by: Li Yu [jstultz: Reworked to use a channel mask] Signed-off-by: John Stultz --- v3: Rename to hisi-dma-avail-chan --- drivers/dma/k3dma.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index b2060bf..f4001ca 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -111,6 +111,7 @@ struct k3_dma_dev { struct dma_pool *pool; u32 dma_channels; u32 dma_requests; + u32 dma_avail_chan; unsigned int irq; }; @@ -318,6 +319,9 @@ static void k3_dma_tasklet(unsigned long arg) /* check new channel request in d->chan_pending */ spin_lock_irq(&d->lock); for (pch = 0; pch < d->dma_channels; pch++) { + if (!(d->dma_avail_chan & (1<phy[pch]; if (p->vchan == NULL && !list_empty(&d->chan_pending)) { @@ -335,6 +339,9 @@ static void k3_dma_tasklet(unsigned long arg) spin_unlock_irq(&d->lock); for (pch = 0; pch < d->dma_channels; pch++) { + if (!(d->dma_avail_chan & (1<phy[pch]; c = p->vchan; @@ -855,6 +862,13 @@ static int k3_dma_probe(struct platform_device *op) "dma-channels", &d->dma_channels); of_property_read_u32((&op->dev)->of_node, "dma-requests", &d->dma_requests); + ret = of_property_read_u32((&op->dev)->of_node, + "hisi-dma-avail-chan", &d->dma_avail_chan); + if (ret) { + dev_warn(&op->dev, + "hisi-dma-avail-chan doesn't exist, considering all as available.\n"); + d->dma_avail_chan = (u32)~0UL; + } } if (!(soc_data->flags & K3_FLAG_NOCLK)) { @@ -886,8 +900,12 @@ static int k3_dma_probe(struct platform_device *op) return -ENOMEM; for (i = 0; i < d->dma_channels; i++) { - struct k3_dma_phy *p = &d->phy[i]; + struct k3_dma_phy *p; + + if (!(d->dma_avail_chan & (1<phy[i]; p->idx = i; p->base = d->base + i * 0x40; } From patchwork Thu Jan 10 17:34:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155233 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2159358jaa; Thu, 10 Jan 2019 09:34:25 -0800 (PST) X-Received: by 2002:a63:1c09:: with SMTP id c9mr10047881pgc.200.1547141665065; Thu, 10 Jan 2019 09:34:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547141665; cv=none; d=google.com; s=arc-20160816; b=T9d2xrxWEYLwZ3eOHinoLHKtlvYI72Jd15PoFasFR6hNqk1Sb1ZDcJhFtyioCT4Lii Ej80ILqqMLJQGDPzxu75hFSe4vvWYTqqTTEeHMmwiAROYC0RDuS8LZPwUWo/m/rf0IVD RwEpBtVQ4EvqzWGmU1adHq4M/zhEvvJflNuEw6439QiZP6pDllFR70iNd6ysFmwf6lqH D5KBn+01j3ekOiyS6HbFHVcSOB0NaqwHPCNeh8MHHu+z5ye4U1zlQfzD+1RDGWGjte3K eH10MeCLZoiRIpSo87DoIw0vJajKfEnmR+I3HdqprieLV5j2DgPlT6ZZTojIpbW/TrFM CCSw== 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=VnxmDmWRiHgP8rQwZAnpNW6+tNuZ3Gwc75mIp5vRAak=; b=k5fw2QwLdJ37Rjh7f3zkSGq6KOR9Dwk04db4IGAnwtnfCS6ORKl4AhwIQhYGhPIfQn aPGvoOQjmvGvuBZoxIIRXYgt9b7MBu6roby6OkoZcFmG7fbAtcrhnNSGvKB87H6y6tjq pq8YpCGJEGbJmCXVhFpy2duhzxAuVpiMm7V21h7RMzj9b98HQDhg7G/wjqgGN9XxlJos vA07kr21DIn7CAF1aQqeDqINUC7Z/IGKbRFIt7bJFMtOPNYdF9+SXnT2qcHoK3JdVFjD YnO/uvg1RfWEwIWA1ukDk0KmrVgyGggC9vSvUk4Grej4ogpNknQQdHvqZAA6w1DVwefY Z3SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SWCvuoSn; 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 j6sor50845025pgq.46.2019.01.10.09.34.24 for (Google Transport Security); Thu, 10 Jan 2019 09:34:25 -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=SWCvuoSn; 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=VnxmDmWRiHgP8rQwZAnpNW6+tNuZ3Gwc75mIp5vRAak=; b=SWCvuoSnfQU8l4XA5RnQA4Xo85TwZCLQhNPOOlMXlpaSh1JIEkFmqrLaT4JNvUSEYS 6StZRSA+n1lJ0bk+PUSx6ANXLkFjSLSFjSHlgSAWpiaoZcwnazcC+08U0ncm9ALhZg7T Y3eLnSwq4XG0sX76Evoku9ko3752RGhLLn/TE= 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=VnxmDmWRiHgP8rQwZAnpNW6+tNuZ3Gwc75mIp5vRAak=; b=EMjYjg1MrkEygNoIVo9TCeQdQDFDpQ1Ok4lHiX/spPz1lP+1Q0RLAr0uN1IeHEYuxo /hhaPL5yUywRvN3a/DCGRRqh4YFCjCvUEEU7W6PxW7n4tDl84zUTYVuCcOYYPDavnp3v +A6VOeAkTOxZKJq616mxgC7JdonZvgbDSTg3ueEAcxfdxuHO3ZA+ZixNq3a1Kek48Q8n qMZKYjX4yJGE6i+wXhQUZ7bRvyXqmgQ/1PI7vQb62rvIEnczcsHyA2023zOXcd9paLDI KxUUl8c6kOMub4u3lbEfoAkeXyf8BGREwt9SBguo5v4G9kV8cBSWIVzOi5HdLTN47WIP Cljg== X-Gm-Message-State: AJcUukfW2fJa7AKyf3c1hgNvZTq9Mv+iVLjkk1kHv6VOy/udmZ1aVJtt ZQdBOVM6gZ5SRBu9c0YOIBoiN0mH X-Google-Smtp-Source: ALg8bN7XMfJIwJKKEavHsyAPlj4ivJhbI8iuWSsMXERF6VzGFeaZYQ1YqIKBRD4Wcncg2T0UDK0ewg== X-Received: by 2002:a63:1a0c:: with SMTP id a12mr9993920pga.157.1547141664636; Thu, 10 Jan 2019 09:34:24 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 09:34:23 -0800 (PST) From: John Stultz To: lkml Cc: Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , Wei Xu , Rob Herring , Mark Rutland , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, John Stultz Subject: [PATCH 6/8 v3] arm64: dts: hi3660: Add dma to uart nodes Date: Thu, 10 Jan 2019 09:34:10 -0800 Message-Id: <1547141652-8660-7-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> Try to add DMA support to the uart nodes following the assignments made in the dts from the victoria vendor kernel here: https://consumer.huawei.com/en/opensource/detail/?siteCode=worldwide&keywords=p10&fileType=openSourceSoftware&pageSize=10&curPage=1 Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: Wei Xu Cc: Rob Herring Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Signed-off-by: John Stultz --- v3: * Remove dma enablment on uart0 which would use reserved channel 0 --- arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.7.4 diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index 20ae40d..4c8d682 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -478,6 +478,8 @@ compatible = "arm,pl011", "arm,primecell"; reg = <0x0 0xfdf00000 0x0 0x1000>; interrupts = ; + dma-names = "rx", "tx"; + dmas = <&dma0 2 &dma0 3>; clocks = <&crg_ctrl HI3660_CLK_GATE_UART1>, <&crg_ctrl HI3660_CLK_GATE_UART1>; clock-names = "uartclk", "apb_pclk"; @@ -490,6 +492,8 @@ compatible = "arm,pl011", "arm,primecell"; reg = <0x0 0xfdf03000 0x0 0x1000>; interrupts = ; + dma-names = "rx", "tx"; + dmas = <&dma0 4 &dma0 5>; clocks = <&crg_ctrl HI3660_CLK_GATE_UART2>, <&crg_ctrl HI3660_PCLK>; clock-names = "uartclk", "apb_pclk"; @@ -514,6 +518,8 @@ compatible = "arm,pl011", "arm,primecell"; reg = <0x0 0xfdf01000 0x0 0x1000>; interrupts = ; + dma-names = "rx", "tx"; + dmas = <&dma0 6 &dma0 7>; clocks = <&crg_ctrl HI3660_CLK_GATE_UART4>, <&crg_ctrl HI3660_CLK_GATE_UART4>; clock-names = "uartclk", "apb_pclk"; @@ -526,6 +532,8 @@ compatible = "arm,pl011", "arm,primecell"; reg = <0x0 0xfdf05000 0x0 0x1000>; interrupts = ; + dma-names = "rx", "tx"; + dmas = <&dma0 8 &dma0 9>; clocks = <&crg_ctrl HI3660_CLK_GATE_UART5>, <&crg_ctrl HI3660_CLK_GATE_UART5>; clock-names = "uartclk", "apb_pclk"; From patchwork Thu Jan 10 17:34:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155234 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2159407jaa; Thu, 10 Jan 2019 09:34:27 -0800 (PST) X-Received: by 2002:a62:8dd9:: with SMTP id p86mr10931088pfk.143.1547141666940; Thu, 10 Jan 2019 09:34:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547141666; cv=none; d=google.com; s=arc-20160816; b=AdIBO3Rtahah8YOoSsME0LMa7FC9f9aF2fkBtWFQTjsxNcjuyGhZJAo6xBDTNaGi3/ TioN7BBAxOkDM7i8Txgxp6iIvdzEn+rjaNA6gX/+6kGDaY4DZJXWADDgcbbYcjMnw7Lz YjnNyZUlT5q5QNXnepd4a6d5v8M/YiHcA0GeCLb725XCKSuhYWAsLRwcRhRwHdkL29JM r2BcRID7AgNevJvCXg9lplKDZlei9d66vOjddmFuLd6YtlIgVZFl0ATlA4CyM3MTK7Bv JpCw0nmSMQPm0VTZKcPCHoO4gtWDtOvoG8Tmxjl/abm4PGLJSnewrjMkom/mQ/tun313 mVDw== 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=BJPwKdPemEfYMv75wEmswxneBbTlFKZrByoYlXp3bSs=; b=r9jLyr3iLpE8+60u1FnLgXgHVfuOsiKCOOZqZC1zwjwkY79UH39pYmBzpIp1lFV4ty e6mc3OFoSV3phZClNTCZknluRjw9SZ6Y4ttJbpCkVPw/BRLsphhGIZj6rf2rV/7ySa0I QZYW8Rlxa5J3cnk8Wote/iDdn0n72G304tSMjKkZ0ZL4cwJifvZaa1n7PdDdqZ3jxo4b E750OprTLBLAWBsVT8Sgmq9y43xYlhGn+xyw1mi4q3gLSWsWwxlkm6FC7WcfoKYGIHut qXTw+TseImuNcB626gVYsqsJXR+bw7OFkWMD9w9+BiKRc20qSWUaBlzsxjstDOAd7qbD tHCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iuy9V6jq; 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 j1sor52446050plk.57.2019.01.10.09.34.26 for (Google Transport Security); Thu, 10 Jan 2019 09:34:26 -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=iuy9V6jq; 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=BJPwKdPemEfYMv75wEmswxneBbTlFKZrByoYlXp3bSs=; b=iuy9V6jqxAJvqy6tSRvIkhHDKg8AXbR5U4GoOHS7AYuJ1eQsjPeBl4HoCL+CJbK8js YmeTND5LSvjqetT9V/BjRuIcOw7EE85aB+fz0Br7Bpbw0ga8wRqG+Gtk9Dn13KEepPQt 8OdyWhubbn3WBx+yHycjEcSI0/RspL/JCEcUY= 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=BJPwKdPemEfYMv75wEmswxneBbTlFKZrByoYlXp3bSs=; b=uWbmkOkq3r+3dZ611qa6dQTS0Zxk+iDC4fDaQa/iANZa6j2elA8vDzJTfyAkkby/X7 +wS2vnRrnNouYRkmdfA3q80ee/G1A+s7FK+aJho6LwADLfwprAI81ie3gf8kFd8RsIKa 9AnS3EXnIyMtAvdQ5lgYqCQCap9uShRhJO6i2gPuRlPAmqKbE2eq3V/cHaIsbLpUMrHq YGa4lxZK++HSP9tGH0/karoZhq6kB9M+oO6SNmF4t2J1j35DJ8fIemDkS5IkrsIZL2wi ZF33P6qyfaSxz172vJlAVAkrOiTGfQVAgS7QWD94cpOBschmfqMh3qFqy36yiIrv1A3H o80Q== X-Gm-Message-State: AJcUukcdVJ/lJ/H4tsQ9+p8msStfzS2kesXDbfMnT11wjs2k+7RgpnQp MPxETZxqv5BLCssGjNyM45ZNRfranCgBCFjp X-Google-Smtp-Source: ALg8bN48czPk4P5inKX4Efd+Xi+gXZtHTbv+vius5pKpS0Z5BoHbBlmB83+2n1+SsSrPUACT2FXgcQ== X-Received: by 2002:a17:902:1101:: with SMTP id d1mr11079391pla.136.1547141666568; Thu, 10 Jan 2019 09:34:26 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 09:34:25 -0800 (PST) From: John Stultz To: lkml Cc: Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , Wei Xu , Rob Herring , Mark Rutland , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Youlin Wang , John Stultz Subject: [PATCH 7/8 v3] arm64: dts: hi3660: Add hisi asp dma device Date: Thu, 10 Jan 2019 09:34:11 -0800 Message-Id: <1547141652-8660-8-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: Youlin Wang Add asp-dma device to hi3660 dts Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: Wei Xu Cc: Rob Herring Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Acked-by: Manivannan Sadhasivam Signed-off-by: Youlin Wang Signed-off-by: Tanglei Han Signed-off-by: John Stultz --- v2: Removed undocumented bindings --- arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.7.4 diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index 4c8d682..77a7135 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -567,6 +567,16 @@ dma-type = "hi3660_dma"; }; + asp_dmac: dma-controller@e804b000 { + compatible = "hisilicon,hisi-pcm-asp-dma-1.0"; + reg = <0x0 0xe804b000 0x0 0x1000>; + #dma-cells = <1>; + dma-channels = <16>; + dma-requests = <32>; + interrupts = ; + interrupt-names = "asp_dma_irq"; + }; + rtc0: rtc@fff04000 { compatible = "arm,pl031", "arm,primecell"; reg = <0x0 0Xfff04000 0x0 0x1000>; From patchwork Thu Jan 10 17:34:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155235 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2159441jaa; Thu, 10 Jan 2019 09:34:28 -0800 (PST) X-Received: by 2002:a63:fd0a:: with SMTP id d10mr10269717pgh.164.1547141668602; Thu, 10 Jan 2019 09:34:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547141668; cv=none; d=google.com; s=arc-20160816; b=QoHrkkhOwg+xlY/2t0WcaIDXQHKZ0AY8/9en0twf0Q5xIxzDH+9oxTQ9kpiGZWjaGq HII1SVE6lyyFp5yvKUxSGiGupU+c7n4I59LAoNd4rz/x2Txvq4rq9Bhzi0Pa0SDy0LI2 M8aJst6Eapsf3cq0xJuZfOYEVCGA8ZoJDZp5e+kNFkEIhUOKTNHIfsop0+S4RX9lPPBR 1ri4ZPFgwOMWV7epYxuC+Vgvddp3nCFbmftktxAX5440CqrsW99zk6L1t440uuCMmwVT JiMUCwYAdm2eRA23Rk9f99HpjOzTvrHT+AxNmPKGtWBX+h2hdWj9vcKkzS1XfCGbh5EQ S6VA== 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=cmarbxwYg7HNoDTmchA0P0EFmwoGgD4g+3dBXR4lJyQ=; b=N174sfcmZumpFqMxuJqLzIMS75JBYQ2z04OYtTH/3DoEMX2vO1NQdf81IJ+1khz9gk oBUOA6XqbB8ifbhzXRncG7teOx6MU/m9AgvIdNQkBDzbO2VRKIuCrnuqoqrNOnFRJ03E 0asNxQMOcDuLhfiCiu1DNRt9vSjaUbkD7f6Hb6oKLNygyouVFNtUyw8raYGlOlIAxwWR kBi1t8bFlQ3QgSzqj26jc+xEEJ/1Bc4W9QJ17Y6TerfxFx0jo+m4x8LlWkCoJKwkS1Hj Pan3AxZLfNJ9ygeGj80pY3o+aaRkgdPwfmwAXKiEmK8VCQ1YqF11ZhaxjULO34Ym55Ip st2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q+WAK4u2; 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 h190sor4452403pfc.21.2019.01.10.09.34.28 for (Google Transport Security); Thu, 10 Jan 2019 09:34:28 -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=Q+WAK4u2; 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=cmarbxwYg7HNoDTmchA0P0EFmwoGgD4g+3dBXR4lJyQ=; b=Q+WAK4u2sbyObQm/Ez2TxH+W+8fap0fCd+IsfJUIyFepCOkdFBVbxas3hfiwHd7fR0 LFFEZ96yuVyQE96noa3qbc/FxnhWnk6B76LyErUvkQY/aML86SvSiTkv6dzuudDYFBBq VYr+lM6NGifueQ+na4tm4ldvuF6xnHSQd1zOY= 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=cmarbxwYg7HNoDTmchA0P0EFmwoGgD4g+3dBXR4lJyQ=; b=m+aIOdDX2+lkLSTDqnOP3fG7+SIs0F1EmuQzehsrD43OdjfuIiuN+A9HoWzqlcVJ/Z GkexPJ0q2GhcJWuEZOBosH8YGdcaDLfc8px5oCt+ZVAvq4j+SpaAZueZPx+2SLf81TyK 05Ni9SwvaTNsBDN8w9UP400hd/rCWYj7sDeTTfr6607PvvBRDT7A8CfhUMFd+XJoMJYG /QF81jfWNWARmBMfY3l6j0rPAU6qujLZf/lQNDMxkgBm3Dhk4D1cIbGCL5tkQEQv/aHF pQNrnDWWG9VOEUxATAUlkNTgqt64yLrXnnnrtP3c5Ui1joux+yYLZht6uPDmq8SAp5SZ jgoA== X-Gm-Message-State: AJcUukf+K7H2JBKDIhSrfaU8UUBiTzUCpuSunkXVwxNievQvfBJdWz4V sYiJRw9qFsrLN1YcOSYdIYIrBavo X-Google-Smtp-Source: ALg8bN7jM1miZVLKVI4ica31RWzk6lss0oL87SAW4AXMcr/zMoA1fw86+xhkL8YjSp4vkQd8KyHDQA== X-Received: by 2002:a62:399b:: with SMTP id u27mr11482003pfj.181.1547141668168; Thu, 10 Jan 2019 09:34:28 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 09:34:27 -0800 (PST) From: John Stultz To: lkml Cc: Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , Wei Xu , Rob Herring , Mark Rutland , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, John Stultz Subject: [PATCH 8/8 v3] arm64: dts: hi3660: Fixup unofficial dma-min-chan to hisi-dma-avail-chan Date: Thu, 10 Jan 2019 09:34:12 -0800 Message-Id: <1547141652-8660-9-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> A undocumented and unimplemented binding got into the hi3660 dtsi, and this switches that binding to the now documented one. Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: Wei Xu Cc: Rob Herring Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Signed-off-by: John Stultz --- v3: Renamed to hisi-dma-avail-chan --- arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index 77a7135..472c370a3d 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -560,7 +560,7 @@ #dma-cells = <1>; dma-channels = <16>; dma-requests = <32>; - dma-min-chan = <1>; + hisi-dma-avail-chan = <0xfffe>; interrupts = ; clocks = <&crg_ctrl HI3660_CLK_GATE_DMAC>; dma-no-cci;