From patchwork Thu Jan 24 20:24:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 156509 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2398908jaa; Thu, 24 Jan 2019 12:24:29 -0800 (PST) X-Received: by 2002:a63:c503:: with SMTP id f3mr7066203pgd.431.1548361469609; Thu, 24 Jan 2019 12:24:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548361469; cv=none; d=google.com; s=arc-20160816; b=nuBvSmhrnJqRLabFZErIjYPEklowfeQAwuvamTLuIgkK/Dbetn9MQcJq/rkXpU75Cd XvQQGjuDpEq640/KgxcpL8umPmqCIsV75noFJFEkN1Sa4gMNdCw8YyuOdHMCodQV45Zm dadJBOGx7go+mVUroXbqr16DJyGXeh+1AlctQFjkMlwiDQ/MhImsdWWsCIRgeP1jsDif QZE6ABKTwGYUjPX7i0KKG7M30zbmLKTPKNdnOFYJdingzqtEQZ6rRiFILayXPS+aretZ UQ1k9pk+qNdKvZkSrawBOc8ElB23zNyGwJljGI4tJYpVg9QU6RrGSy0xIW7IOwCHMGbh W5Hw== 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=GeyXvvqE5bL0aSA9R8EemEtHWRM9NeMogHgyU1Syf0k=; b=OHjp7GFHeh6Mc3ErKeNzmtQgWg1StPMG0Ggqkr+MXnT1BFn/UgaW6Ioh/bjFgwG0Do B/pPWbR1dVgHsZ1uMw+0v5j3Uhih/sZm46SIxABNNGLcvKngUAu3T+6p5JSYVAqcT+qE qflcgEyDrZ1Ln6bcuL3NhUCUwzOSQtDrJ+BRKbspGDdpM9voZWcZlbN2rfhCWgYFo9rw Knb7kryPxFj7XmW4LoDCdoQV9hfa0zo76ZYE1+6ae+ZtzveoiuAP6TyhtLo7VqQ/uAe1 oi2Y/AE75UXM5JCdK3UEIJxBh6FcaTw+L90nLbYcwL48Hy7zAXhaGPFxOq6bUR9sFgmA fJYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M+JlmOmc; 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 u10sor34833975pgr.25.2019.01.24.12.24.29 for (Google Transport Security); Thu, 24 Jan 2019 12:24:29 -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=M+JlmOmc; 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=GeyXvvqE5bL0aSA9R8EemEtHWRM9NeMogHgyU1Syf0k=; b=M+JlmOmc/LnkQBrk4zKEhWNdWoEU/Y4v7cFdtCULVGF/PF+QLG6SjoR4oA242dO2lE 8NmbqHtI5r2F26kbPhfl8N+t6z+XdYKw0dJHh07nUFhG9tuWYri5BwXufyknfnmepDeZ SfoIOhi8F9QOMjjQ/mW6ti8dkkfaMt8ghnBKA= 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=GeyXvvqE5bL0aSA9R8EemEtHWRM9NeMogHgyU1Syf0k=; b=mB49rx/Sw25A0GY2GZo30SczYAVovuRy5+SlznxfwRtbnZxV+GIa7xbzuLqZTnsmm2 ko3ZjZfrPJ/6tkMckjxQo1BE+NPzzH017qphlBz0lLPo6UEm5hE7byotH96aeU8qFAa+ szxqV8mNbrf0N3JuJindUr5psCy5h/OSvGYmFVvS8tUIUpan8B4R8UFdBYRu+3PRcvpW pNRrXzE6JHbfNpRw2c3vueS7OuiTFmanrke6Cvi4EPYiE7Ciw/AUeowDuDmdKpw23D1K aO6h+MhwNSyK0WYPsL+V1DsNzpbVFmXEUlOH9tkpYK4g5WHoScsw5X1PWXdgxmC7dNvz noww== X-Gm-Message-State: AJcUukc8BYTLd6p0oQtseEGCy8eZYHhUbxoWkdCmXd78l6J13LtqrGrx 0Qgne6HxDUXrP3A3rU7rbG3mFuf1 X-Google-Smtp-Source: ALg8bN7NxmW28CzSxr6mGZRUoeI1PmncF62x7Fww9Iwj3aqVoVxshnaJdTYreDMlYDrtwB+sU4OC6A== X-Received: by 2002:a63:9041:: with SMTP id a62mr7112274pge.163.1548361469145; Thu, 24 Jan 2019 12:24:29 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 12:24:28 -0800 (PST) From: John Stultz To: lkml Cc: Youlin Wang , Vinod Koul , Rob Herring , Mark Rutland , Zhuangluan Su , Tanglei Han , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, John Stultz Subject: [PATCH 1/8 v5] Documentation: bindings: k3dma: Extend the k3dma driver binding to support hisi-asp Date: Thu, 24 Jan 2019 12:24:16 -0800 Message-Id: <1548361463-28372-2-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: 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 Reviewed-by: Rob Herring 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 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 24 20:24:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 156510 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2398943jaa; Thu, 24 Jan 2019 12:24:31 -0800 (PST) X-Received: by 2002:a62:3006:: with SMTP id w6mr8062444pfw.258.1548361471610; Thu, 24 Jan 2019 12:24:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548361471; cv=none; d=google.com; s=arc-20160816; b=BJ3GPUQuxqwRIy0ivXEbMRwtnhgtd17cd2KSoDRxnjxlAjfeJXAhCb9A5HGD9LJUPY ZVlhS/KWMCRA54IwA2+Us5mvy8FOg0XHfKV1JEqbIAlziE9Gca4K43CiWn4O5Iu1YC3i Fajb9u+PzKfLyeQD7MvPgrI8uKx2HNBI6GSqAPFTqZINl7xAV9RigkEG6CTw+PmNY37N F2FrsqsyEU1SYY3eWrOBVEgnBmh8qMX/bHjRS104QWX0SI01NU/ed+4k3ZplUIJ2f1+J aSa0O5W09JV5W7nxS1pXuLSxuy/SJb/nIsNwrA57kG0AcD2+WXhYbLzyvNIX6TZ7WJrI Pc4w== 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=eg4nAxAXcXkNuIrbMcRJ+fzvQseMFVGhfj9rOi7KduU=; b=jlUNA7ql0yLlotjSjtsIoZ5flUzsDQ43w2743pPJqqN2qiXWqSOx0DmX76wkMgZ1ET 8+zIigQXiaBa7KWLhFSawA20rSRRwTTPtQIswfOJIcnhD9cqJuo6wjHRctxqNGpRgI1+ NcD5W6m8hKfJxy5p8t7XBBphkyVT45cm6auwHBH0PWQjU8zczbVqRS6US8asD2HLoBNO WcuPLZDBe+EEKHMIXn5UhSwiCudh7bPOz/bN26qznfSY7j80ziS/+G5ZnDJ8sIYy4VhY vNOIJTZq91Jx72lcGlj9j3nBZyYlEgUZH8Zk6n7yPR32kl9Kd+UASJNTTPwhPtu6h4rh NNYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jSn5gDEI; 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 u23sor33017648pfi.65.2019.01.24.12.24.31 for (Google Transport Security); Thu, 24 Jan 2019 12:24:31 -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=jSn5gDEI; 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=eg4nAxAXcXkNuIrbMcRJ+fzvQseMFVGhfj9rOi7KduU=; b=jSn5gDEIAVqq/AsVfDWAu0cGimFUSBivUdA0jPLdipy5yoRP9CWxJzi1zQ59dvybAW jvjR+VnSVekOGEjqOUEWyqo0R1j4cCywBZ6FW2ye97UtP6Boq3i2a/UOzdAx7SU3BsB0 Gwf6ETiR4Mwx3orGx63y00EwLkMdPy5sceqXg= 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=eg4nAxAXcXkNuIrbMcRJ+fzvQseMFVGhfj9rOi7KduU=; b=jn2eOiHFWiUgDBy3cbKJO2emSxAejl2TKQFYlNbmotJruNEbbGGyndZaOSzKCW5Wga orjaZWi4Oq2m6T37kIe09H0qda0RTedqUy9sE8LslTyX+MMMDwyFanyxMR1q2I0wdq/3 Otngs2cp5E35ptZFJCenIeKtVlEpFe9Uo0iO8iStEEjw3pE0P21UuKIl549jgclEtwlp gE/mI+6vYnbe4v9sYv/rCmyzL03dC1q5hEfqrQFLLC1DVhdzJAeupwdJnqS3Ao4PSf3B d/5LJvTyRvxLmaQbY9Zku2A0mcU6dvP1/0JlC0zUTW/luCuYw6O2PCZK6TeVfx4LiALK xx7A== X-Gm-Message-State: AJcUukfwl9nLX2SMzWIHExGwagGFg7+hf5HEOIjWQ+YNeygLhd91b5/Q 5gqT8Qj4sRfOA9i3DyOKXtvldhHY X-Google-Smtp-Source: ALg8bN7WMfoTVni+wJrJRkqP8mH/wMyNUMBD9xBmHZIeZSxIsBVF3ZVCZzEcn9jiM+sY2nBzMuKDwQ== X-Received: by 2002:a62:a209:: with SMTP id m9mr8111866pff.218.1548361471229; Thu, 24 Jan 2019 12:24:31 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 12:24:30 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Vinod Koul , Rob Herring , Mark Rutland , Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 2/8 v5] Documentation: bindings: dma: Add binding for dma-channel-mask Date: Thu, 24 Jan 2019 12:24:17 -0800 Message-Id: <1548361463-28372-3-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> 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. This follows the pre-existing bcm,dma-channel-mask binding. 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 Reviewed-by: Rob Herring Signed-off-by: John Stultz --- v3: Renamed to hisi-dma-avail-chan v4: Reworked to generic dma-channel-mask --- Documentation/devicetree/bindings/dma/dma.txt | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4 diff --git a/Documentation/devicetree/bindings/dma/dma.txt b/Documentation/devicetree/bindings/dma/dma.txt index 6312fb0..eeb4e4d 100644 --- a/Documentation/devicetree/bindings/dma/dma.txt +++ b/Documentation/devicetree/bindings/dma/dma.txt @@ -16,6 +16,9 @@ Optional properties: - dma-channels: Number of DMA channels supported by the controller. - dma-requests: Number of DMA request signals supported by the controller. +- dma-channel-mask: Bitmask of available DMA channels in ascending order + that are not reserved by firmware and are available to + the kernel. i.e. first channel corresponds to LSB. Example: @@ -29,6 +32,7 @@ Example: #dma-cells = <1>; dma-channels = <32>; dma-requests = <127>; + dma-channel-mask = <0xfffe> }; * DMA router From patchwork Thu Jan 24 20:24:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 156511 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2398963jaa; Thu, 24 Jan 2019 12:24:33 -0800 (PST) X-Received: by 2002:a62:8add:: with SMTP id o90mr7904460pfk.210.1548361473092; Thu, 24 Jan 2019 12:24:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548361473; cv=none; d=google.com; s=arc-20160816; b=HGkGGLiF7RW+r7aVSUohDsavgswKdID7yyW7mjAfndQS9HPQT278XoUrbMIeuhz2Mw SZU+17zqACzZ6+NPyr7SdTwLtyn4bth3XJsz0+eYit4L/n4SlViqxP9LIOkzPmfHqU2D AfmWsF/TFCVrNA9ttsjFUk8cc2LVY5TLvfrG88tLcUyEyy5Gk4HU9k8KBXm1BPRM3lWH FIlpLQj53Lb0wkyi/bHX3rQMu3l2gtMj8Z1x6PWkAUj7o+koNIsRkEIk1yXumklIcsCz aKKykF+hDXqfG0msyUei8nPaqhyLDbNXJtVfqx++5tJv9dVx+2lf+wOlUEPQWGTQbAJZ lCUQ== 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=o7egLywBx6XayJjOoobZHgYLmJpcGqlES3T4nO9IJnw=; b=1H/0Xn+CcG40KmpCZFgN3/m3sGRkOoz8QlQ8ASRe66PcqHV6hlFKjcLEyXek3Vh1p9 bz+gZym13nivfUZJtKwndpY5yf3H5fZnDMNHpDWS96LcM7jbqBRN0f9YVEhQ0m2PKA22 +17v7ImmdwwHBz5qxLnZ1LXOzkMVzVUc1TTLjo8EkDVqMMR92eWkr82b0XIclQRcgVnt m2YkgdbXNRHlTC6ObASVV03YGo5SeihYnKPrQq4bH02Xjsu+kd9J1jLGUi5n1KWLkDDB Hg/P8yBvGGumjFEDj3lC0Z04R2FMmBaY7R9QeItsbsOui3OCRFmlh2Nvcp4usKMqhp5i gC9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="GxEUF/mC"; 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 n87sor33034272pfh.64.2019.01.24.12.24.33 for (Google Transport Security); Thu, 24 Jan 2019 12:24:33 -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="GxEUF/mC"; 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=o7egLywBx6XayJjOoobZHgYLmJpcGqlES3T4nO9IJnw=; b=GxEUF/mCUMVCKT5nzmeUCxVm0VYUy9eNpqskIkS+Ymqzu6rlYMnNnx6ysfuz8yhG6g /qTNwLKnIGjTKKckr3GAHNMQmOPuWddFvEB6uNTbUKkckKoVDl97luVlxizEpcBc+VNK uvQP8h7F+J13oqa9Hn0FWHDLmqf06SIcl1ujo= 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=o7egLywBx6XayJjOoobZHgYLmJpcGqlES3T4nO9IJnw=; b=rEU2plSgxbrUaDvk070UIisBHyBDdwBWPmj1WbjiiMPbjYlRR19q2BGsNWCW50GTO5 NCO3hOOOF4XyWJCUweFmHX0rVKzyZ/0veDYYzznVFyYaN28HMi724VDeq4WZyHhV/AeF bm++DpAbRCLHUrMHRvYkeNCZCqxe1LSmGrXDO34wmFxq1NbakZiGjW3lJU4m73PFapLe BkJ2z7HFQX4MshQNj4/L4MPGFoFMU5an796h/N9bjwI+8ijsPexJijrDgm0x1oVtjMtT 00jKTTpPHHpNg7noA8v8iq8xw7wzeDVrxm6GO3O6ZpVfoMKMJSmy42aB2FrlcReVphIk iiJA== X-Gm-Message-State: AJcUukfhHi/va05HVcpWol47FQeRdb2aWFIvkM26pSHu9eoNpEo0V+YR 1+iAQOyKWn7WMyJ7aUFhPK4XYzM1 X-Google-Smtp-Source: ALg8bN7PsIT7vScnvB02yRzQ1C4AY/iarOWVLV7Hm8+12JLqAvfUTagRnFwiEFOt0Qn7FXOgI+Odkg== X-Received: by 2002:a62:2f06:: with SMTP id v6mr8067333pfv.216.1548361472700; Thu, 24 Jan 2019 12:24:32 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 12:24:31 -0800 (PST) From: John Stultz To: lkml Cc: Youlin Wang , Dan Williams , Vinod Koul , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, Tanglei Han , John Stultz Subject: [PATCH 3/8 v5] dma: k3dma: Upgrade k3dma driver to support hisi_asp_dma hardware Date: Thu, 24 Jan 2019 12:24:18 -0800 Message-Id: <1548361463-28372-4-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: Youlin Wang On the hi3660 hardware there are two (at least) DMA controllers, the DMA-P (Peripheral 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 v5: * Typo, whitespace fixes. Use BIT() macro. --- drivers/dma/k3dma.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index fdec2b6..4dce532 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -116,6 +116,14 @@ struct k3_dma_dev { unsigned int irq; }; + +#define K3_FLAG_NOCLK BIT(1) + +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 +798,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 +831,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 +845,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 +861,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 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); } From patchwork Thu Jan 24 20:24:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 156513 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2399026jaa; Thu, 24 Jan 2019 12:24:36 -0800 (PST) X-Received: by 2002:a17:902:20c6:: with SMTP id v6mr8062069plg.156.1548361476456; Thu, 24 Jan 2019 12:24:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548361476; cv=none; d=google.com; s=arc-20160816; b=pjdd3HIBVi26HNoAYWWf36moIU2OwqsnpB3Fzi1xmsUKcjpBoz7+96m79EkuFh5NWQ AziA/ufx6/y9ZtlFn2gaxBhDJKBke61YH0PkK7iMkjh6DXYk0Vp5jSx7eD+acWurx0uD tXRiwA8Yp1ug9Ufi8+T+fBptg/Lt3TW1ZTw+xr76QtWwUiznjfsCRdUaSzO2l6UdAT/Z b8j8DCUGNCILM+Np3txkpUho3Q9bIxyvwrIul4D7j4QtsAQ6dT9IQXSZx3+tiCECcvvv CLQBJv+6Z81NwvQ7PYu1UzsQQXxVMzh3QG2+taMaamPTyMBfUQ3t3SvmI+d6RqIRGN7h DZ7w== 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=B0f8amiCLjyli23I/W3zmD+C1Sb7tBAJSig2UQnjOwY=; b=h9yaGhsjFR1UF5eIQVMZS5n7gnVUGM8EtWzbOvNaAUXRFN2EJlmsBdWqLxEdvojf3C 7tGA5AqNLE1G9gztWl5m0cbNzleXSDDjfTbfIOy9+lEHSnAqAPOia1eEeb6oDcvHSr1L sN1j550arXl8iR8MKKWP2m5i3o4H1mGWFEVI0qv1+9m1bcpH5omMr0YE/qB7wxD3ZDfE s2YyDCmD4wMH0146Op3+4kSCdsBGCe+PR3OA61UvN5NbjP4+3RIpo4VlFImQd9vxNWzu +V4hWUdp6bZ85feVPoCs+1M5bG2kdtajwT0jxAP7g3Hi7lgpwCU/Qxep4Xc9K33yuYGR Je8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gB0ZszgY; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id c84sor33867590pfe.49.2019.01.24.12.24.36 for (Google Transport Security); Thu, 24 Jan 2019 12:24:36 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gB0ZszgY; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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=B0f8amiCLjyli23I/W3zmD+C1Sb7tBAJSig2UQnjOwY=; b=gB0ZszgYj5x8jhbNMvIZcXlWOR1JWYlYbwLDXLU4cskG8A97BO+WzW5FZ7LelxxtIR /p9ppRHWPpPWeC7jJJchOrVJqwJeE5+0SNOZHKWFIhtk9f3n3LxW8P0LvcwdNZRXaKgo lzFu6Rf+aPTnZtMhPUudVyz8KKbzuabo5P2GQ= 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=B0f8amiCLjyli23I/W3zmD+C1Sb7tBAJSig2UQnjOwY=; b=rSDsECOyQvvPTY/UNynuB6EWg92yaKoz3aq2xriwhibV09UHcnCg/O94+vCZc+DhL0 h6g7/2BssUaEQi32uhTFODTPlEYGEYidXfMbApNTfl8+o+JN6rktvuXz5ve0mQQh3NFg QzvDIPdBffuzmBKPS1VTwJ931SYScgTaAdmgU33tV0TyqB+A0ajnlwmmg3IoZMjAT4MT cFwEdZeeun/YzQbR5t+w3w4Hu6kEZT3PZxzBQDIDToYT0jxBtcYu7cxxClY52rvCr9UR nb5DwagGZORjWX7eOKtmqiBaROHIOaIZsqDcvf7Pv/IWMJ2biaX+1SKGCI8/3RxA6eaW nbYQ== X-Gm-Message-State: AJcUuke/qEJ8L4M+tYP4gjuZoY3R3142qly+thmU+K7KUZsV9hkNzqQq 3HQRIUMmeFBSIGfK1MbhnrcGsDhB X-Google-Smtp-Source: ALg8bN4Dwb3JzI5lW/2vt0Yp5oNUZHY8h6sdUI1wJTzstKxnpgqTE9glCXrxX130Sm4sTN55K9ANxw== X-Received: by 2002:a62:de06:: with SMTP id h6mr8198941pfg.158.1548361476070; Thu, 24 Jan 2019 12:24:36 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 12:24:35 -0800 (PST) From: John Stultz To: lkml Cc: Li Yu , Dan Williams , Vinod Koul , Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , Guodong Xu , dmaengine@vger.kernel.org, John Stultz Subject: [PATCH 5/8 v5] dma: k3dma: Add support for dma-channel-mask Date: Thu, 24 Jan 2019 12:24:20 -0800 Message-Id: <1548361463-28372-6-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 Add dma-channel-mask 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 v4: Rename to dma-channel-mask v5: Use BIT(i) instead of (1<chan_pending */ spin_lock_irq(&d->lock); for (pch = 0; pch < d->dma_channels; pch++) { + if (!(d->dma_channel_mask & (1<phy[pch]; if (p->vchan == NULL && !list_empty(&d->chan_pending)) { @@ -336,6 +340,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_channel_mask & (1<phy[pch]; c = p->vchan; @@ -856,6 +863,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, + "dma-channel-mask", &d->dma_channel_mask); + if (ret) { + dev_warn(&op->dev, + "dma-channel-mask doesn't exist, considering all as available.\n"); + d->dma_channel_mask = (u32)~0UL; + } } if (!(soc_data->flags & K3_FLAG_NOCLK)) { @@ -887,8 +901,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_channel_mask & BIT(i))) + continue; + p = &d->phy[i]; p->idx = i; p->base = d->base + i * 0x40; } From patchwork Thu Jan 24 20:24:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 156514 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2399055jaa; Thu, 24 Jan 2019 12:24:37 -0800 (PST) X-Received: by 2002:a63:451a:: with SMTP id s26mr7401874pga.150.1548361477846; Thu, 24 Jan 2019 12:24:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548361477; cv=none; d=google.com; s=arc-20160816; b=YxRy5bhiRThbPSya44njkffsjkdxph3lKyCG8xI7TLnSVTFUc/SYshU/MZd7sB76Dp yuShHW+caaLUV17gDdsoJ/RrG/yaHGcqrYRAxUQsslBfYssiubWxtcZrQWL+YbovgwcV kAHkyH9fT203bPL8gI08WwP1zZUa+xnMe3P3ukfh8EPE30S1lnUsHm4GPu7Ez4Ck7LHY 1vEFt8w7j8EACmLs8XVUzKMUE3eAxKehTGyl7lBMvbnf6Zkh1fs4UUbTG2TZ7WNWojAq 4ifhHfzXaqBWWGBN7yktwgATTIwEQFZ9DBPCcoXeYNTz3s6Sm4L5HPUmocFqv9w6zzgF nrhQ== 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=o5vW46nrjFVoZsnMcgT1mEReDdf43fF1J2psQEiWFOU=; b=fRMvyr0rB1AZatCjQ5TdOYccO4X0LeZvgvfxb9FzvluBrEaDBljuDm5U0pyEbDN8+i F6VmdphSlqhAJMkL2jJZ2UHIeyNzzEvbZtlQdnzSHcjcJSH/9bocK39R90coY390W5Tx enYGlygH3KwQ2sMdQCDLlvCXRMYJpSA8zHGXSsnK5HKmAgiPHwRt1a7DH8lg53egzftG /6H2wr+1Dmyx9IAQ7uWNpaOTGKTsUoQMYqKkJ1YzWmXNV9WCrUePfS0u79WcDyJUcEio Gdj0r7GC0HU4HzC+JS44EZ/oqZi4DXBmF9FgCwKD1wvqSI5pvCR53bWXFALdjNQQYNAw GtKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SzoX7d+H; 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 z1sor12454938pfl.9.2019.01.24.12.24.37 for (Google Transport Security); Thu, 24 Jan 2019 12:24:37 -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=SzoX7d+H; 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=o5vW46nrjFVoZsnMcgT1mEReDdf43fF1J2psQEiWFOU=; b=SzoX7d+HKT5NucVKzZ22vuD4IMyi0BUeNEq+nZsXxgjwCVzKVfDBPnrJjg9VIXt4FV ESbJQqmYfE47OwYqfFizlKN95G5CdKqjuagakR0MmwNaLmoQCmTUvHdmuWZS+VbPhetq hQUngAFjUQ7/6Zm468Hmlhpzg7Q3xIUJTjHrg= 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=o5vW46nrjFVoZsnMcgT1mEReDdf43fF1J2psQEiWFOU=; b=oRamkndp62HPk4BoxA1ZPfl5vEIV/7VW+bIbDnHoD46InKIcpwxnRZEWyXvJyEkGPN HV3YiHUdZmXwyVTA9/VjgtZ2LPBksvHcsijjEXkYqTYtYkYJTz6bzIkQZe+COeqd48GA Ay3OJiR/hcisQSOkqVNrEi23PEps+xQZ4QxZK5DPY+1pXLi9I8Sj+AkKsqHHG32xvTJ9 Y+u5HMlxqn48zVwIyhQ0qp4H2qzl7JpVBJpjDvqcBfmwOqTne4DfKpMs3/BqWGvcefcU OvRZoNo3UTCllpsdUiwyoomOOZE2GEbL/bUL18c9S9pblHMBKtZHIck2Lz+qhtOxxIqf jd5Q== X-Gm-Message-State: AJcUukduSa3pGvqplZ86KTBqJHiMDDZB08IH7RhoRPBVkzQvqaHzt4EV /vTAyi4oLYKBn6rRUFg+e7isykH8 X-Google-Smtp-Source: ALg8bN53AUnDLmlfA5CanT+1yUS8gKuszSeTS3DYr7MsI/bOcmzSj4lSCbjz6YablM37qmPTUwrN5Q== X-Received: by 2002:a62:37c3:: with SMTP id e186mr8138281pfa.251.1548361477400; Thu, 24 Jan 2019 12:24:37 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 12:24:36 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , Wei Xu , Rob Herring , Mark Rutland , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 6/8 v5] arm64: dts: hi3660: Add dma to uart nodes Date: Thu, 24 Jan 2019 12:24:21 -0800 Message-Id: <1548361463-28372-7-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> 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 Acked-by: Manivannan Sadhasivam 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 24 20:24:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 156515 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2399084jaa; Thu, 24 Jan 2019 12:24:39 -0800 (PST) X-Received: by 2002:a62:6f88:: with SMTP id k130mr7943071pfc.234.1548361479389; Thu, 24 Jan 2019 12:24:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548361479; cv=none; d=google.com; s=arc-20160816; b=szDhjc/6hjcPY9bUBv005K5RoSoa1zS6vDJr9eXsxXTj96kWLoPl7TSyZgHVX0RlA7 BmCUzdCeetdJh9EvvnZvAk6RjlWdzVsKxjPNZAugGLv1sMAhugQOGZBrNGwRReG66orH YGUhSPur/sxni10YXgxY4tVqrTk08x0TN6RYU0Ctdd+8dAiv953hjPWOt4NiRl7gcU6l dWeEqA7Ohs8iZ/I67CDZaf25m9aOc/Jew6Tpe1hv6eDG2kjHqzobyha2QbKFlYszIUMV 2hML1EZJOi15b3Ei7fbG7mICw6zIpa2d3ex4tz+11lxa10xTROg1O1n0kq4cC7ejaNMQ jkcA== 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=XuUcGcXcO7tRjR2fjehR1L2tb6ym7xYPLbvuO7O3lECHCX6W9hQ2yj7E/ws56AWABA E+f8joClRpdSti8hPAtXbLgx7wsTVj/IIQPeYmBc06+Cr3WAV0dHhNJhxKzwJ4/AmYwH ihkcwM9djMiDH45fO8Zm+20v5tRVNo0rdFzOQP5dhAMU7jx63qeIPiH3FbxbDIhITXhB m2oBY9HAG4BbM/lHKLAuzx0HzKNsQiweoGj/ntF3GNpF05qNF5cIuMsLB3BTz8s4SdrE QKUk/gTnGDYG1m6nufI6TfV9xfx0TZjUQhw5+2i7OJm+q2+tIS0KICqu0G5a5egyadBC 0kMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GBVgzAGe; 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 r2sor34002197pgv.24.2019.01.24.12.24.39 for (Google Transport Security); Thu, 24 Jan 2019 12:24: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=GBVgzAGe; 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=GBVgzAGeXK+Rhr1uP35wQOeRalFHWCi6YOovZ9EHhbjKLg4yxkKXqnqtApf0Y5S3H9 b4H4CAPIayf6QvJmzrs55RsV5o8EGOhnulQipxJQbllKeAijXxj1I8a68SNWkSFK/gRT R8QtLPrvRqGYp6FmqxxigMenl9z2kGBksziag= 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=eUGYE6H6QpPrv+/1aUdo/DUo1S6zsQaMzGzBXBvOi/xAKL4HeozAG25JY82+e8+zW8 s686ViYA9elpKWjY0fD5aWZUflbtd9YFAXVWgZ9Nqv+wLAX3p6snNxBmEcQGEibjDpdL +azWqtSrxi51cZLAqkT+5K6IEhFvfYeCfxyFkHbkOVFH7kadYWAoWHNEMLqOFvRF6XQ5 70CueL5zDaA4DFhbc2CNC8hDiu0EoFJ1kpl611li8Oi1ojVFc3Xm3xoTyOMh/6efTOwl qLYUlYQ7r6t8Zp+7VY9Dt/YEscMSHmLuJqotqzJd8ea23qcLwSR1shOudFSGM35DiGAM 50eQ== X-Gm-Message-State: AJcUukc88lvo5YgHcSkJJYl6aFpQ1xWPXXcezIFXymHHAJ9bGu50cDri 1LpQkekDhA1m7kqCE0kl3HAUIKgO X-Google-Smtp-Source: ALg8bN6A6yCdAMBKYtld1GZx43O5sg0gUviTrnslHfiYH9eOjxyBo3E/puHb2tby2efvI4cQdIGP+w== X-Received: by 2002:a63:6ac5:: with SMTP id f188mr7369721pgc.165.1548361478990; Thu, 24 Jan 2019 12:24:38 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 12:24:38 -0800 (PST) From: John Stultz To: lkml Cc: Youlin Wang , 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 7/8 v5] arm64: dts: hi3660: Add hisi asp dma device Date: Thu, 24 Jan 2019 12:24:22 -0800 Message-Id: <1548361463-28372-8-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: 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 24 20:24:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 156516 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2399114jaa; Thu, 24 Jan 2019 12:24:40 -0800 (PST) X-Received: by 2002:a62:de06:: with SMTP id h6mr8199206pfg.158.1548361480934; Thu, 24 Jan 2019 12:24:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548361480; cv=none; d=google.com; s=arc-20160816; b=uvSFJND9jAWRbDBy2unLtdo4S0FeS97nQVkcQokU9ETg6oEbqvGHGCV7cNzXywSrRM QmUGw5qTq+Lo8Ln3d/DB2aeVhqr9V+ze4Q11Zd1xu2kQJmznSLw9410LRN7nnZYJZ1o4 XhXgAXOPdjU/2v3pb0RLjQrOwLYsJVDVctb7Vtj5xY0E1gfbg4M6tsMMQmn5ER3cc6CZ qouoxLyjtD5J1MNcHrBiJNdzvCMUmLsv4+nbCytvht3wy0PuUaYHLe+3Qnu0aMNHzgir BRqfC7H6y5qYGnzIiosHVdkGjgR3S7h93UbPC44JEYpyQjo8EhHrxmBLpCxERfeIXkdD v+Pw== 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=zv1p7S/mFrTg6FG0oPOD5Dt1Uya0EvieWRYCNbiH1Ds=; b=aKG2mTMHE52f++O9l0BuFrhbie1WpZVgwdFuDS/wZcanaFeS4bKF4Ldg5zFKc9LzUF vPgPQlDK4Q7CYt1Oes3eyJxwRLQHnkCPrbVZr/G6vwYRjjs2s9uF1vMoeOKEW3eUhRut hVauZkngo1gefNu+sLiXn6svEH3t2GrsHdQRmKnwN0ZBDDe9S4rL+LiRqnkKspSfrs8d 71nsPkEQmwD4hr58ez7Pw/osTPiFc3gOX20cExauoulruyovvfwjIRAQwt+NxQOfDBKl pdjkJIH0ELFm8Gz/IALdJJSNDJm1aan1oOunzIKl4W54UeRPSRJ+3Ig22IctKs+UNrdk L65A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dGm2Ozq5; 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 b36sor35780304pgl.8.2019.01.24.12.24.40 for (Google Transport Security); Thu, 24 Jan 2019 12:24:40 -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=dGm2Ozq5; 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=zv1p7S/mFrTg6FG0oPOD5Dt1Uya0EvieWRYCNbiH1Ds=; b=dGm2Ozq5crp8+eZBR16Xeq//kci+lmx85Knj9jwZD4b+AHP0VpEYFz0Takk7S5Iaqy Wfq+Kpf2etqcgQ16ATmrRPKcvbtm3KUm88Gvh3qP9JL+N7OeSefxoPObqKJziK+HvHoT qhcVqvcIfwfAAdLAO1uHUSBFmdIEQAEXYuYNU= 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=zv1p7S/mFrTg6FG0oPOD5Dt1Uya0EvieWRYCNbiH1Ds=; b=h/3RGPH8CKg1h3U6BbP/Lw7HuzC+fhkc8TPVX1YVsl1Xgk6ziwY4oUII8tuVfz8eoz biQWMougVDuWwWp8viJNb7WjtKtnjGc4S8vELccHPORPipeTnOfFAVSafXJnVEjqWLhd 6geVURJxN+1cYFoeokfY3QuwUrrDCx/SAVqYOSWskhWeLEUdUES3G0PCskXfaeIqsIuj nxw3bCSXdghsynKNl6aacE8VZq9m54KJM7QDfjOZ1wcNZCLqaEtAcSaaX2LdESkvXvdG KXGQnCDpcrufp59kXHpaYkxEMnwcK2Jp+Pz5QYV0jhPbEf2MfEax22acU4M85WsTti9p kZzw== X-Gm-Message-State: AJcUukcsUnNv8W6dztcO2dlb02Fqj1pA6zaLE/p1vmgrEKl3mSYxo/bt 22I8dM+ZTn9U10RMAuhLuxW3e/KyAOKU2sXr X-Google-Smtp-Source: ALg8bN4BK6Qul4gBOxPwsPa1bw2asGXGLk8N0wxFWhdu3ikDvvh2cqu12xyZ67ramgXwQ6tNjk7GZg== X-Received: by 2002:a63:63c2:: with SMTP id x185mr7236745pgb.374.1548361480562; Thu, 24 Jan 2019 12:24:40 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 12:24:39 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , Wei Xu , Rob Herring , Mark Rutland , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 8/8 v5] arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-channel-mask Date: Thu, 24 Jan 2019 12:24:23 -0800 Message-Id: <1548361463-28372-9-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> 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 v4: Renamed to dma-channel-mask --- 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..8e48f42 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>; + dma-channel-mask = <0xfffe>; interrupts = ; clocks = <&crg_ctrl HI3660_CLK_GATE_DMAC>; dma-no-cci;