| Message ID | 20200306205403.29881-1-michael@walle.cc (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d94a05f87327143f94f67dd256932163ac2bcd65 |
| Headers | show |
| Series | [1/2] dt-bindings: dma: fsl-edma: fix ls1028a-edma compatible | expand |
On Fri, 6 Mar 2020 21:54:02 +0100, Michael Walle wrote: > The bootloader will fix up the IOMMU entries only on nodes with the > compatible "fsl,vf610-edma". Thus make this compatible string mandatory > for the ls1028a-edma. > > While at it, fix the "fsl,fsl," typo. > > Signed-off-by: Michael Walle <michael@walle.cc> > Fixes: d8c1bdb5288d ("dt-bindings: dma: fsl-edma: add new fsl,fsl,ls1028a-edma") > --- > Documentation/devicetree/bindings/dma/fsl-edma.txt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Reviewed-by: Rob Herring <robh@kernel.org>
On Fri, Mar 06, 2020 at 09:54:02PM +0100, Michael Walle wrote: > The bootloader will fix up the IOMMU entries only on nodes with the > compatible "fsl,vf610-edma". Thus make this compatible string mandatory > for the ls1028a-edma. > > While at it, fix the "fsl,fsl," typo. > > Signed-off-by: Michael Walle <michael@walle.cc> > Fixes: d8c1bdb5288d ("dt-bindings: dma: fsl-edma: add new fsl,fsl,ls1028a-edma") Applied both. Will try to send for 5.7-rc inclusion. Shawn
Hi Shawn Guo, Am 2020-04-13 16:18, schrieb Shawn Guo: > On Fri, Mar 06, 2020 at 09:54:02PM +0100, Michael Walle wrote: >> The bootloader will fix up the IOMMU entries only on nodes with the >> compatible "fsl,vf610-edma". Thus make this compatible string >> mandatory >> for the ls1028a-edma. >> >> While at it, fix the "fsl,fsl," typo. >> >> Signed-off-by: Michael Walle <michael@walle.cc> >> Fixes: d8c1bdb5288d ("dt-bindings: dma: fsl-edma: add new >> fsl,fsl,ls1028a-edma") > > Applied both. Will try to send for 5.7-rc inclusion. Are there any news on the inclusion? Unfortunately, I also forgot the fixes tag on patch 2/2, so it won't end up in v5.7.x. -michael
diff --git a/Documentation/devicetree/bindings/dma/fsl-edma.txt b/Documentation/devicetree/bindings/dma/fsl-edma.txt index e77b08ebcd06..ee1754739b4b 100644 --- a/Documentation/devicetree/bindings/dma/fsl-edma.txt +++ b/Documentation/devicetree/bindings/dma/fsl-edma.txt @@ -10,7 +10,8 @@ Required properties: - compatible : - "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC - "fsl,imx7ulp-edma" for eDMA2 used similar to that on i.mx7ulp - - "fsl,fsl,ls1028a-edma" for eDMA used similar to that on Vybrid vf610 SoC + - "fsl,ls1028a-edma" followed by "fsl,vf610-edma" for eDMA used on the + LS1028A SoC. - reg : Specifies base physical address(s) and size of the eDMA registers. The 1st region is eDMA control register's address and size. The 2nd and the 3rd regions are programmable channel multiplexing
The bootloader will fix up the IOMMU entries only on nodes with the compatible "fsl,vf610-edma". Thus make this compatible string mandatory for the ls1028a-edma. While at it, fix the "fsl,fsl," typo. Signed-off-by: Michael Walle <michael@walle.cc> Fixes: d8c1bdb5288d ("dt-bindings: dma: fsl-edma: add new fsl,fsl,ls1028a-edma") --- Documentation/devicetree/bindings/dma/fsl-edma.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)