From patchwork Fri Jan 4 20:56: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: 154793 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1020847ljp; Fri, 4 Jan 2019 12:56:34 -0800 (PST) X-Received: by 2002:a63:3703:: with SMTP id e3mr2863322pga.348.1546635394643; Fri, 04 Jan 2019 12:56:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546635394; cv=none; d=google.com; s=arc-20160816; b=UVA/YR2kGUgWmz3sTtt+VCb2EGMTlQIoJ3K+aoPgQ+C/wnlG11BllbNvkmlg2WyH8T ZuBtP7WEQsL5MOPNivGZ5Xv0FJG1nTyn1xj3Au92AhkihRxiOtVsxC5bT2bKynEAMzfW xTuOAG5Kevc9C2yYLn8/pYWaU373r6kJoeE6rq5dEJcCj0Kgd2x0r9fYJD1mnKHeXCkk X33f02wzJgAww1hlZ0n+694yTb6bPedVqRz8y1tGF9qn4+Dr1UE1gZ4EC/2geH6RswnV g1BuhkPPy2aTwrqlIzrUY0Puv6+U9sEdoyNj6nCBSsQiFVMu8Xyb0iuexCqurRVOGRQk BJkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dcx6eEjMVOZ+Ig9EyGz6+bvTiD4bhQGrPgBuNC1183Y=; b=WuGMhYW1dzqEbtLYgUqKDpkjIvEpYKYyGGA8kAZ4EYpAhNcuIsLr8LPOPUAVVEZdnb sctc/UlDa5+4tIdMf3WAT1hl2IjBYOKnq+V7+kjj0+rAwrrMvyO3XHJdpzcYQUvthhc1 kWpHF/VW17D6/ZtBTVh4XydjRez4+9somuXPDV8Y3uYfjdV4p3N9eeHL8nG3Ob0OpYhe lwQhbGkVgk5ktjNUci8Hs2DRdIt2vAYmiILz0ZNP57wc7EOYIC9cjA7d7Q8hp6Qozc6n l7VZqH5kSl+G740VZLWBDz7iXmkldoxIj5CD8jKxYMcjmqCmmW2lUCU50gYJM23UoP6r x2DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QyNp01W3; 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 k11sor4899919pll.39.2019.01.04.12.56.34 for (Google Transport Security); Fri, 04 Jan 2019 12:56: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=QyNp01W3; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dcx6eEjMVOZ+Ig9EyGz6+bvTiD4bhQGrPgBuNC1183Y=; b=QyNp01W30Sy5XI75DuAswJ5UvdmabjG0XTJd4rPqawsXvGW005+IhRY54AuB8ZleOj kBhdRaq9ASBAaVco0dHzvzML8xDlc3IuqGbxfmiTnTGEaixsxzbZZn/XHFWmPUrIYbvz At1++r7g7tZLaTn6M+Lk6QOhwuh5u9MdKExWI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dcx6eEjMVOZ+Ig9EyGz6+bvTiD4bhQGrPgBuNC1183Y=; b=GHH8KZDhcO4bOIO+JBHpMWQ4vsrbKMAGmV2FsiTgx1bWr0gfRcfgov/SGik0nigI21 /lzqsF2iW8wnYog/WeJCbiwOB+3bAOTKvNnWdZIR5ZprOfwkm7V24Z4sdBUnW4Kvjj1m 9eYJBOsvl+zlet5zT2SWzgPwB0GdQuOXLyDgtm1y7BjvdG34pXcVMJACdK16oyh6BI8x YlTveWTyFAL3qblZPstdQ1NDT9lxM6KY+Q1DRjBRuLkQ+K5S5Db6SIuR0B1NwwoCuo95 kFd2Cco06U8RlIcQmbo4j7gRA3hrhlVHKrktj3vaaTtdS/GvKsV8K0zrCBuTAGaXWeGT myWg== X-Gm-Message-State: AJcUukf0ZJvNTwWon+fVAtGJnKM22lAvB4bZ8F6MWbKesrwPpgd0YOnu Lehz3nz6NHxKqeUCj6xJWa2dJ6Ic X-Google-Smtp-Source: ALg8bN4wqL57WWYm3AnmQvqkhOZ3jnmjhB9BABwrzFbSykpU654QuDYEozKo4bvxi7VNk5DltcPZ/A== X-Received: by 2002:a17:902:583:: with SMTP id f3mr53664973plf.202.1546635394099; Fri, 04 Jan 2019 12:56:34 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l3sm98058334pga.92.2019.01.04.12.56.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jan 2019 12:56:33 -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 v2] Documentation: bindings: k3dma: Extend the k3dma driver binding to support hisi-asp Date: Fri, 4 Jan 2019 12:56:21 -0800 Message-Id: <1546635388-13795-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> References: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> From: Youlin Wang Extend the k3dma driver binding to support hisi-asp hardware variants. Cc: Vinod Koul Cc: Rob Herring Cc: Mark Rutland Cc: Zhuangluan Su Cc: Tanglei Han Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: dmaengine@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: Youlin Wang Signed-off-by: Tanglei Han Signed-off-by: John Stultz --- v2: Simplify patch, removing extranious examples --- Documentation/devicetree/bindings/dma/k3dma.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.7.4 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 Fri Jan 4 20:56: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: 154794 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1020873ljp; Fri, 4 Jan 2019 12:56:36 -0800 (PST) X-Received: by 2002:a62:5c1:: with SMTP id 184mr53303846pff.165.1546635396476; Fri, 04 Jan 2019 12:56:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546635396; cv=none; d=google.com; s=arc-20160816; b=BrvAB24MHb4PbVKuayxTLiFQbdF02kS4tRWuHTqV3asc010ZiUNrkHclS8NWaA28U5 A+pUEDJqWBzgNw+RXR/YBpfVqIQGYxzwKzyGOIkJiFTKPk3E2Ah+lpZsPpNBX2dRL0Bi Sgu8WF/4eoJrDvWsj4e5S1CjAki14bBDiN0lX3FkMPmqTLSbnFM/dHTN3u+pdel7QK8c Pj9o9tIVCq14RDQ7J7qbsbEQLyaWzdhd4t7b49FGqFByPnAFLKGs8M57lYj67JZlUW7i VP7Xeko2PsEcZIPwM3oKBh1gbI2dNjUGyn6ofP1egnOyK2NBTSR7oZRFjkldGAB+K0p+ kwFg== 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=m/40e80Ep6rjyjDwykxJoS1RLKo9nvsjp+tokbpPYFM=; b=SpagDsGlK8wZ/40nLMUgYRprjiITH8bFpSWD85/iF7JZaaF23H/TuuEnrBYTVwpm1W dIJ4qd8liZCG20eCBJ53sTf2yR+35S4kR8n0PXx8pA4ULkR98DJ84Hsd6uaZOv1i6c5o LVt2Yam188Umo+kf5PKVi/uwr/Qmzo7BUP5P7Zyib5nzu+zSa+cVdYJ3nIGCCwfTIYMc TFsxjQJdKJCoHVlaytFg7rkJuFS1fwM9vuBCJ8YM7cDBN+6dM4fOn/2aQclwpa9LCidF Txvmul2g5KFOcZ0WpVdopgQ7W16tkdKDNieAG68+h7/aVdHomorLaS3vISUx5L99nB3a hcEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LBXRpivB; 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 v13sor28028928plo.4.2019.01.04.12.56.36 for (Google Transport Security); Fri, 04 Jan 2019 12:56:36 -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=LBXRpivB; 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=m/40e80Ep6rjyjDwykxJoS1RLKo9nvsjp+tokbpPYFM=; b=LBXRpivBXTJ8hv9TT23AvS5t0vZyW8WHfzVz7FAGNablhcZ3jYNskvWO7NP4e897WF K94qSyLpJASrD74iWKAtlj2YgbRyNuHw98Y0CtaClyQZQUuiHX/Ofc5A3Sre6qhb4s6D 0LW2AVd3Fm+rt34p3mJ0P4Yd4gRgL/qKFn5sc= 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=m/40e80Ep6rjyjDwykxJoS1RLKo9nvsjp+tokbpPYFM=; b=dtS8+6wUS50UrgybrZAX8SXl6t/FPY1W6DxD2VeRrZJCGhZ4Di+Jzv6UxlijjWZ4mf Wo411AxWXFxJ1dg37cl1x62rXsNfBCxqtCAqeCGlkpl0qFqMUODmamQYx5DyBbb2vV2G c5keu8KRHoRnIpIK9+Sw3wFDhGr6e3C9g0P+hbRb0xqf8QwnR3T5SI+j0850snhhMzS0 sKpBdQx58zC4yV3pOp5zasdl3HrV0hhO/KzFowDycTmdLjJHx8aQWHNrvBvMOWqOLDV6 ev7/EyCDgeFVwwovhmt5E3+wSgDncBlM6SrBNaIuq2THSneeDHP5wmiB1xO03lwDncJ8 T8zQ== X-Gm-Message-State: AJcUukfsmW6ihQ763SQfwtn/teuqcHetFo2YEIb76thAjrG3Zd7i9T2Q NtBcl3YUcLhxMkDJ9bVSk6uau80c X-Google-Smtp-Source: ALg8bN4FYH1Q5Q6VXHoi1tVBi7Wp4B3bTxmqGV2ooA93z8nbHiJzYxQyUIdPXrWu4QO7cusbDgs3zw== X-Received: by 2002:a17:902:96a:: with SMTP id 97mr50784814plm.45.1546635395922; Fri, 04 Jan 2019 12:56:35 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l3sm98058334pga.92.2019.01.04.12.56.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jan 2019 12:56:34 -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 v2] Documentation: bindings: k3dma: Add binding for dma-avail-chan Date: Fri, 4 Jan 2019 12:56:22 -0800 Message-Id: <1546635388-13795-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> References: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> Some dma channels can be reserved for secure mode or other hardware on the SoC, so provide a binding for a bitmask listing the available channels for the kernel to use. Cc: Vinod Koul Cc: Rob Herring Cc: Mark Rutland Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: dmaengine@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: John Stultz --- Documentation/devicetree/bindings/dma/k3dma.txt | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 diff --git a/Documentation/devicetree/bindings/dma/k3dma.txt b/Documentation/devicetree/bindings/dma/k3dma.txt index 10a2f15..1c466c1 100644 --- a/Documentation/devicetree/bindings/dma/k3dma.txt +++ b/Documentation/devicetree/bindings/dma/k3dma.txt @@ -14,6 +14,9 @@ Required properties: have specific request line - clocks: clock required +Optional properties: +- dma-avail-chan: Bitmask of available physical channels + Example: Controller: From patchwork Fri Jan 4 20:56: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: 154795 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1020894ljp; Fri, 4 Jan 2019 12:56:38 -0800 (PST) X-Received: by 2002:a62:7892:: with SMTP id t140mr53761783pfc.237.1546635398077; Fri, 04 Jan 2019 12:56:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546635398; cv=none; d=google.com; s=arc-20160816; b=E02Edl9Qnd8+TnW5VMHykh270+QQUQN/fmees/cK83yGsR+OzBb+JnoJbPYAKKiCsf S4+77AukUzEgIRvdrCE/vnP18VQS3l+/mT4HUKO/gKMVdUJHz5Mgn89Re6F6Ete43FAl WtacY0HLlIX+mUZBM+Pet+A7SLfIh5fEwiuTD+IhRbzRQgxz7/D+RB36+T1qQUJRQEjH qSk9jesH4w5UpJ/UqPmAExkkdiQBD5ROHRlvsGWCuFVBP+k6nFKOO4Z23rbYfCQCK44J w/wSdObBCu9WV/SqQisrk3GevZT9+r/rxgBdtgFgb3yUKXDyvKTKTXCuqwCx1Sbspeem AE8w== 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=7PoOlpFQPsMjakXihA1LLc08Bpkr7q8xCpQ3M2g6csg=; b=T72WfcvILg3013TyPDkf5J970hbZJ4qnaObd80cqTWXRycIwlqxvY4zQSeMDpIdW8P W65U8xFa/ZyKKWzrqRxv5uNtR38WGH+QY5GYOlfQqzpuj52rfES+MP45HyT2KABl9s6T tBJq60EkmdKxLQnLOgXyGJBR48ailb/yoh1L7GhDqIkm0YLEmrJIe7XCoSt5L43rzF2s 1t+z5t2DguNxxl6qLtJlpMbBwzajHpIH9/2dAmBNf5UlsysDR+oeaZo7fkYpNs+t8iKe aUSj57oLWhw+bloCFCyPI+00NSN388AJVXqG6rwKDKDzb3uFAdEp+CHOo4oLTFBouZ19 nf7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OPJpGAYS; 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 t7sor28095907plo.3.2019.01.04.12.56.37 for (Google Transport Security); Fri, 04 Jan 2019 12:56:38 -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=OPJpGAYS; 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=7PoOlpFQPsMjakXihA1LLc08Bpkr7q8xCpQ3M2g6csg=; b=OPJpGAYSmyme1wm2pNRYFlKfBrH/jBcgmLWLGhlShFq2CZVk/aZ0HTjiA7Iypf850I gc7dnajTLdoDGRTBkKLJEwILJOw+SCY9T52VBqurC7UPLYSytV2WZveFs3LzUwlANFCd 0Sx+eOlBCvjbduggdL8tnvgQ1P+s5k68N2NPA= 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=7PoOlpFQPsMjakXihA1LLc08Bpkr7q8xCpQ3M2g6csg=; b=adKGtWpBh4+xxXnXYzKsaF2Uym0JxA63h959BB8gyT8hIYzT9f/OKFc3DvqH6rAEyL msp2YdP36DOf8OB+vr+nh0XsG3hHfjYhi54bong4/faVMGfeXHI0ePQCytOPN+KgUdHn D6wN5TvbZLMjzD6O1TjTEVrqgDWO9uS+Lqa4EcoJWiZh5SJbStljmv5txhmNQ2wx+kox ifPw4M7l/2sutfZTgTBUCV6KaQEr8w2IQD9xKljjKJLB7Pv52X/A7nGVyykL7Bo8ioo9 FP4SJ3y4BjeYrqg6b5Y9ftA5Cu7NUOWeosbXPN+51LlHa75l6ZnvdmS/VGexOF+7yLap mBag== X-Gm-Message-State: AJcUukeTY93ByyA4dggNAjOvVxM6bnusBQvbnaGV0YCmePfhNEfiaWgg VQzBM6xjp0i8AuJ0sciNsSzQszZG X-Google-Smtp-Source: ALg8bN4bfl6pWNWbydF8wvNL7jKqslDcpZM8jK1Ofpx3+3pmhd1ZTgbsOyuKDh2o74j2jLYtZvtsTQ== X-Received: by 2002:a17:902:50e3:: with SMTP id c32mr52616262plj.318.1546635397174; Fri, 04 Jan 2019 12:56:37 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l3sm98058334pga.92.2019.01.04.12.56.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jan 2019 12:56:36 -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 v2] dma: k3dma: Upgrade k3dma driver to support hisi_asp_dma hardware Date: Fri, 4 Jan 2019 12:56:23 -0800 Message-Id: <1546635388-13795-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> References: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> From: Youlin Wang There is an new "hisi-pcm-asp-dma-1.0" device added in "arch/arm64/boot/dts/hisilicon/hi3660.dtsi". So we have to add a matching id in the driver file: .compatible = "hisilicon,hisi-pcm-asp-dma-1.0" And also hisi-pcm-asp dma device needs no setting to the 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 Signed-off-by: Youlin Wang Signed-off-by: Tanglei Han [jstultz: Reworked to use of_match_data] Signed-off-by: John Stultz --- v2: * Reworked to use of_match_data --- drivers/dma/k3dma.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) -- 2.7.4 Acked-by: Manivannan Sadhasivam 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 Fri Jan 4 20:56: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: 154796 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1020909ljp; Fri, 4 Jan 2019 12:56:39 -0800 (PST) X-Received: by 2002:a17:902:f082:: with SMTP id go2mr52309309plb.115.1546635399387; Fri, 04 Jan 2019 12:56:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546635399; cv=none; d=google.com; s=arc-20160816; b=hrIuEnZs3sM+81/SXMQXMhHgKQ/Ap3ZLqAsHRIxErAMRcwyY4gxi+aLnrn4phhFJF6 1bkxvoyHnPp478rJW+oj7OUQ0tpSeyLmHhyCt4nrhokzdpMVGJjFnqzlX+NMib6PD6Kt Se0o7q+kk9LDdM+u3pmeoOGoXwy6DF05+l+3AyfGotZwRx79Fpl7/x9md2ixYGVDmYeN dx9ba7PvJ8Ng5PAhOdTJW0C/rq2c5XBCt7yYzQOJ4iWYway1VeFKOnbzvZegN+6YJDrv H0RSGqmtR+BUstwRgZiOv6qOuNFBaUKZggXqgNZuhsizexh/mhSuSd/z4wo10TngKRvU tcGg== 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=jkv+KKhij9Erx9l7SBMC7LanjV56Iw/ajdYdzBZJLX8=; b=LOlx6e77FYYHzx2P2xQH+OEo5CupPbKcFfW9gcyLkUJrDfMxzPw32PZMGGV0T67eoi j9E18mQgFBr/WZzUip310hPe9QkqvEcgSG1GkbAZbpBDXjamMRzOTmU8gcCYrc72qDV+ sAeGSKkCuz+ap4oplk++PFBmTEjjUAxhC77K2qyMg/LDcCc+J7l5iprwwHrPoPrzgaCc v947cNKOM1Lj8DJVPEz5UTidZABAi7oWhACG8bCsf/fPUOylIvYKH96qwWOEWju2ZlgW Rq301wfncryRkjRSDAh9BqWLEPo2A59USkg+1tuldHcDMgKbfHB9JJ9U14Xvk7QkxUJb 7K5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="EqNw1S/f"; 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 a72sor28939055pge.21.2019.01.04.12.56.39 for (Google Transport Security); Fri, 04 Jan 2019 12:56: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="EqNw1S/f"; 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=jkv+KKhij9Erx9l7SBMC7LanjV56Iw/ajdYdzBZJLX8=; b=EqNw1S/fQaKgVv4J60j++aJJzgDL4dSEOTQvE5Zq3OmcQ5nshcdWlQL6oHlzla50wA y6hnyD+vhk8D1Yr5tq6+k2MQLwyD1qe5jxmnv4J9Z9ZL5GfJ+saygSHldfn13G0eH2t3 pqY003UzQYoJTQlMRykk/MmNFGsrAcwQOqueY= 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=jkv+KKhij9Erx9l7SBMC7LanjV56Iw/ajdYdzBZJLX8=; b=oWF39HHqCJrDcuQfa2KxLTpUTzePHg3aK+UZSV79DXytd/J1fk/TffC00vQxcdTlW0 fGOGt6RgmFoRrRYPCmEPHFZHYrjvNsl8x8QBA6wZJHP2CNu8+0orZ17+dNEcF3DjAWsg vrbiYI5lMxeYq+jty/VHcOITx3nQR+U8VQpXdGrtJPneZ1kzvSxKpRHZRm4L/zz87bRS l5yBcDMfhGA1a714NI3CSHaQgARaWLGe5bT7970hozDIN969eibacbt3y84fBCVx2jbR DqLlU1Kp0zlpmN9WQgNal27ET2tI5J7uqRL4pD+V3bIhDZgicgp+7VJLnD/IVb/xJbjn mRjg== X-Gm-Message-State: AJcUukcvScFmuOHJXg40czaORCgxRKanDKWgbkehbKQz5ictiMrX1wac wTqA6x5EaZnFZVm9C+s96Xgh1pyj X-Google-Smtp-Source: ALg8bN6HxDW9gGC8/qDPWUFCcBsGFAASOGUaQ4hqkmk0VglGMaTxj6/z77WLotjj8Kx+clYr98+RAA== X-Received: by 2002:a63:6a05:: with SMTP id f5mr49261866pgc.72.1546635398861; Fri, 04 Jan 2019 12:56:38 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l3sm98058334pga.92.2019.01.04.12.56.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jan 2019 12:56:37 -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 v2] dma: k3dma: Delete axi_config Date: Fri, 4 Jan 2019 12:56:24 -0800 Message-Id: <1546635388-13795-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> References: <1546635388-13795-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 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 Acked-by: Manivannan Sadhasivam 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 Fri Jan 4 20:56: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: 154797 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1020926ljp; Fri, 4 Jan 2019 12:56:41 -0800 (PST) X-Received: by 2002:a17:902:20c6:: with SMTP id v6mr52858122plg.156.1546635400979; Fri, 04 Jan 2019 12:56:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546635400; cv=none; d=google.com; s=arc-20160816; b=u0jY1/z7KFRrTMYHtAj6zINM/Gny9AC9kSHl7opTmhleicWUkhxhdKTOkjKb+BwDbd 1wBsm1BrT8jjQA3pryQ5gfTyxhWHzu6ttWIBkweTufSgWClIpLETB/QrLzmIp66WXnVH YA5Ye7plG/F6ceZB7lhBqsTcWsZ8BMJn1CLa8U5ilyET4ek63EyVnSRdgKLO7xkS2hDk ZCnnQV3l7d6GxOUnleatdm2GQ3O0rre2MWYxo3R90GP3knpPHj7RT3rmPBNymndXVeGV atHgz8k48f1y+P47TQkawxzQMUjF/1jOtx+UTTRBjes4Ci6gtSl2RbKyzT493Jz3MNWo Blnw== 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=4Vbeu6DpRnZCwP7K+9a0P9RRTER2t/Z433kGqekFBrY=; b=BC3+9LYEnW7BgyaBrMd6CrTc/nej1Kzk9gl+FjZvjRYNoyevI/3wJY/DApfjXcmIoO doFEILvKsEit4eZHZsGM2x4q5ET6aZ2waWNp7u6cMhzrd9dN8h1drLjvgKX2e5aDA3l1 47742KvTycaCrF4kwIBEr6Kaxz1oNEzbAobzWu6rMBKjQKFE7B9dTXsZx8StkqO1j6j6 zM0puo1p+vOmBoK9he8DABMaQGmCZ3HFhK4WdXWnLBmpLaxFlDMdtcHLOHcJQcigwc1B 2+YPpwB6uzquBKRaMQSjqMTmwrCPX4y4gimYE4z8FeS88g6j//clOXk3CViCXZuaVfTQ qSgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HrTCH0zz; 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 u69sor28795814pgd.63.2019.01.04.12.56.40 for (Google Transport Security); Fri, 04 Jan 2019 12:56: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=HrTCH0zz; 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=4Vbeu6DpRnZCwP7K+9a0P9RRTER2t/Z433kGqekFBrY=; b=HrTCH0zz+n6La7vqDvNKqVoi9EadZuIp9wKa9nVjaa+GZpAvVbNfqnKkXY2If1wD55 1JCUORAappLk7F/4W8yjdSB/nH7jiKjS2ewP51awR+I/LP5XTl8MveF/puXTPOWOjt9A 7yTjkkGp35GsgZKkNL78hh3FRXWa/08398Bgw= 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=4Vbeu6DpRnZCwP7K+9a0P9RRTER2t/Z433kGqekFBrY=; b=Ujwa0RPYYyYeRUt28uAemMB2OIPZYhPVzdjQD0NsEnRuukbOClW1BecNFhir+9M1vJ yn9gLzrm1obldkB3oJAXUqfzf6emg2FrVcFKnWBPVMO7RR4W8Yr7govJTlgWIRiwkwqQ FDZVI024CZcs3ufZdmfFdhUed65rl+iTRGFI59ZzPURBZxTFLvrrWbyhOf1XIT2F+i8A vAKXukfGTdDjtn5jM2usCkSj+5o/w6iv96NrdcNrLCjFT9nYjJ4vf3LhAuaUdAHiok4e 3uvu4WPbKYjY+6Oat1k+G64/b2aM2wroyOCGciYeLY5wzMZb8Cmy8kOFhYNsd10X3IY9 jQAw== X-Gm-Message-State: AJcUuke9w4N/hl1RpETpLS5p4Tba3G1N48DSK1KUSiD6ELHLI4wnfALH UUlxtzYgwBQS5t9v37SlMEngmYOl X-Google-Smtp-Source: ALg8bN7jekfTkokUDuAB0tR3PpbgapZjIX70zUYb4Eon0+Mzrw5OPpJfkJmPRNyXXAePaGZwsq6ReQ== X-Received: by 2002:a63:ee0e:: with SMTP id e14mr2835866pgi.8.1546635400454; Fri, 04 Jan 2019 12:56:40 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l3sm98058334pga.92.2019.01.04.12.56.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jan 2019 12:56:39 -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 v2] dma: k3dma: Add support to dma_avail_chan Date: Fri, 4 Jan 2019 12:56:25 -0800 Message-Id: <1546635388-13795-6-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> References: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> From: Li Yu dma_avail_chan as a property for k3dma, it defines available dma channels which a non-secure mode driver can use. One sample usage of this is in Hi3660 SoC. DMA channel 0 is reserved to lpm3, which is a coprocessor for power management. So as a result, any request in kernel (which runs on main processor and in non-secure mode) should start from at least channel 1. Cc: Dan Williams Cc: Vinod Koul Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: Guodong Xu Cc: dmaengine@vger.kernel.org Signed-off-by: Li Yu [jstultz: Reworked to use a channel mask] Signed-off-by: John Stultz --- 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..431094b 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -111,6 +111,7 @@ struct k3_dma_dev { struct dma_pool *pool; u32 dma_channels; u32 dma_requests; + u32 dma_avail_chan; unsigned int irq; }; @@ -318,6 +319,9 @@ static void k3_dma_tasklet(unsigned long arg) /* check new channel request in d->chan_pending */ spin_lock_irq(&d->lock); for (pch = 0; pch < d->dma_channels; pch++) { + if (!(d->dma_avail_chan & (1<phy[pch]; if (p->vchan == NULL && !list_empty(&d->chan_pending)) { @@ -335,6 +339,9 @@ static void k3_dma_tasklet(unsigned long arg) spin_unlock_irq(&d->lock); for (pch = 0; pch < d->dma_channels; pch++) { + if (!(d->dma_avail_chan & (1<phy[pch]; c = p->vchan; @@ -855,6 +862,13 @@ static int k3_dma_probe(struct platform_device *op) "dma-channels", &d->dma_channels); of_property_read_u32((&op->dev)->of_node, "dma-requests", &d->dma_requests); + ret = of_property_read_u32((&op->dev)->of_node, + "dma-avail-chan", &d->dma_avail_chan); + if (ret) { + dev_warn(&op->dev, + "dma-avail-chan doesn't exist, considering all as available.\n"); + d->dma_avail_chan = (u32)~0UL; + } } if (!(soc_data->flags & K3_FLAG_NOCLK)) { @@ -886,8 +900,12 @@ static int k3_dma_probe(struct platform_device *op) return -ENOMEM; for (i = 0; i < d->dma_channels; i++) { - struct k3_dma_phy *p = &d->phy[i]; + struct k3_dma_phy *p; + + if (!(d->dma_avail_chan & (1<phy[i]; p->idx = i; p->base = d->base + i * 0x40; } From patchwork Fri Jan 4 20:56: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: 154798 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1020948ljp; Fri, 4 Jan 2019 12:56:42 -0800 (PST) X-Received: by 2002:a63:8ac4:: with SMTP id y187mr2932316pgd.446.1546635402331; Fri, 04 Jan 2019 12:56:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546635402; cv=none; d=google.com; s=arc-20160816; b=wUeyh9xqx42gqDYDUyAIa5VOeAKCeE5x5f5tex+vvtXgKh4o0n9m1s0kszlSDCDA6n 8aWSjfR8Dx/bDLyrxqf+hpAOHu0BY/JFHQptjUeBd0SdMj+WNQ3MTcGfvRd69Z6PFbuo jX5isj0EqtyOPMqmz8z5bHBrUlZkq01qQCM+HWSoOHboSEYCQMX/5f2KT95pwT6MvSs+ KSUaDP5GT+1Xw0KXM0YHY1bxh8tBbgytceXElKkPnw+N/ZOCn1Ty5CRLnmCP4+fpIfNE dG1mFeTipgpOC0BZy7HQo5RFhZw9hEsDmuOuKiDkjBFFPMavupbK1p3kDht/My760KpK tKIQ== 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=mluqNjdniwZ3q2XPDP8Vknoki8jxvzTwERPto/u6ouE=; b=wDYdFYnkA4p5qBgYP4XdZjYOpf+a8+Aaiunu9g+HUHiU1kOWn/iUDsqUHxsAL4/KZG Q3h/8kVGLjKTY0K5D4oQ6uzroWV+uN1NNvYC7+gDpsUGD/r6QIE46OhVQH6fxbpQj+GZ +19wBZmUrxadPSoOVr1B9/9x3qp8bVMhtnDsaQCt1u4rWJkVUuhyzwCX4EhmwCgpwAgu Nx9IEU+t61U+RF2KB56bB0RT9vVVA85FDD5ZhZHo6d7tlTnWt7X1/6yNSCtbtouarj2f BVpy12wV++UIwvxBglq+P0JRsRvp8IDMSfBwbA0qZhDAL2XJsHA+PheTORranMB6R5Wh RaRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=frlkucFg; 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 s20sor28195174plr.50.2019.01.04.12.56.42 for (Google Transport Security); Fri, 04 Jan 2019 12:56:42 -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=frlkucFg; 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=mluqNjdniwZ3q2XPDP8Vknoki8jxvzTwERPto/u6ouE=; b=frlkucFgSDyPCcJoGsMZqxujSBZOIyBbj2XCLiPcRg7bt6kO771AWBDlDUGFeD0rkh 81EmKCrsKffmj1dweXs3hMTXkL5OjgZrf4jzmFB7MtHXFHw+KWKHfK3zqcygCuY+zgcb 5nZz+WmcIkdr/leRtM3W8d7OM+RWlUoer0yKM= 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=mluqNjdniwZ3q2XPDP8Vknoki8jxvzTwERPto/u6ouE=; b=OTGeUR3351t4gS2J6IvjzvgdZoZajRy1YwRDUqC32vYetfovB1IEsWhFMG1Jb1xyVg qRJ0MxkCbhQOksDEgu6CUhPrWj63BfeJ4UUKj1vGvFRJdOPUy0LVbmeVvX7SkJrBxyWO LqeuXXdrrp+MIxNQ3IF6UKLSc6uwS4oCKLgdlKvFSsWK3eQxleS649EjK9JWtbFVCfgr BjWrXl3BGZuEij134j5E4wQaoTs7vJPxtbhplCyAhuurJv/M2y5iT7FhDtzXMeUlFnx4 pF5adp4MuyIXZO4sm826Xy9h0cygjpMJbh8VGBgp1b/KxCKhPpv3DjSFXduZCNAQV3L1 mrzw== X-Gm-Message-State: AJcUukdU23gRBh5JF++otRhnwjUhxr10DlMrP1JJ28Pag6mRdtFHFD9t 64YhJYzvV4e7w+58Mo0Pk76lTKZ2 X-Google-Smtp-Source: ALg8bN4bL4w4QcgknFmkiBNFA6B6puJzkEHnraMgC9Ye8JaUYNerZTrs+G3mQQyoY/23D77yfTwd0A== X-Received: by 2002:a17:902:48:: with SMTP id 66mr50824829pla.68.1546635401791; Fri, 04 Jan 2019 12:56:41 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l3sm98058334pga.92.2019.01.04.12.56.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jan 2019 12:56:40 -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 v2] arm64: dts: hi3660: Add dma to uart nodes Date: Fri, 4 Jan 2019 12:56:26 -0800 Message-Id: <1546635388-13795-7-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> References: <1546635388-13795-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 --- 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 20ae40d..aaa2b04 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -466,6 +466,8 @@ compatible = "arm,pl011", "arm,primecell"; reg = <0x0 0xfdf02000 0x0 0x1000>; interrupts = ; + dma-names = "rx", "tx"; + dmas = <&dma0 0 &dma0 1>; clocks = <&crg_ctrl HI3660_CLK_MUX_UART0>, <&crg_ctrl HI3660_PCLK>; clock-names = "uartclk", "apb_pclk"; @@ -478,6 +480,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 +494,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 +520,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 +534,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 Fri Jan 4 20:56: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: 154799 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1020971ljp; Fri, 4 Jan 2019 12:56:44 -0800 (PST) X-Received: by 2002:a17:902:12b:: with SMTP id 40mr51302771plb.72.1546635403949; Fri, 04 Jan 2019 12:56:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546635403; cv=none; d=google.com; s=arc-20160816; b=GVaYUwX8Ezq+D+bh8JaGamT126lGygE0kJNIzyttR3AX9GVdIwlhNVOQ24qFb8QX/A YdlS13gSPsETvL7UMMPYSrnDP+dYa0xE3OERYiQn8aivPwrbHhj8N2jMYAFbzNtG0m7d PO9rU3pOG+rid/nD+MrOe9EgksmyvH1idWmQ/nxXvbS8G2Z9M5bELAZqt+ze4B5pTgrT l7WSM+at3tPoVaqUkBY6uzsGtx3B5fdt1HzqxIXuZH0JjnkL7cWPJo5c5HcR1G7Yd079 fEtBcarHuzl2mhV1bEzMldcC4sLYu4zV0wWQN7aI2w/VyZMwOv8LYIsJeBa2xF8jwaib Yaqg== 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=x8FLQ+g/7eCfd1VnKMng4eZMRIm7A0veiMcyJNgJ9zM=; b=j3ADYaAq9UYMy9/+B7g5wvaF/7gyTy0p+IeXH0mqlwjzWFKLL9Eig0Qg0/xUCAL+62 px/U9vfScXQupM7d6gsKs1+DEbHPwcsW+Q++/BB4oJYdDXPdsM85OvJZ6SithlEl69p7 wMVDBofdd66MhIiRU9eujqbJttJ19Ew+/lx1VbLoMV0JhbNKwzaSiw6vdrS6d/g662da 6ofxe4F8RaJqBrQToVYPE4PhIsJDO3yq2sPO0XLsP7n1I96mvRqaq/XwkK5WsHWsT3Wy 002AMp2I+FKQzxYHcGJL9sK6TGrEEz0+CjiOTlBHkxDc1qWgOQYT8YFe71ZnTOI5j4QY FA5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FplvEqJn; 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 a4sor28733845plm.47.2019.01.04.12.56.43 for (Google Transport Security); Fri, 04 Jan 2019 12:56:43 -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=FplvEqJn; 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=x8FLQ+g/7eCfd1VnKMng4eZMRIm7A0veiMcyJNgJ9zM=; b=FplvEqJn0/GhoTUK07SiH49OQp68tTWAGSKbl7VAyGPJk7zanN45ArCR3O3leEDbrv WCcNlwlqYl0bQO3X/K/DTgXkIcOr8uu03Sa3QPooUhaoLOQnBBKKBXjE+F+Q57s6TQj9 xHhgQoiP0kjYyMcc8y62SRf+HvNniKIA0zabE= 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=x8FLQ+g/7eCfd1VnKMng4eZMRIm7A0veiMcyJNgJ9zM=; b=UsHxPKuG+hT7nJGVYJxN6CA7AFWPl8RZGKhpxF1pcYS6bRgSEkeonkBnVfYkJw1xgJ wGMqk0blLJaRQ17aua/K6tOa8bD1oLyCvtgQtXcecbj8dtDYpvv87ggHoRPjusLnuAJL quQ5Z6W0bFo10QEUHl90Jq+2WbBzUY6FEXQV8xNiFMCrUvFso2BbDjbovetyzWLRv9ad vpx2nbojFtblnXRzZG6NQUJbDEz/A9O6xCsuhyspCMv22qBpIWlKf0gPr6WtTVh/hlVJ uZA8uegBKsAq5nIvwjXhikD6PChFETS40VR0ZwCEE+9CORswQMUGw8WpXvOdOQ4m4JkH mklQ== X-Gm-Message-State: AJcUukdYcIBphms0cKBuYnnSAAti048PmznL3nZHirBIO1+uHdhaGmh3 MSQZt6pFgdEUZfs82gw9hoEtOJpD X-Google-Smtp-Source: ALg8bN7ybpmqlKyfxFKQLyfVL7T+0oXkm3rFJgCaTiIMKOKiHEBeeKw0/TfjDCeMGdQXg6oV1C0Wmw== X-Received: by 2002:a17:902:6113:: with SMTP id t19mr50809853plj.248.1546635403461; Fri, 04 Jan 2019 12:56:43 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l3sm98058334pga.92.2019.01.04.12.56.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jan 2019 12:56:42 -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 v2] arm64: dts: hi3660: Add hisi asp dma device Date: Fri, 4 Jan 2019 12:56:27 -0800 Message-Id: <1546635388-13795-8-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> References: <1546635388-13795-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 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 aaa2b04..df4e96d 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -569,6 +569,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 Fri Jan 4 20:56: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: 154800 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1020988ljp; Fri, 4 Jan 2019 12:56:45 -0800 (PST) X-Received: by 2002:a62:11c7:: with SMTP id 68mr53416547pfr.21.1546635405778; Fri, 04 Jan 2019 12:56:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546635405; cv=none; d=google.com; s=arc-20160816; b=IudGoEhNae8gA3JhZGdl3k+efHmvflkvrjqjzm1ptrqTDxTRYozKUlw/NEWR1fLpzo WvJTzsHrjpdXo3677eaGbMW768pctjyLx0yJrTU6wLjkEQzle2RWpeJinn1E7sy49Qx0 NCFmAFSkQl7XmJ65P16TPssA47dwBgwBhvdYbXqcVswSSN4BJlfmKwPQCT20+1r2S6pQ jLuW8zEkI+FYP5uBnOOkL6xive9duPYNKFcLJ9ZlKHNb5v+uA+cTCibMHkhy3DXi5APr 2xg9Hot13+XsxSk/AHVJK9KdTsK4w8xEY1O3uFWtEtLyGKlDc8rX16/UxckrAnc5BZ8/ dtUA== 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=7aRBKK8TkteZislwEu46QTtOuuKaw2a3j4FrskRJKXE=; b=Gnqh8XcNQ0DjY1F4lcUaVko/iNDhpDnYaJj6OMl+vq3BQBE/Bxy+LV1sRDWMWumXGy eZcrv0eX0sb3DtmfQ9iardkwaGeWj+jx30yWoZ47W+rlz+ostooElpKi7fStokW2ZvdB tb1EKcnU48TrrUQd0pgVw+i6v83rRsKAi5hUS+etNqhMING1k6794QSdKhSOc/oEvpnE 7QT3ekxgDfp/dHQWGUZYmU74CVq67AoYAoMBSq7J5oFA6waR1QmQYUHya0dUSOY2Hsbg KESk7bFfBrd+xCIQkKK6k6dAXi6cndmKnQ/6zN36p8eFvoGejIaOdY+hxp4ZMZzzYXoY 4QJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BhfGSs8Q; 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 t18sor31189122pfi.23.2019.01.04.12.56.45 for (Google Transport Security); Fri, 04 Jan 2019 12:56:45 -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=BhfGSs8Q; 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=7aRBKK8TkteZislwEu46QTtOuuKaw2a3j4FrskRJKXE=; b=BhfGSs8Q+JnK1/4i/SeXnylWTDcT0KNKJ/9Mb53e/1HtR0+yVg/hx++HaE96mhbFc7 ZxXXnu1lY1XZilaLLBT+tRuOpGPmSxHQbPacJvd6ZkeAuXHELoJObsO+qEx8SXDrz5rV kunU2X0zlb2b0154uW0b821jyhSiMKNH5BVgk= 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=7aRBKK8TkteZislwEu46QTtOuuKaw2a3j4FrskRJKXE=; b=bAYcELIoC681AEKPJnyK2edh31clcRwfJhk42n4liB7fVh0RjaeEzGNLGe2NrX++hu 0q8QOs77e+pUznuWMTa1REgC178c76Tre5dl3sI6aCcTnNnZOU+e7fSppXNIzC1n0Wpc CTX3aIT4mR/5a5jGHDL6TyPG/VLaLOqqr/OTC7gvyO0g4PKLTLug7HFZ0KNFtsRGHNOX daMHbjjadshK4eoCPTVCoRjy4xtgmX/7lfmntBY6159glibb1t2TFvOaIrgOpOSNI3W7 0Dv8Gx7zuZPWu9hzmAcxV724Y1OFg72aMXKnHwWlDqpRwsx3ov2hVC76P2TI4Pt4qPLQ 17cg== X-Gm-Message-State: AJcUuke/5+CeFikz8c0sEhuhQgwo86jxbGotdG7qlSaHo8rgJtWfpCng 6l/jVM5gBKZiyS6YN3PqIWq0ZrUO X-Google-Smtp-Source: ALg8bN5DnREXTuhCejvjjJPX366oyQdEEZmAmGnw9cIxn64NWdFHd7pf1cXJD1YywBkIGWEPbzUuCw== X-Received: by 2002:a62:6cc9:: with SMTP id h192mr40561294pfc.223.1546635404934; Fri, 04 Jan 2019 12:56:44 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l3sm98058334pga.92.2019.01.04.12.56.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jan 2019 12:56:44 -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 v2] arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-avail-chan Date: Fri, 4 Jan 2019 12:56:28 -0800 Message-Id: <1546635388-13795-9-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546635388-13795-1-git-send-email-john.stultz@linaro.org> References: <1546635388-13795-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 --- 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 df4e96d..654da63 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -562,7 +562,7 @@ #dma-cells = <1>; dma-channels = <16>; dma-requests = <32>; - dma-min-chan = <1>; + dma-avail-chan = <0xfffe>; interrupts = ; clocks = <&crg_ctrl HI3660_CLK_GATE_DMAC>; dma-no-cci;