From patchwork Wed Jan 16 17:10: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: 155730 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp901376jaa; Wed, 16 Jan 2019 09:10:44 -0800 (PST) X-Received: by 2002:a62:46d0:: with SMTP id o77mr10880774pfi.172.1547658644583; Wed, 16 Jan 2019 09:10:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547658644; cv=none; d=google.com; s=arc-20160816; b=ayFdvtG/pRa21RYarKik37oze0hn/N/zoz+EiFXHJcgsSWM72Bm2dmCdoN0QNnYvIB nytwYFAn7U5V7nxmAQAloHYHROjTL1zAuKB/xCmFc4i8Ruyxgnqo36MzFQS3p96I6Zzi KkgFd4YQG1yrzkj9jhNOflKZi8Kls1E2xoXqzv176Ij90LqjEHbPdWRr5zlO+YNPHCq4 iGXrlZKh2noDaGLUZ3Y9BQSpVWQt40WFV/pHz5YbSsisN01JCYSy1j6gyy6H4SAAIy7G X6bMfwJjlUNxkd708keJly95bWgV0FuXSkWojdrL64xX1IdN8EQ+5glgBjuVRTeFVUT/ DRdw== 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=Xo2WXi7i6TvxdlZj8bj6MX3C5KDDHtyhVH81FvthVoCqEXzrd1jD3RjHtiZNHGmqG1 Q9LHUiNP1Eslgm+EcvnvVbBGa6uEz39vHwAXthqIr4sNjTJvjLdQWbRmMJ55JhMMuwpa 88VtxN2n4gx+iwW+3CxpncieMBkVHgpdUcaSGnHGPTMc2UB1cw6SVrbk84Wmm8RT1XYM PLdH6jHjevuQh9PyoIU7wfcvUUiz/mM4PoAf2aOAso9Tf2L1O16RCl06y0fHOzc3cEdK yOyl0NmZifrq9byb3OezbR8oRuluv1Z/9cXXzdUKu1UvhODmOa2ovye0SrDcnhzDHUe6 6USA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a1kvmDhP; 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 p61sor10451581plb.41.2019.01.16.09.10.44 for (Google Transport Security); Wed, 16 Jan 2019 09:10:44 -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=a1kvmDhP; 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=a1kvmDhPW81K3f0m0+Jig4OKzRNMPLUeAoJTMJ2WPWBzPThKbtn8jU5zc1lbiCLGfZ hiQqYjxGREPP0RnDgfG3dOwVZbCs6jk+Zrpluqb6wYdTApVW8LF9PGUjUvMX1d3iXQBB g58DRO+VyOOrLNtoAIglBfC93/Y5Y3kvMmTAQ= 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=Cgpq4gTT8FLgpMeGFRWGD9lrLF19W5t/Q7172h18d2hW/4IdxahAGWHV6uWVkLzIoB wNpWF4324ZmFcyTXwT3+su+WMDJK5gNJmjxH0gmRcm66RhEriDF7Z1nV2/fWALaNHr98 m32ziz6WcemZ7SVQohjqbAm6q2XEWrzFPVPhiq00ciid3dT/h9PjYoWbWk75WCbcI11j xjmzr4k57b/nfGlJrBApbvXKhb5//wHG9KCzgjQjqgR+MGXpJma903Wu/YJttDFoWU3n FwhxJaFXsBIp5Celwj/2bX9urhWPMqMs8KKHMdJTwjgbteQg/nWUFFEOYr+d4g4Uhvcf aGhQ== X-Gm-Message-State: AJcUukdX1+2cblOdOGFG8jMjQwWZP/VQdw7DwIjxD4rIqe8PzG7ft9L7 +lt2XlbVu/VngD7/sXw2hG7pw5Sx X-Google-Smtp-Source: ALg8bN7nlqj4eb8HA/AK0fRhI7c6n2hui2RsCL9RXiebA/o/re4EvsYevFU9l+JTA3cM1IsKOrOgdQ== X-Received: by 2002:a17:902:66e6:: with SMTP id e93mr10678478plk.92.1547658644110; Wed, 16 Jan 2019 09:10:44 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id h129sm17914023pfb.110.2019.01.16.09.10.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 09:10:43 -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 v4] Documentation: bindings: k3dma: Extend the k3dma driver binding to support hisi-asp Date: Wed, 16 Jan 2019 09:10:22 -0800 Message-Id: <1547658629-25378-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> References: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> From: 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 Wed Jan 16 17:10: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: 155731 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp901422jaa; Wed, 16 Jan 2019 09:10:46 -0800 (PST) X-Received: by 2002:a65:64c8:: with SMTP id t8mr9713441pgv.31.1547658646549; Wed, 16 Jan 2019 09:10:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547658646; cv=none; d=google.com; s=arc-20160816; b=VMtV24KIFsJiWx8qmCflFyfmGSlV7p20n4GailmkvbS79akiV8Dz3kheAAEDjOiQWR X0Z2rGFDvyKEPjI73A3BcKuEc6c4FRdshJUrj0pfG2m1ExMjpqZ1I7chWCY05H8BxSU+ oskt3TDx1YBH0abd9ez5geas3i65bCTCUNP1+o1JhmVMjQIC+V8FZzRO5k3E1e82zzKO oMYu0Dds/raW2hK/triUVzFp6olmwxjxEnCabS7SSbyWKMeoMy0EPzBhy7m7AUzyK0VK 8NgFMz10G4qmTvUc1DSFBYdNQ4Ccz3YvEk17jidW3EnT+2Qf3zSNFJSWjc5foaqffBIZ WQwQ== 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=pJa/3xt1JMxzSbHyVab2zd3RhWbY439V9Orw9mFVXdA=; b=mIFF78J2J4VtFqh59K0ZWmia4iFmC1w93k8UJ5ObA8u57c37bi1s4I5tezF/3jdg8m NCHEU08jfHX7f8fa6ithxswXRjka0TtgI0MtqsfeAqaW3pP/v+q6ohzf/iyRBWciinmS OwVNQoL6u7WDM24hu+TLqYkU/fgfC1MeDAO7EpMjbXLGjFfeWMoonCSbXzDRwaKAOo18 ViH5O76p7itBCIlbUdaebW4GewoZoS/E9DFzNFF4WjDCwNWrjaEJJy0cJYH+cTZwdFcA UAtESQaQ11zqpsGqGfxy7h/Z4mF3P3bbjSJa03Xh8m1bzBrYywPE3kUjmSqO61Zbl6ZT iQ1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kOB1Q123; 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 33sor10208224pla.60.2019.01.16.09.10.46 for (Google Transport Security); Wed, 16 Jan 2019 09:10:46 -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=kOB1Q123; 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=pJa/3xt1JMxzSbHyVab2zd3RhWbY439V9Orw9mFVXdA=; b=kOB1Q123vSecSRTJ06CsqyBuW9/HImrhm3MqYY0doaB11TP2Dvk+npnTSqQsTfnRcW mTe1bbiGHRs4vn+edG0CtmnyPCzVa6hRASQjKRNBQD5vUqJzCSfGsxe7g9I+sZPV16Hd 3hEdg0wcrJKS+17GRjAwcC1qKLl6RGEh06c3I= 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=pJa/3xt1JMxzSbHyVab2zd3RhWbY439V9Orw9mFVXdA=; b=mJx+tFRjkImhgLmxxpup53Fzw9+QF69cwCj5b2vt+MzDZZ77ZSRLgr2peyQ3NU5mBz SR2NFrPw/Gw/AtyX7hvN/J5RvlN+QCBneWD1xPcKgFdH8HEubqo141eClww/2HSEgcqW ypM5P7x9X1z/w6VGMI5Quz8gGHuFJGZ75yfxlOjAyDygJEu0dBA3uNuO/wd4A+lA5Lzd PPcsmIdmQjAALAn++P+ymRVLWttvZV4wIVebjVKhGhRGt00PCIs7TzU8VV9KYGCOaMG/ ymxdsxiTw4hwTF7KLHeuX67lU8Trp8uLcM3W207fkb+w18V6MI63ImKNBXPHYlUg3AHl HY2w== X-Gm-Message-State: AJcUukcke91vd9Z1+mxj8PFg7+cewUFUL4zHT2EEEhT/yzBRy360b5Jh qzZgdSUfZyEmmp46DrA3A4ewUyqu X-Google-Smtp-Source: ALg8bN53UVr90AHvPfr8dtUoE+UjK3twxa1QIy9kliJAMjdXVHiYMuFJ2I9wblt0BFdSy8YMh/khfA== X-Received: by 2002:a17:902:2a0a:: with SMTP id i10mr10713001plb.323.1547658646183; Wed, 16 Jan 2019 09:10:46 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id h129sm17914023pfb.110.2019.01.16.09.10.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 09:10:44 -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 v4] Documentation: bindings: dma: Add binding for dma-channel-mask Date: Wed, 16 Jan 2019 09:10:23 -0800 Message-Id: <1547658629-25378-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> References: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> 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 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 Reviewed-by: Rob Herring 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 Wed Jan 16 17:10:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155732 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp901464jaa; Wed, 16 Jan 2019 09:10:48 -0800 (PST) X-Received: by 2002:a17:902:145:: with SMTP id 63mr10853571plb.256.1547658648301; Wed, 16 Jan 2019 09:10:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547658648; cv=none; d=google.com; s=arc-20160816; b=Pv96i7xeJym5nAoLFhvdKTrIkMja6nBIFcmfwskGo6ov3JKHY9aR9u5qroulNihdaw CiRr2DafK5EOdODAWvReqf3DbQVmktEbiqgWiixtADvPXmmrhgDSsNUwk2WtvKRtzrEw aQFFPnuMoEE3n0UY+gkAySdlSh0Pa0TJC/jomD5RdMsSfX/Caamz+W1QkKgON7TbA2fs y/yacDDyFHAdg500YxXSkGXuNUsyd9mb/ZWJGyX6UvEe1e0ARCfiGdgJD5M5VQt280C0 QX5OYYbxlT0eOHtjae2Y+TKhhIaBo/jmyRj+Ee4zm/BL51ucOKrrIw7xi/Oa5SLrBvWI 7qMw== 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=O50hQp2PXUx2sqLWtdp4LjOd1Q3aIAVc+x8vQ7yrkyonx8RzPLerO+icWD37NmK5Wh JC1GBSn1N9EaNBjIcHL6sLZgFdp+SzjFJ/a5hVaI+yW55ceO2/cJ4Qo9wiEQHbVedpE5 aoXxYFvV5qdQDIjQCavcVMnM3igMgP5XqLG6Trz4awvXuk3wnr8ngtErhYceb6C+Uz4b s1dHXnBAKUd5f+MTiGAoE9cMhWpQ21aUxKWBuVG2tUWwlfg3Uv9QSBzEovIgldlzaSqG NP+ImzIP7RnAVyidumPtAt/c+OooHXcVrrcXV9NurS+54FQVRltYp/NbTML70w4iv1PB aNsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QQqt5Z5O; 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 h66sor10226800plb.46.2019.01.16.09.10.48 for (Google Transport Security); Wed, 16 Jan 2019 09:10:48 -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=QQqt5Z5O; 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=QQqt5Z5O2H7oIxoZeFjry1ABrYrhostw7JbpxWIgLTZ0iJm5v1u6vgyoVQRF/gFQZy XUr0QR8FSQJpHCbnfwhBc9JkydtynTMfRMSxfmm1XmcvNJAjBkiafL1TgY1QW9+Q1zI4 RjlLe6zFaw2VWaD5afqIigf0LTzeHqw3J22Sc= 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=FoYq9S9XN3zC+iNkEMVYei3QtY7ZoZEWn8enrRyWSi28jPHpSXnJmsUPCOxz2fTduf qNh0/33V1h6V7UhQmMTVO+7QbvnD95UHgnWy4JjTUkm6mceByuaiftcO2XgkIS6h0qRa rlDMC2PvpPpFhUDgSlGLJHvNkK1Lxf9yxhQdeZc4JzmlYPqVcUvRtbfep6Ju/JwAUl31 s+scku3phLwafSEsZkIi10pPZv8JJ6Y20ZQC3K5jlYIFEnVtQbW+GTz91L5OR77aFKjM PQxkcQLJgMdQNDGzF/hvosdRPm4kvNzxkDwWw3s2jwj+uucy+J58rZHCu4WBawEFg5D3 y+qQ== X-Gm-Message-State: AJcUukdkDKpC2tOxrXJuMePSIATkSIInTLCCTWYJ50bFFYOf6pyRG9Je 7UKXwJmV7uaHmggR5ZoPH5t6q/o8 X-Google-Smtp-Source: ALg8bN6QSyhmNN8OYdpQj1WLhF4G3UWoQr/ZtLB71UxcnCH32cTAFCIaJYl+aidjgLEWGhmBZAzakA== X-Received: by 2002:a17:902:7687:: with SMTP id m7mr10780477pll.187.1547658647933; Wed, 16 Jan 2019 09:10:47 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id h129sm17914023pfb.110.2019.01.16.09.10.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 09:10:46 -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 v4] dma: k3dma: Upgrade k3dma driver to support hisi_asp_dma hardware Date: Wed, 16 Jan 2019 09:10:24 -0800 Message-Id: <1547658629-25378-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> References: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> From: 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 Wed Jan 16 17:10:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155733 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp901488jaa; Wed, 16 Jan 2019 09:10:50 -0800 (PST) X-Received: by 2002:a63:c051:: with SMTP id z17mr9599848pgi.20.1547658649973; Wed, 16 Jan 2019 09:10:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547658649; cv=none; d=google.com; s=arc-20160816; b=03USvL14+2vl/GfBDXZHlkF6HyGLlFc+RtjombQ5Xd6/VzbpMw/0897q0lI/zI132T e9C0HHBTONsnVBrwhd3U6UGkdQpsQtENBi1Hnkh7OZaxPLhTuIgSvj/y4hz78E/xvoGM UTINJtthHsQ4xTAf0KdaTzVIz5S6iTH6hzNYAK3V3ulRqZH/yiRwh2rCwM/xgrP0+4S/ YqHIQ9LEk5IT9xYWi12c7EmDal76DThBs/PZA7IuzXFTEVginQclM3PIluZ8u5O+Oqp7 zF2w7VzIEEGLjF7V6qN78m5quK6WDNXRA1am39jPMeFgooB/Ynddlgu1qQQH57JkTdxO jFog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9+fP/xi0ogaPcZ5aUHlMSoUJnZJ6VWVBpkuoagJMFKE=; b=OJHa5wzlqx/knbABIewgYzsl0j+9o++oI7YFvzXfRY7+IU30ZBCjGBIsoNUm9A+xRE yaHcyonMNMWrUApouJEijG+iIoSZlzFLX1j4TAQjqO2WfgEhEQbJGX0HHavo8LZyQ7rn D2xN+gbEVPCT4dJOYlYkhwYzktmht997mcKmSpCnwY2bFX7FbLSbnM2PO2hqHoG9u5Ff jfGBZV04lpb1lfYmXnqlcPWsz58vkRHsiuHapHb8XXmh5vHHAzoE+w/Crfw27x7samHd XqD/amx7fAwp0MBHt1Kc3bblzVv7+Gkkf/jdaNrIl+xmqAmCRSUC1dhuGKyBsOZzIbM5 FwOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z5fkpDZ4; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id v13sor10434026pgn.66.2019.01.16.09.10.49 for (Google Transport Security); Wed, 16 Jan 2019 09:10:49 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z5fkpDZ4; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9+fP/xi0ogaPcZ5aUHlMSoUJnZJ6VWVBpkuoagJMFKE=; b=Z5fkpDZ4b5JbyklHDHH6gvem0MfBvX4qsqUi4fVqQKQ59GG1s+jrR/2RKqFdnz+YXV DmvO0ufG1StGxto256QlzqATW/s2kUPVorRCbdtDYe6DmKla8ZAYIQ1+unFN7XIPwtSp j+QU9fVMf+fuEYtM3x8tICsMYiBne4i2Y6LmM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9+fP/xi0ogaPcZ5aUHlMSoUJnZJ6VWVBpkuoagJMFKE=; b=UqCgUBQ0joxuKWODBuVKdxaUF3RqcDxWDYLeCYw2Assm5+iCth3gi4a1WQebds+g5z N058cQIAlBRMJmL2y68nHHKHPb0knNJj4X+kY4uW7Z+ZrinzXySiNgv2w287e6c4Rkg/ bgp6RxxxDLf9XKGySuJb8b1QB/vyEvMr5HLk0pd6hkO9oR6kpTEBj7mJA87gSYvb3Xll oG7hQKyip87rR1hKhyC1+2JPBW1COAZn8tsJ1MvdSVHRQjohfNjq1h8AVEHXfPRzV5k6 1MdJa8fb5mhR1AM6Fb+5w0vJdfWn1JEJ44vKS9GDlK1j+4jH5/B53CjHiJ+j4XWby+QG Wb9A== X-Gm-Message-State: AJcUukcpkvEGMENfVYwP096Ru8+VwBpI3MNCAypSWa00YLTWqaqAdsxp V39Juv6XL3sw0ChJFtUPhEVH9by2 X-Google-Smtp-Source: ALg8bN5YTCRPAPyEAHSrDhwBPRWMDltlu7Lq7S/LJmFqSAi9sEsbGYN4AxKAA7scsUXo4VHpgGyqUQ== X-Received: by 2002:a63:9e19:: with SMTP id s25mr9779115pgd.203.1547658649609; Wed, 16 Jan 2019 09:10:49 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id h129sm17914023pfb.110.2019.01.16.09.10.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 09:10:48 -0800 (PST) From: John Stultz To: lkml Cc: Li Yu , Dan Williams , Vinod Koul , Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, Guodong Xu , John Stultz Subject: [PATCH 4/8 v4] dma: k3dma: Delete axi_config Date: Wed, 16 Jan 2019 09:10:25 -0800 Message-Id: <1547658629-25378-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> References: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> From: Li Yu Axi_config controls whether DMA resources can be accessed in non-secure mode, such as linux kernel. The register should be set by the bootloader stage and depends on the device. Thus, this patch removes axi_config from k3dma driver. Cc: Dan Williams Cc: Vinod Koul Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: dmaengine@vger.kernel.org Acked-by: Manivannan Sadhasivam Signed-off-by: Li Yu Signed-off-by: Guodong Xu [jstultz: Minor tweaks to commit message] Signed-off-by: John Stultz --- drivers/dma/k3dma.c | 3 --- 1 file changed, 3 deletions(-) -- 2.7.4 diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index df61406..b2060bf 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -52,8 +52,6 @@ #define CX_SRC 0x814 #define CX_DST 0x818 #define CX_CFG 0x81c -#define AXI_CFG 0x820 -#define AXI_CFG_DEFAULT 0x201201 #define CX_LLI_CHAIN_EN 0x2 #define CX_CFG_EN 0x1 @@ -168,7 +166,6 @@ static void k3_dma_set_desc(struct k3_dma_phy *phy, struct k3_desc_hw *hw) writel_relaxed(hw->count, phy->base + CX_CNT0); writel_relaxed(hw->saddr, phy->base + CX_SRC); writel_relaxed(hw->daddr, phy->base + CX_DST); - writel_relaxed(AXI_CFG_DEFAULT, phy->base + AXI_CFG); writel_relaxed(hw->config, phy->base + CX_CFG); } From patchwork Wed Jan 16 17:10:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155734 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp901519jaa; Wed, 16 Jan 2019 09:10:51 -0800 (PST) X-Received: by 2002:a63:6486:: with SMTP id y128mr9844972pgb.18.1547658651687; Wed, 16 Jan 2019 09:10:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547658651; cv=none; d=google.com; s=arc-20160816; b=UuK/793/AsQKfbGtr9UxRq98WL+Ysb275AHfa/vmYg2Nna4PysXW61LF9VUADiTgEn pq84rFKM0PXLEwOl5/wqrWFPt7DiD3usxFZ+KJFLGUvQ5SgAWel/kxkUsVAG0e6a8zKb 1QFSI2W/C3m3TP9rly3xVhZtrDW+KP1tL1apwWcYUvHcH6+ydGZDRheCSI36RKM65oX+ 0UUlUL0NlA02Y1MhylSqaY0dguXpvaPW5pj3vyGENl5RJo9gwK+wz2TyuE3gozJwCiJ2 yxFCO+Jsd4SlN9Z58Iwezay1gTvRfUy1k/+F74WO20A2AUu+Xylb5UAxFdIsmkrt5aee pRNg== 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=DtHgU4ueai0Fc/l8/P+ZyuzlLrZL8W/NSq8eqAtoCSo=; b=sm+Im796D238+Lkg2aaK5lQ1N8/FmBMf8Luh73bFquryOFGW8SOalVpfX/5is3WqpI ADAZXSHN9iNIoP5KTkIVHgcLoDk09C3Rg/1lfdq+vkjgtSWSJgLUIZLbdu4a2bk+jajx E2C8KK6lcw6j3t5hI19FCdDtPL2Lv3WQz2OLGqVrhMKjHl6Al12q3oExlQ3kiGrKqJn5 m/KgLeTT3mtpjBtkdkPRjf7tPBk0GWrEu+m4htbsqi9QzvwgYHOVWbM1m5XykrpyBVmW 90HZjE+I77Wir5wOOa6bgynA8+DMD/NffFzLdeD0SgkG/qOVT3lmwbCz5En97/NLOAuX 3Idg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvFTI9So; 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 75sor10183737pgc.15.2019.01.16.09.10.51 for (Google Transport Security); Wed, 16 Jan 2019 09:10:51 -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=QvFTI9So; 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=DtHgU4ueai0Fc/l8/P+ZyuzlLrZL8W/NSq8eqAtoCSo=; b=QvFTI9Sov4OjpoQNmN8XuMB6Qc8GaSkqLQW+gISNJvTIAnBPN82rZkr+wdjJV/bCL5 jxrPQwFaly2X0KEAA06y/qYYICNPyHWcZsBR3BjX1P2I9GrhYYxo2lUzkCP75vKRt4yy eyP3AVlhiIGL6g/kY5VRWVLzxTiMM/Tkb6MbA= 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=DtHgU4ueai0Fc/l8/P+ZyuzlLrZL8W/NSq8eqAtoCSo=; b=F+BjnkqQYSUNJrUp00FespAzx7EWkjsxiFzgFhJ3PPEkhRa2FyNZF4jlAfFAcvqYy2 Dc0TJegDpakGJqCYGCMINcZ9jD8x6BK8vr1IXLXPzwup29itviLwq5LqT1yNlWauRX07 Rqs3u0LKzKtEzqzltKWf5uQ6Yf11nYzBmFEqXDZsqoz3nQpAt2A7nOR1yKV8d9bcNbhg 7POjFZGvaynNB3XtFJW7AcSxOWiqw7JpXSzhQGEqEVaxOASnvbQeYywbc+UfbBArdL3h PR26ik2womY71ZbtzS0fsDPVx61AWK1bHv0Gn4rjbAL9SbqLbm6XIWJ1GRDBYXPHFErE giew== X-Gm-Message-State: AJcUukcYnSnU8tlVnK4Y6X4QyEbgqOqrhkVVFGd1URHSsYNRnvVHydJs KFJbhX+lMPoBUJqddt0c9cs0brW8 X-Google-Smtp-Source: ALg8bN4S7ttfBJzPlvyjL0k9V2t/idlYC93XsDxB2432OpFJUlF/tWYWMWKFi8QWac0fR6QhjF+sbw== X-Received: by 2002:a63:4948:: with SMTP id y8mr9820591pgk.32.1547658651293; Wed, 16 Jan 2019 09:10:51 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id h129sm17914023pfb.110.2019.01.16.09.10.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 09:10:50 -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 v4] dma: k3dma: Add support for dma-channel-mask Date: Wed, 16 Jan 2019 09:10:26 -0800 Message-Id: <1547658629-25378-6-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> References: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> From: Li Yu 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 --- 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..ed19b1f 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_channel_mask; 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_channel_mask & (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_channel_mask & (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, + "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)) { @@ -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_channel_mask & (1<phy[i]; p->idx = i; p->base = d->base + i * 0x40; } From patchwork Wed Jan 16 17:10:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155735 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp901562jaa; Wed, 16 Jan 2019 09:10:53 -0800 (PST) X-Received: by 2002:a62:35c7:: with SMTP id c190mr11137687pfa.76.1547658653385; Wed, 16 Jan 2019 09:10:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547658653; cv=none; d=google.com; s=arc-20160816; b=YQeuwOBGRt03TgkIcz15yeVjPbVRv6ROe2K1n7GkJ88VB2+B9BwnMmTt1C0MP6C8iI Q4Z6s1wWEb/Eat4j7kYmZ+4ZsFcF8dlxyG59qbhA2M5+5JXB70QZZA/yOJ86b7rvSCLp tGeRaQCCQT9jcKfsLfFWJuKvmTB3zlidqzKeWc8ZaiQOgiC7rRGvnHvlU/TiQQAfH4ZL fIUdexohi/20/Nuqy4hEE92fs+w2ROu0pysNgIBrKQpMcE26xGA1z2VPTUBk/o96P51x w71mmpzAzem+tutKyiEO81z26eoHk4ZYv7TIJ6NeYr8MHuu1lAe6o/1c00xfdyWRAtif 7/Wg== 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=cBGg77iAoZcdWmvPJrOiFDzU3ntstztgYH+1dSVZ+mtYmUu8kKrVITRaBoJ8eNoE05 heKeOalSM13WpdjnS98LSsSRtPXuP+ZNbG+O750eS0zRRWdBf+cUCUgGGQ42UwR0rFLt lvMkB6Ul2wI6ERv5jXu8FMOtkA1UuKAjsNmg/6dT4eg+hCI164c0b5vauFPt912tu5aM 82Cwa1/lnjUvJPxIkXpANMPAtqb6o5hC2Z91HReWaSk+zub/xSJCIpJBBVciugrehqry aud9kEDjdUUpv1m3GT/59n/CiCk6OLgzTdDygLPor955eWiTJ1cP/8HZalUbGxZEGOFP iCtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Dj8ru+ME; 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 z197sor10150488pgz.64.2019.01.16.09.10.53 for (Google Transport Security); Wed, 16 Jan 2019 09:10:53 -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=Dj8ru+ME; 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=Dj8ru+MEYPo4tIYVsrDVqkIrf1cIQBZ2oFpOezoKgoAZhqRVS4MmQeK7MoimqGteIE OR7a8kVItg+VLBeFL0IE1BJIooeRsU8nPKSnZhQuX5B9sQPJhFarSBzuFBW+MshDzTv0 hOYshhmO9RZWGECpU1KBIg1fQylyxfIhVbxmE= 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=eKA6Q0SRPwzsVgoO0tyniHWy+UvfQCaa5/ZpmiYGmf2eKcYcH9yDPjEVRVPtvfQn8M +Y2sv1nlBKF0wO7vDeuQPW2rxZV5WTGr1u1v/w6a4/WYgv1X4mw0sRJ82oPaJdYEwxWO b/h6HiZpiacZXzMXJRu+cotJ3A9jGdgCToW0svOk41QYGebzOXlq8biVw4rjIhBG6psd S02Munuoxtk5F2CzRgW9biueB0mEzJCrrlBgKfth9AMfIh+itPmsCfckp8SH/BCLKoqr z/lcNQt/XNODBRI1HeGX0Y51stM7ZOLlvjdkyufeju7u/3UDCGnOBWE1JSZnBD2OU+m+ WmwQ== X-Gm-Message-State: AJcUukcwBgGUwIG8Nzu9qW3N2f8Vd8A3QabWdl4Ch/uD6kokRE3hLUp2 Wjyh6+gr2MObSUQ+dgon3+YaSonL X-Google-Smtp-Source: ALg8bN4SVqtdFgywaEtwsZtiEDfEfNePPT7gtS4fYNcRbAXAnYzannt+cRDsjufd4ZnqC/tSaPG5gQ== X-Received: by 2002:a65:6417:: with SMTP id a23mr9838911pgv.236.1547658652983; Wed, 16 Jan 2019 09:10:52 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id h129sm17914023pfb.110.2019.01.16.09.10.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 09:10:52 -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 v4] arm64: dts: hi3660: Add dma to uart nodes Date: Wed, 16 Jan 2019 09:10:27 -0800 Message-Id: <1547658629-25378-7-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> References: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> 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 Wed Jan 16 17:10:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155736 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp901601jaa; Wed, 16 Jan 2019 09:10:55 -0800 (PST) X-Received: by 2002:a17:902:e28e:: with SMTP id cf14mr11012521plb.311.1547658655031; Wed, 16 Jan 2019 09:10:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547658655; cv=none; d=google.com; s=arc-20160816; b=NNOoXy6D1pTmY94OtjyiK8eAomIWrs0wrAqOIrMlnb4vEXBhvNgYsxg80i74Kbxv3u cBZvx20kzstikwWxP+YYiO5vyKEONUtAoYsTo0piQA2+vjYFhwWTet8AyXu0qgOUSK59 X1I09QJOnCcEQDYmxXH5Xc4hA9rmjGdTM9fG0FSVFBVTBZWHKwRjgH23NXyTn8f+0d0P Ddt7ZMkBoolBTbbqm4nBTgCL8OqSsVkDygKwF7UBelw2tmKu0TZ5JbozbgfCdLe87TJW dLEe3nZwiBDp7card+6vUiZZblaD4F84XxF8nwCekkZkbtQwfUDzXWQVucf5FwiJRS7v 8yBA== 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=ln9Qp7UAl2PV6NtWLFYVTYGgIM4ePcq+fOW5Uo9uHwTnup5UNpiyP7GG14dMf1Yelw QZ2AsgBPhuX2CwqCzg13+/q+Ks+gG9GhVciuW8T/2CEtRik7f3BV6kdoZ8v859m2bjtv /VoAPXgvKIAlvWpr1egt0UnLJxQFy299OjGxc7IOg6x2RzsN4oKKTKVDuqT+UPf1KL4F iMrApIvBBbeXVQcNoxhenf+cEpXD9zCOSRX7AG+Q5khGVWK5//V0JgAw3o+tuyb7jU+X 9zjBd/cBJGtH/sRnThNtP1B/DU1rptQMSyXj9T88SENDoyBmWdDNYz1xd/vMIAZLCXqs RqYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZC0NuQZt; 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 d13sor10396756pgi.71.2019.01.16.09.10.54 for (Google Transport Security); Wed, 16 Jan 2019 09:10:55 -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=ZC0NuQZt; 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=ZC0NuQZtzevm393jUDaHO6qpCP2McdL+j3pG8SHj8qOAQVS/1QG7Yt1qLhn4lYBfXv TKzUb569Z/TbPyWrXJEKtl1HiYCAGDjeZs1LTcyyVczGzmPMQWeyKmAKgJQuLB2CcEH6 chCzh0ahiDk1qZcywqatjLafUd5NmxNOjqCI4= 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=rus1Udlt3ru2FpMP1DnpA91rkg4K72t8qXZjsBSMIlt0pX+7/e9D+xD2bWnKgnFifR zxEp00FBlyl6/gmCL5XEdovzV8XOdGwdOALIPItMv4A/lVvK8fnb+QlyLB4k5Q1e/X15 M/XN6HTQJbr+5Ad0TMPjP+MqxUejf/4QlQxi5wf50EpznXZe3mIehKcdwu/Tv1qUT2HL aYwj+b1DceT26hJ5BlvDDbSWN0DgX51Us/a9dIzxhFRqajv2vQnDBVuH6+kZ0Df3H5fG QrTabJh+xj3ebWAMmZr7CQALKvQ8gGSC1RktL31G1BGbpniEzYiArjKBWyACNh44YSi/ AaGQ== X-Gm-Message-State: AJcUukcnENXMsDEz/pCopyWTq8vMJNEQUsuDPmC5dObPX7vGIBtKnLwY Mb7K/U0e9bDqpJfNeN6VBo629oGV X-Google-Smtp-Source: ALg8bN5Z3c0YGDemQldXlh6snVOzNjS1AbTnli+TC48ycW1IO7letruuW7PeFCTB7aymNst0sOA23Q== X-Received: by 2002:a63:160d:: with SMTP id w13mr9980661pgl.43.1547658654668; Wed, 16 Jan 2019 09:10:54 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id h129sm17914023pfb.110.2019.01.16.09.10.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 09:10:53 -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 v4] arm64: dts: hi3660: Add hisi asp dma device Date: Wed, 16 Jan 2019 09:10:28 -0800 Message-Id: <1547658629-25378-8-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> References: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> From: 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 Wed Jan 16 17:10:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 155737 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp901637jaa; Wed, 16 Jan 2019 09:10:56 -0800 (PST) X-Received: by 2002:a63:1321:: with SMTP id i33mr9943250pgl.380.1547658656628; Wed, 16 Jan 2019 09:10:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547658656; cv=none; d=google.com; s=arc-20160816; b=qpgWNaCTLNfmCwhmAajpKBHY7GXhK4YRTLeRAj5B2nK92qFRFA9t5ngtDzc8CgwPl9 cjypfmXINM8Feo310hj5fW7fvM+UXhUyc5yJlnayPYdSrKyxg/ly33eYcUrzPR0r3R+4 0Olul2pduNhJVTqhzmg7DlP4AqI+S8beFT+y2wpdNk/7GkX1M8shTnbabGejpTQ7HyNt +7nYEkhfinAVPrOYirLEq9YbfCLeH5O8W/6IAvLCmhRPLv7hHRgoSZNPudfyC4jio7YS OcmNBEqudV+LoJRbLa70k+ypYTt3RJvniPW7/cGTw5WvkU5gkLlhcfL/H200MZeoJzlU Y0dA== 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=ZvppFpulGCC5XLsPQD7LmK2gk6eulsu3HAaC1QWP4odB4c9ssf2dz+YNIimt03y7oO 9vXG3YlTETd1v989GuC0sbSy1bps+DRoCbmuPPsqQCCqDXEhL4ACaNnSzrpL0ZUWmM3K YW+K8vDYPc4XXjyv6fqS+fsdwmadHnMVwkFAwtTrZGwtxZRYP86X55AN7dQJVcS7RjVy 27oQ0MT7+fWCNKNWD3TY5PuQsya0tbGcTiqvpJlFPlZrevoaPW+kFkg3aEPShu2UBIFA nxEuGdpki8d5lCHMY7psHVmG6d2SSNCziPGotKocCo6DwXRRYK4oidWp3ME09WCRO/rL u2CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QA8zw9++; 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 w17sor10772935pga.2.2019.01.16.09.10.56 for (Google Transport Security); Wed, 16 Jan 2019 09:10:56 -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=QA8zw9++; 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=QA8zw9++8TaSkJyOW1+1y02JDAdzqu0K+B7mT7N+0Ct1Rt+8j+7NPvxiy+7Q/e5C5g IGNE6QHPW8is1aNGtcopNzRrWUsIeKkCB2OftthzCuf3eM4LRDyLMrdlW4dzHFcEhvgI JlgIpAGv4xtOWdySiMiyjPUYbdRXp9aHgRVqs= 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=YYY/+cEjZUf/jH2p/TRnLo1IkPM5KBHBwTfDD413DybuPoaXymJ97R9Jsh4CbUXB/I nbQ+Vftlj2PHtXaBjcJw/R3F2gWZsE2t6fVee3HYbeeP9tPiqoNrryPQl0wMasi1ojP+ v9yJpPIrcDwzQVSlsWa6KB6dt5QsoYdgWJdubwQZDgt5g6FZrQ4eyk19RsNBHrMb08Kb 4R+jJdxQWa7S80X4RdsWMXVtjgKROWU6SumXhn2+NE6LjLyM7ID7G0Qj//DzSFjg3OvJ xVbY3EVrYKCEBFjvdPwm3h9EF41j4+JUDdVgyrz1vxVYcVBMBifZDJuJ3pDFMEuOaChL Nrpw== X-Gm-Message-State: AJcUukf/DhyRDZSqwjjyykj3OmPVV5/kKm1iqOA9tcVyS6pI9kWFefP+ x4FYhSxSX9oQStvnibPKZkj5Thv9 X-Google-Smtp-Source: ALg8bN6yZzVWGRK5hPXdskoOAhCVDv/SGYjZR1jxNnlHFv0GS046diATiQm+voyIP4EEX8oRjCsjfQ== X-Received: by 2002:a63:2ac9:: with SMTP id q192mr9843070pgq.58.1547658656302; Wed, 16 Jan 2019 09:10:56 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id h129sm17914023pfb.110.2019.01.16.09.10.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 09:10:55 -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 v4] arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-channel-mask Date: Wed, 16 Jan 2019 09:10:29 -0800 Message-Id: <1547658629-25378-9-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> References: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> 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;