| Message ID | 20220112151541.1328732-3-m.tretter@pengutronix.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | dt-bindings: dmaengine: zynqmp_dma: Convert binding to YAML | expand |
On 1/12/22 16:15, Michael Tretter wrote: > Requesting the dma controllers fails if #dma-cells is not defined. Add > the missing property. > > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> > --- > arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > index 493719f71fb5..6d96b6b99f84 100644 > --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > @@ -261,6 +261,7 @@ fpd_dma_chan1: dma@fd500000 { > interrupt-parent = <&gic>; > interrupts = <0 124 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <128>; > iommus = <&smmu 0x14e8>; > power-domains = <&zynqmp_firmware PD_GDMA>; > @@ -273,6 +274,7 @@ fpd_dma_chan2: dma@fd510000 { > interrupt-parent = <&gic>; > interrupts = <0 125 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <128>; > iommus = <&smmu 0x14e9>; > power-domains = <&zynqmp_firmware PD_GDMA>; > @@ -285,6 +287,7 @@ fpd_dma_chan3: dma@fd520000 { > interrupt-parent = <&gic>; > interrupts = <0 126 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <128>; > iommus = <&smmu 0x14ea>; > power-domains = <&zynqmp_firmware PD_GDMA>; > @@ -297,6 +300,7 @@ fpd_dma_chan4: dma@fd530000 { > interrupt-parent = <&gic>; > interrupts = <0 127 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <128>; > iommus = <&smmu 0x14eb>; > power-domains = <&zynqmp_firmware PD_GDMA>; > @@ -309,6 +313,7 @@ fpd_dma_chan5: dma@fd540000 { > interrupt-parent = <&gic>; > interrupts = <0 128 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <128>; > iommus = <&smmu 0x14ec>; > power-domains = <&zynqmp_firmware PD_GDMA>; > @@ -321,6 +326,7 @@ fpd_dma_chan6: dma@fd550000 { > interrupt-parent = <&gic>; > interrupts = <0 129 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <128>; > iommus = <&smmu 0x14ed>; > power-domains = <&zynqmp_firmware PD_GDMA>; > @@ -333,6 +339,7 @@ fpd_dma_chan7: dma@fd560000 { > interrupt-parent = <&gic>; > interrupts = <0 130 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <128>; > iommus = <&smmu 0x14ee>; > power-domains = <&zynqmp_firmware PD_GDMA>; > @@ -345,6 +352,7 @@ fpd_dma_chan8: dma@fd570000 { > interrupt-parent = <&gic>; > interrupts = <0 131 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <128>; > iommus = <&smmu 0x14ef>; > power-domains = <&zynqmp_firmware PD_GDMA>; > @@ -374,6 +382,7 @@ lpd_dma_chan1: dma@ffa80000 { > interrupt-parent = <&gic>; > interrupts = <0 77 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <64>; > iommus = <&smmu 0x868>; > power-domains = <&zynqmp_firmware PD_ADMA>; > @@ -386,6 +395,7 @@ lpd_dma_chan2: dma@ffa90000 { > interrupt-parent = <&gic>; > interrupts = <0 78 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <64>; > iommus = <&smmu 0x869>; > power-domains = <&zynqmp_firmware PD_ADMA>; > @@ -398,6 +408,7 @@ lpd_dma_chan3: dma@ffaa0000 { > interrupt-parent = <&gic>; > interrupts = <0 79 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <64>; > iommus = <&smmu 0x86a>; > power-domains = <&zynqmp_firmware PD_ADMA>; > @@ -410,6 +421,7 @@ lpd_dma_chan4: dma@ffab0000 { > interrupt-parent = <&gic>; > interrupts = <0 80 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <64>; > iommus = <&smmu 0x86b>; > power-domains = <&zynqmp_firmware PD_ADMA>; > @@ -422,6 +434,7 @@ lpd_dma_chan5: dma@ffac0000 { > interrupt-parent = <&gic>; > interrupts = <0 81 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <64>; > iommus = <&smmu 0x86c>; > power-domains = <&zynqmp_firmware PD_ADMA>; > @@ -434,6 +447,7 @@ lpd_dma_chan6: dma@ffad0000 { > interrupt-parent = <&gic>; > interrupts = <0 82 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <64>; > iommus = <&smmu 0x86d>; > power-domains = <&zynqmp_firmware PD_ADMA>; > @@ -446,6 +460,7 @@ lpd_dma_chan7: dma@ffae0000 { > interrupt-parent = <&gic>; > interrupts = <0 83 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <64>; > iommus = <&smmu 0x86e>; > power-domains = <&zynqmp_firmware PD_ADMA>; > @@ -458,6 +473,7 @@ lpd_dma_chan8: dma@ffaf0000 { > interrupt-parent = <&gic>; > interrupts = <0 84 4>; > clock-names = "clk_main", "clk_apb"; > + #dma-cells = <1>; > xlnx,bus-width = <64>; > iommus = <&smmu 0x86f>; > power-domains = <&zynqmp_firmware PD_ADMA>; Applied. M
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 493719f71fb5..6d96b6b99f84 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -261,6 +261,7 @@ fpd_dma_chan1: dma@fd500000 { interrupt-parent = <&gic>; interrupts = <0 124 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <128>; iommus = <&smmu 0x14e8>; power-domains = <&zynqmp_firmware PD_GDMA>; @@ -273,6 +274,7 @@ fpd_dma_chan2: dma@fd510000 { interrupt-parent = <&gic>; interrupts = <0 125 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <128>; iommus = <&smmu 0x14e9>; power-domains = <&zynqmp_firmware PD_GDMA>; @@ -285,6 +287,7 @@ fpd_dma_chan3: dma@fd520000 { interrupt-parent = <&gic>; interrupts = <0 126 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <128>; iommus = <&smmu 0x14ea>; power-domains = <&zynqmp_firmware PD_GDMA>; @@ -297,6 +300,7 @@ fpd_dma_chan4: dma@fd530000 { interrupt-parent = <&gic>; interrupts = <0 127 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <128>; iommus = <&smmu 0x14eb>; power-domains = <&zynqmp_firmware PD_GDMA>; @@ -309,6 +313,7 @@ fpd_dma_chan5: dma@fd540000 { interrupt-parent = <&gic>; interrupts = <0 128 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <128>; iommus = <&smmu 0x14ec>; power-domains = <&zynqmp_firmware PD_GDMA>; @@ -321,6 +326,7 @@ fpd_dma_chan6: dma@fd550000 { interrupt-parent = <&gic>; interrupts = <0 129 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <128>; iommus = <&smmu 0x14ed>; power-domains = <&zynqmp_firmware PD_GDMA>; @@ -333,6 +339,7 @@ fpd_dma_chan7: dma@fd560000 { interrupt-parent = <&gic>; interrupts = <0 130 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <128>; iommus = <&smmu 0x14ee>; power-domains = <&zynqmp_firmware PD_GDMA>; @@ -345,6 +352,7 @@ fpd_dma_chan8: dma@fd570000 { interrupt-parent = <&gic>; interrupts = <0 131 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <128>; iommus = <&smmu 0x14ef>; power-domains = <&zynqmp_firmware PD_GDMA>; @@ -374,6 +382,7 @@ lpd_dma_chan1: dma@ffa80000 { interrupt-parent = <&gic>; interrupts = <0 77 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <64>; iommus = <&smmu 0x868>; power-domains = <&zynqmp_firmware PD_ADMA>; @@ -386,6 +395,7 @@ lpd_dma_chan2: dma@ffa90000 { interrupt-parent = <&gic>; interrupts = <0 78 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <64>; iommus = <&smmu 0x869>; power-domains = <&zynqmp_firmware PD_ADMA>; @@ -398,6 +408,7 @@ lpd_dma_chan3: dma@ffaa0000 { interrupt-parent = <&gic>; interrupts = <0 79 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <64>; iommus = <&smmu 0x86a>; power-domains = <&zynqmp_firmware PD_ADMA>; @@ -410,6 +421,7 @@ lpd_dma_chan4: dma@ffab0000 { interrupt-parent = <&gic>; interrupts = <0 80 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <64>; iommus = <&smmu 0x86b>; power-domains = <&zynqmp_firmware PD_ADMA>; @@ -422,6 +434,7 @@ lpd_dma_chan5: dma@ffac0000 { interrupt-parent = <&gic>; interrupts = <0 81 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <64>; iommus = <&smmu 0x86c>; power-domains = <&zynqmp_firmware PD_ADMA>; @@ -434,6 +447,7 @@ lpd_dma_chan6: dma@ffad0000 { interrupt-parent = <&gic>; interrupts = <0 82 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <64>; iommus = <&smmu 0x86d>; power-domains = <&zynqmp_firmware PD_ADMA>; @@ -446,6 +460,7 @@ lpd_dma_chan7: dma@ffae0000 { interrupt-parent = <&gic>; interrupts = <0 83 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <64>; iommus = <&smmu 0x86e>; power-domains = <&zynqmp_firmware PD_ADMA>; @@ -458,6 +473,7 @@ lpd_dma_chan8: dma@ffaf0000 { interrupt-parent = <&gic>; interrupts = <0 84 4>; clock-names = "clk_main", "clk_apb"; + #dma-cells = <1>; xlnx,bus-width = <64>; iommus = <&smmu 0x86f>; power-domains = <&zynqmp_firmware PD_ADMA>;
Requesting the dma controllers fails if #dma-cells is not defined. Add the missing property. Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)