From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D1DFC43218 for ; Tue, 11 Jun 2019 08:28:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D6DF0212F5 for ; Tue, 11 Jun 2019 08:28:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Zr+MiAM7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6DF0212F5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: In-Reply-To:MIME-Version:References:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6SNn6FA5dSBLw+3jowJaZFsx+rd1RWNrYObWba3/EAU=; b=Zr+MiAM75PhBEjM2sGpvfko1L lwvUxjeIN3h5Hn02ZCxbTiF0/dH9WyXrFNfZJUK4glECmi3uWMlRsmTtHtcZ+DHiU3Fhx1PYLCzwR iXTJod1h1JE36/b67qT1Ace+I1FBjg4jX3jXt4iDfs7WEpkD76vbUz9zGluml8unoMny98ecjPTEE u0HkC1ToFHLHalmH87mzbYCvn2u52meIBg3VhuJHBSijS/dap1ASGKDaBgcCRjM3PhgHhspGw+zTx DLI4Oac+SNvQ/9FPuQKVXjjIClWcbSIZHMAjHt5MusCBPA7pmtObdu7d9opOKGkQHgTv7tc0sqjTR ya5KJVCwA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hac8d-0002VI-E3; Tue, 11 Jun 2019 08:28:15 +0000 Received: from relay9-d.mail.gandi.net ([217.70.183.199]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hac8Z-0002UP-7b for linux-arm-kernel@lists.infradead.org; Tue, 11 Jun 2019 08:28:13 +0000 X-Originating-IP: 90.88.159.246 Received: from localhost (aaubervilliers-681-1-40-246.w90-88.abo.wanadoo.fr [90.88.159.246]) (Authenticated sender: maxime.ripard@bootlin.com) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 9B65EFF80D; Tue, 11 Jun 2019 08:27:58 +0000 (UTC) Date: Tue, 11 Jun 2019 10:27:58 +0200 From: Maxime Ripard To: =?utf-8?B?Q2zDqW1lbnQgUMOpcm9u?= Subject: Re: [PATCH v3 6/7] arm64: dts: allwinner: h6: Add DMA node Message-ID: <20190611082758.raznfgrshvbc7lh4@flea> References: <20190527201459.20130-1-peron.clem@gmail.com> <20190527201459.20130-7-peron.clem@gmail.com> MIME-Version: 1.0 In-Reply-To: <20190527201459.20130-7-peron.clem@gmail.com> User-Agent: NeoMutt/20180716 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190611_012811_434538_AFF830EB X-CRM114-Status: GOOD ( 16.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Jernej Skrabec , Chen-Yu Tsai , linux-kernel@vger.kernel.org, Vinod Koul , Rob Herring , dmaengine@vger.kernel.org, Dan Williams , linux-arm-kernel@lists.infradead.org Content-Type: multipart/mixed; boundary="===============0661548505494679399==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============0661548505494679399== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hgbw2pta2w7pzljd" Content-Disposition: inline --hgbw2pta2w7pzljd Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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=E9ment P=E9ron wrote: > From: Jernej Skrabec > > H6 has DMA controller which supports 16 channels. > > Add a node for it. > > Signed-off-by: Jernej Skrabec > Signed-off-by: Cl=E9ment P=E9ron > --- > 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/bo= ot/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 =3D <0x03006000 0x400>; > }; > > + dma: dma-controller@3002000 { > + compatible =3D "allwinner,sun50i-h6-dma"; > + reg =3D <0x03002000 0x1000>; > + interrupts =3D ; > + clocks =3D <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>; > + clock-names =3D "bus", "mbus"; > + dma-channels =3D <16>; > + dma-requests =3D <46>; > + resets =3D <&ccu RST_BUS_DMA>; > + #dma-cells =3D <1>; > + }; > + > pio: pinctrl@300b000 { > compatible =3D "allwinner,sun50i-h6-pinctrl"; > reg =3D <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 --hgbw2pta2w7pzljd Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCXP9mDgAKCRDj7w1vZxhR xeglAPwIW36bLSAE8g46D6JILsJk6w6C0BIIbR0gS4UHeOmtswEAnm9PNial2hiQ BhIQ8CM9gowudS/CZB7KUSMsrInbXAo= =PF9a -----END PGP SIGNATURE----- --hgbw2pta2w7pzljd-- --===============0661548505494679399== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============0661548505494679399==--