Messages in this thread | | | Date | Tue, 11 Jun 2019 10:27:58 +0200 | From | Maxime Ripard <> | Subject | Re: [PATCH v3 6/7] arm64: dts: allwinner: h6: Add DMA node |
| |
Hi,
I tried applying this patch, and it conflicts.
There's also a minor issue that sohuld be fixed
On Mon, May 27, 2019 at 10:14:58PM +0200, Clément Péron wrote: > From: Jernej Skrabec <jernej.skrabec@siol.net> > > H6 has DMA controller which supports 16 channels. > > Add a node for it. > > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> > Signed-off-by: Clément Péron <peron.clem@gmail.com> > --- > arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > index 16c5c3d0fd81..f4ea596c82ce 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > @@ -208,6 +208,18 @@ > reg = <0x03006000 0x400>; > }; > > + dma: dma-controller@3002000 { > + compatible = "allwinner,sun50i-h6-dma"; > + reg = <0x03002000 0x1000>; > + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>; > + clock-names = "bus", "mbus"; > + dma-channels = <16>; > + dma-requests = <46>; > + resets = <&ccu RST_BUS_DMA>; > + #dma-cells = <1>; > + }; > + > pio: pinctrl@300b000 { > compatible = "allwinner,sun50i-h6-pinctrl"; > reg = <0x0300b000 0x400>;
DT nodes are ordered by increasing physical addresses, so this node shouldn't be there.
Thanks! Maxime
-- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com [unhandled content-type:application/pgp-signature] | |