From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932425AbbEHRpl (ORCPT ); Fri, 8 May 2015 13:45:41 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:37157 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751733AbbEHRpi (ORCPT ); Fri, 8 May 2015 13:45:38 -0400 Message-ID: <554CF60D.4000001@ti.com> Date: Fri, 8 May 2015 20:44:45 +0300 From: Peter Ujfalusi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Tony Lindgren , Vinod Koul CC: , , , , , , , , , , Subject: Re: [PATCH v5 3/8] dmaengine: Add driver for TI DMA crossbar on DRA7x References: <1428572154-3548-1-git-send-email-peter.ujfalusi@ti.com> <1428572154-3548-4-git-send-email-peter.ujfalusi@ti.com> <20150504053851.GY3521@localhost> <554B34F2.5050306@ti.com> <20150508034110.GW3521@localhost> <554C6034.4020004@ti.com> <20150508090330.GB3521@localhost> <20150508150926.GC15563@atomide.com> In-Reply-To: <20150508150926.GC15563@atomide.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/08/2015 06:09 PM, Tony Lindgren wrote: > * Vinod Koul [150508 02:04]: >> On Fri, May 08, 2015 at 10:05:24AM +0300, Peter Ujfalusi wrote: >>> On 05/08/2015 06:41 AM, Vinod Koul wrote: >>>> Now as far as this series is concerned, rest of it looks good so I am >>>> willing to merge to if you plan to work on defered probe :) I think its a >>>> fair bargain! >>> >>> Deal ;) >> Wonderful :) >> >>> >>> I'll take care of the OMAP/daVinci drivers for omap-dma and edma. >> Okay, I had asked for ACK on last patch as its ARM one, or do you want me to >> go ahead and apply it.. will wait till today > > It's best that I queue the .dts change as a follow-up patch once > the DMA changes are merged. Otherwise it's almost guaranteed to > produce merge conflicts with other dts changes. > > Peter, let us know if there's an issue with that. If so, we need > to set up an immutable branch against v4.1-rc1 with just these > patches so we can merge it in as needed. Yes, the DT patches w/o the dmaengine changes will brake dra7, but it is not true other way around. The DT patches should be merged only when the dmaengine patches are in. -- Péter From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Ujfalusi Subject: Re: [PATCH v5 3/8] dmaengine: Add driver for TI DMA crossbar on DRA7x Date: Fri, 8 May 2015 20:44:45 +0300 Message-ID: <554CF60D.4000001@ti.com> References: <1428572154-3548-1-git-send-email-peter.ujfalusi@ti.com> <1428572154-3548-4-git-send-email-peter.ujfalusi@ti.com> <20150504053851.GY3521@localhost> <554B34F2.5050306@ti.com> <20150508034110.GW3521@localhost> <554C6034.4020004@ti.com> <20150508090330.GB3521@localhost> <20150508150926.GC15563@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20150508150926.GC15563@atomide.com> Sender: linux-kernel-owner@vger.kernel.org To: Tony Lindgren , Vinod Koul Cc: linux@arm.linux.org.uk, grant.likely@linaro.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, nm@ti.com, arnd@arndb.de, maxime.ripard@free-electrons.com List-Id: devicetree@vger.kernel.org On 05/08/2015 06:09 PM, Tony Lindgren wrote: > * Vinod Koul [150508 02:04]: >> On Fri, May 08, 2015 at 10:05:24AM +0300, Peter Ujfalusi wrote: >>> On 05/08/2015 06:41 AM, Vinod Koul wrote: >>>> Now as far as this series is concerned, rest of it looks good so I= am >>>> willing to merge to if you plan to work on defered probe :) I thin= k its a >>>> fair bargain! >>> >>> Deal ;) >> Wonderful :) >> >>> >>> I'll take care of the OMAP/daVinci drivers for omap-dma and edma. >> Okay, I had asked for ACK on last patch as its ARM one, or do you wa= nt me to >> go ahead and apply it.. will wait till today >=20 > It's best that I queue the .dts change as a follow-up patch once > the DMA changes are merged. Otherwise it's almost guaranteed to > produce merge conflicts with other dts changes. >=20 > Peter, let us know if there's an issue with that. If so, we need > to set up an immutable branch against v4.1-rc1 with just these > patches so we can merge it in as needed. Yes, the DT patches w/o the dmaengine changes will brake dra7, but it i= s not true other way around. The DT patches should be merged only when the dmaengine patches are in. --=20 P=E9ter From mboxrd@z Thu Jan 1 00:00:00 1970 From: peter.ujfalusi@ti.com (Peter Ujfalusi) Date: Fri, 8 May 2015 20:44:45 +0300 Subject: [PATCH v5 3/8] dmaengine: Add driver for TI DMA crossbar on DRA7x In-Reply-To: <20150508150926.GC15563@atomide.com> References: <1428572154-3548-1-git-send-email-peter.ujfalusi@ti.com> <1428572154-3548-4-git-send-email-peter.ujfalusi@ti.com> <20150504053851.GY3521@localhost> <554B34F2.5050306@ti.com> <20150508034110.GW3521@localhost> <554C6034.4020004@ti.com> <20150508090330.GB3521@localhost> <20150508150926.GC15563@atomide.com> Message-ID: <554CF60D.4000001@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 05/08/2015 06:09 PM, Tony Lindgren wrote: > * Vinod Koul [150508 02:04]: >> On Fri, May 08, 2015 at 10:05:24AM +0300, Peter Ujfalusi wrote: >>> On 05/08/2015 06:41 AM, Vinod Koul wrote: >>>> Now as far as this series is concerned, rest of it looks good so I am >>>> willing to merge to if you plan to work on defered probe :) I think its a >>>> fair bargain! >>> >>> Deal ;) >> Wonderful :) >> >>> >>> I'll take care of the OMAP/daVinci drivers for omap-dma and edma. >> Okay, I had asked for ACK on last patch as its ARM one, or do you want me to >> go ahead and apply it.. will wait till today > > It's best that I queue the .dts change as a follow-up patch once > the DMA changes are merged. Otherwise it's almost guaranteed to > produce merge conflicts with other dts changes. > > Peter, let us know if there's an issue with that. If so, we need > to set up an immutable branch against v4.1-rc1 with just these > patches so we can merge it in as needed. Yes, the DT patches w/o the dmaengine changes will brake dra7, but it is not true other way around. The DT patches should be merged only when the dmaengine patches are in. -- P?ter