* [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960
@ 2019-01-24 20:24 John Stultz
2019-01-24 20:24 ` [PATCH 6/8 v5] arm64: dts: hi3660: Add dma to uart nodes John Stultz
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: John Stultz @ 2019-01-24 20:24 UTC (permalink / raw)
To: lkml
Cc: Mark Rutland, devicetree, Guodong Xu, Ryan Grachek,
Zhuangluan Su, Tanglei Han, Wei Xu, Vinod Koul, Rob Herring,
John Stultz, Manivannan Sadhasivam, dmaengine, Dan Williams,
linux-arm-kernel
This patch series is based on recent work by Tanglei Han, and
adds support for hi3660 SoCs as found on the HiKey960 board,
along with a few patches I've been carrying.
thanks
-john
New in v5:
* Minor typo fixes, minor rework to use BIT() macros
Cc: Tanglei Han <hantanglei@huawei.com>
Cc: Zhuangluan Su <suzhuangluan@hisilicon.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Vinod Koul <vkoul@kernel.org>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Guodong Xu <guodong.xu@linaro.org>
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: Ryan Grachek <ryan@edited.us>
CC: devicetree@vger.kernel.org
Cc: dmaengine@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
John Stultz (3):
Documentation: bindings: dma: Add binding for dma-channel-mask
arm64: dts: hi3660: Add dma to uart nodes
arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-channel-mask
Li Yu (2):
dma: k3dma: Delete axi_config
dma: k3dma: Add support for dma-channel-mask
Youlin Wang (3):
Documentation: bindings: k3dma: Extend the k3dma driver binding to
support hisi-asp
dma: k3dma: Upgrade k3dma driver to support hisi_asp_dma hardware
arm64: dts: hi3660: Add hisi asp dma device
Documentation/devicetree/bindings/dma/dma.txt | 4 ++
Documentation/devicetree/bindings/dma/k3dma.txt | 4 +-
arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 20 +++++++-
drivers/dma/k3dma.c | 61 +++++++++++++++++++++----
4 files changed, 78 insertions(+), 11 deletions(-)
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 6/8 v5] arm64: dts: hi3660: Add dma to uart nodes
2019-01-24 20:24 [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 John Stultz
@ 2019-01-24 20:24 ` John Stultz
2019-01-24 20:24 ` [PATCH 7/8 v5] arm64: dts: hi3660: Add hisi asp dma device John Stultz
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: John Stultz @ 2019-01-24 20:24 UTC (permalink / raw)
To: lkml
Cc: Mark Rutland, devicetree, Ryan Grachek, Zhuangluan Su,
Tanglei Han, Wei Xu, Rob Herring, John Stultz,
Manivannan Sadhasivam, linux-arm-kernel
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 <hantanglei@huawei.com>
Cc: Zhuangluan Su <suzhuangluan@hisilicon.com>
Cc: Ryan Grachek <ryan@edited.us>
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
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(+)
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 = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+ 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 = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+ 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 = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
+ 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 = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
+ 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";
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 7/8 v5] arm64: dts: hi3660: Add hisi asp dma device
2019-01-24 20:24 [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 John Stultz
2019-01-24 20:24 ` [PATCH 6/8 v5] arm64: dts: hi3660: Add dma to uart nodes John Stultz
@ 2019-01-24 20:24 ` John Stultz
2019-01-24 20:24 ` [PATCH 8/8 v5] arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-channel-mask John Stultz
2019-02-04 9:01 ` [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 Vinod Koul
3 siblings, 0 replies; 7+ messages in thread
From: John Stultz @ 2019-01-24 20:24 UTC (permalink / raw)
To: lkml
Cc: Mark Rutland, devicetree, Youlin Wang, Ryan Grachek,
Zhuangluan Su, Tanglei Han, Wei Xu, Rob Herring, John Stultz,
Manivannan Sadhasivam, linux-arm-kernel
From: Youlin Wang <wwx575822@notesmail.huawei.com>
Add asp-dma device to hi3660 dts
Cc: Tanglei Han <hantanglei@huawei.com>
Cc: Zhuangluan Su <suzhuangluan@hisilicon.com>
Cc: Ryan Grachek <ryan@edited.us>
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Youlin Wang <wwx575822@notesmail.huawei.com>
Signed-off-by: Tanglei Han <hantanglei@huawei.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
v2: Removed undocumented bindings
---
arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
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 = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "asp_dma_irq";
+ };
+
rtc0: rtc@fff04000 {
compatible = "arm,pl031", "arm,primecell";
reg = <0x0 0Xfff04000 0x0 0x1000>;
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 8/8 v5] arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-channel-mask
2019-01-24 20:24 [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 John Stultz
2019-01-24 20:24 ` [PATCH 6/8 v5] arm64: dts: hi3660: Add dma to uart nodes John Stultz
2019-01-24 20:24 ` [PATCH 7/8 v5] arm64: dts: hi3660: Add hisi asp dma device John Stultz
@ 2019-01-24 20:24 ` John Stultz
2019-02-04 9:01 ` [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 Vinod Koul
3 siblings, 0 replies; 7+ messages in thread
From: John Stultz @ 2019-01-24 20:24 UTC (permalink / raw)
To: lkml
Cc: Mark Rutland, devicetree, Ryan Grachek, Zhuangluan Su,
Tanglei Han, Wei Xu, Rob Herring, John Stultz,
Manivannan Sadhasivam, linux-arm-kernel
A undocumented and unimplemented binding got into the hi3660
dtsi, and this switches that binding to the now documented one.
Cc: Tanglei Han <hantanglei@huawei.com>
Cc: Zhuangluan Su <suzhuangluan@hisilicon.com>
Cc: Ryan Grachek <ryan@edited.us>
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
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(-)
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 = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&crg_ctrl HI3660_CLK_GATE_DMAC>;
dma-no-cci;
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960
2019-01-24 20:24 [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 John Stultz
` (2 preceding siblings ...)
2019-01-24 20:24 ` [PATCH 8/8 v5] arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-channel-mask John Stultz
@ 2019-02-04 9:01 ` Vinod Koul
2019-02-04 19:15 ` John Stultz
3 siblings, 1 reply; 7+ messages in thread
From: Vinod Koul @ 2019-02-04 9:01 UTC (permalink / raw)
To: John Stultz
Cc: Mark Rutland, devicetree, Guodong Xu, Ryan Grachek,
Zhuangluan Su, Tanglei Han, lkml, Wei Xu, Rob Herring,
Manivannan Sadhasivam, dmaengine, Dan Williams, linux-arm-kernel
On 24-01-19, 12:24, John Stultz wrote:
> This patch series is based on recent work by Tanglei Han, and
> adds support for hi3660 SoCs as found on the HiKey960 board,
> along with a few patches I've been carrying.
Applied and fixed the minor style issues in patch 5, and retagged 3 thru
5 to dmaengine: xxx, thanks
--
~Vinod
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960
2019-02-04 9:01 ` [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 Vinod Koul
@ 2019-02-04 19:15 ` John Stultz
2019-02-05 5:01 ` Vinod Koul
0 siblings, 1 reply; 7+ messages in thread
From: John Stultz @ 2019-02-04 19:15 UTC (permalink / raw)
To: Vinod Koul
Cc: Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Guodong Xu, Ryan Grachek, Zhuangluan Su, Tanglei Han, lkml,
Wei Xu, Rob Herring, Manivannan Sadhasivam,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, Dan Williams,
linux-arm-kernel
On Mon, Feb 4, 2019 at 1:03 AM Vinod Koul <vkoul@kernel.org> wrote:
>
> On 24-01-19, 12:24, John Stultz wrote:
> > This patch series is based on recent work by Tanglei Han, and
> > adds support for hi3660 SoCs as found on the HiKey960 board,
> > along with a few patches I've been carrying.
>
> Applied and fixed the minor style issues in patch 5, and retagged 3 thru
> 5 to dmaengine: xxx, thanks
My apologies for the style mistake. Your help is very much appreciated
here! Thanks so much again!
Just to clarify, are you planning on taking the reviewed binding
documents (patches 1&2) via your tree?
thanks
-john
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960
2019-02-04 19:15 ` John Stultz
@ 2019-02-05 5:01 ` Vinod Koul
0 siblings, 0 replies; 7+ messages in thread
From: Vinod Koul @ 2019-02-05 5:01 UTC (permalink / raw)
To: John Stultz
Cc: Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Guodong Xu, Ryan Grachek, Zhuangluan Su, Tanglei Han, lkml,
Wei Xu, Rob Herring, Manivannan Sadhasivam,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, Dan Williams,
linux-arm-kernel
On 04-02-19, 11:15, John Stultz wrote:
> On Mon, Feb 4, 2019 at 1:03 AM Vinod Koul <vkoul@kernel.org> wrote:
> >
> > On 24-01-19, 12:24, John Stultz wrote:
> > > This patch series is based on recent work by Tanglei Han, and
> > > adds support for hi3660 SoCs as found on the HiKey960 board,
> > > along with a few patches I've been carrying.
> >
> > Applied and fixed the minor style issues in patch 5, and retagged 3 thru
> > 5 to dmaengine: xxx, thanks
>
> My apologies for the style mistake. Your help is very much appreciated
> here! Thanks so much again!
No issues it was a minor one so didnt warrant a respin!
>
> Just to clarify, are you planning on taking the reviewed binding
> documents (patches 1&2) via your tree?
yes sorry I should have clarified since this is multi-subsystem series.
I have applied 1 thru 5 that includes DT binding. I do that typically
for dmaengine driver patches with Rob's ack.
Thanks
--
~Vinod
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-02-05 5:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-24 20:24 [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 John Stultz
2019-01-24 20:24 ` [PATCH 6/8 v5] arm64: dts: hi3660: Add dma to uart nodes John Stultz
2019-01-24 20:24 ` [PATCH 7/8 v5] arm64: dts: hi3660: Add hisi asp dma device John Stultz
2019-01-24 20:24 ` [PATCH 8/8 v5] arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-channel-mask John Stultz
2019-02-04 9:01 ` [PATCH 0/8 v5] k3dma patches to add support for hi3660/HiKey960 Vinod Koul
2019-02-04 19:15 ` John Stultz
2019-02-05 5:01 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).