From: nsekhar@ti•com (Sekhar Nori)
To: linux-arm-kernel@lists•infradead.org
Subject: [RFC PATCH v3 02/16] ARM: davinci: move private EDMA API to arm/common
Date: Tue, 22 Jan 2013 21:10:06 +0530 [thread overview]
Message-ID: <50FEB2D6.50300@ti.com> (raw)
In-Reply-To: <20130110235157.GU14660@beef>
Matt,
Sorry about the late reply. I noticed this mail only after I started to
look at v5 of your series :(
On 1/11/2013 5:21 AM, Matt Porter wrote:
> On Sun, Oct 28, 2012 at 01:47:09PM +0530, Sekhar Nori wrote:
>> On 10/18/2012 6:56 PM, Matt Porter wrote:
>>> Move mach-davinci/dma.c to common/edma.c so it can be used
>>> by OMAP (specifically AM33xx) as well. This just moves the
>>> private EDMA API but does not support OMAP.
>>>
>>> Signed-off-by: Matt Porter <mporter@ti•com>
>>> ---
>>
>>> diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
>>> index 4c48a36..f45d591 100644
>>> --- a/arch/arm/mach-davinci/devices.c
>>> +++ b/arch/arm/mach-davinci/devices.c
>>> @@ -19,9 +19,10 @@
>>> #include <mach/irqs.h>
>>> #include <mach/cputype.h>
>>> #include <mach/mux.h>
>>> -#include <mach/edma.h>
>>> #include <linux/platform_data/mmc-davinci.h>
>>> #include <mach/time.h>
>>> +#include <linux/platform_data/edma.h>
>>
>> Can you please introduce a patch to clean this mixture of linux/ and
>> mach/ includes?
>
> Yeah, are you ok with a follow on series to clean all these files? I
> don't want to make this series longer with something not dma related
> that's purely cleanup from the great header reorg of 2012.
Okay. I agree doing this sort of change now will cause merge issues.
>
>>> +
>>>
>>> #include "davinci.h"
>>> #include "clock.h"
>>> @@ -141,10 +142,10 @@ static struct resource mmcsd0_resources[] = {
>>> },
>>> /* DMA channels: RX, then TX */
>>> {
>>> - .start = EDMA_CTLR_CHAN(0, DAVINCI_DMA_MMCRXEVT),
>>> + .start = EDMA_CTLR_CHAN(0, 26),
>>
>> Instead of just replacing the event #defines with plain numbers, can you
>> introduce a mach-davinci local edma.h which can then be included in the
>> davinci platform files which refer to edma channel numbers?
>
> Ok, so when I removed the old edma.h it was full of unused defines and
> we are left with just this one. If I introduced something like that it
> would be used in just one place here. and only for these two values.
> How about we just add a comment?
I prefer adding a local #define in this file. This will keep it
consistent with what is done in arch/arm/mach-davinci/dm365.c for
example. Same for the change in sound/soc/davinci/davinci-sffsdr.c
>
>>
>>> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
>>> index 7cd56ed..153fab8 100644
>>> --- a/arch/arm/plat-omap/Kconfig
>>> +++ b/arch/arm/plat-omap/Kconfig
>>> @@ -28,6 +28,7 @@ config ARCH_OMAP2PLUS
>>> select OMAP_DM_TIMER
>>> select PROC_DEVICETREE if PROC_FS
>>> select SPARSE_IRQ
>>> + select TI_PRIV_EDMA
>>
>> This hunk does not seem to belong to subject of this patch.
>
> Let me reword the subject/description. The idea of this logical
> chunk was to put everything in place to make it build on OMAP,
> with the expectation that the build fails without the next patch
> in the series.
But this will break bisect. With just this patch applied, omap build
breaks. Looks like it will be more logical to merge this hunk with 3/14
since that's when you really start using the private DMA support on OMAP
platforms.
This issue is a must fix IMO.
I am ok with the patch otherwise. With these changes done, you can add:
Acked-by: Sekhar Nori <nsekhar@ti•com>
Thanks,
Sekhar
next prev parent reply other threads:[~2013-01-22 15:40 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-18 13:26 [RFC PATCH v3 00/16] DMA Engine support for AM33XX Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 01/16] dmaengine: edma: fix slave config dependency on direction Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 02/16] ARM: davinci: move private EDMA API to arm/common Matt Porter
2012-10-28 8:17 ` Sekhar Nori
2012-11-16 16:49 ` Matt Porter
2013-01-10 23:51 ` Matt Porter
2013-01-22 15:40 ` Sekhar Nori [this message]
[not found] ` <d631bf39a8b8474bae448d089497fe0e@DLEE74.ent.ti.com>
2013-01-23 21:00 ` Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 03/16] ARM: edma: remove unused transfer controller handlers Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 04/16] ARM: edma: add DT and runtime PM support for AM33XX Matt Porter
2012-10-28 11:03 ` Sekhar Nori
2013-01-10 19:18 ` Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 05/16] ARM: edma: add AM33XX crossbar event support Matt Porter
2012-10-26 12:53 ` Hebbar, Gururaja
2012-10-28 11:11 ` Sekhar Nori
2013-01-10 22:54 ` Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 06/16] dmaengine: edma: enable build for AM33XX Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 07/16] dmaengine: edma: Add TI EDMA device tree binding Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 08/16] ARM: dts: add AM33XX EDMA support Matt Porter
2012-10-28 11:16 ` Sekhar Nori
2013-01-10 19:27 ` Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 09/16] dmaengine: add dma_request_slave_channel_compat() Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 10/16] mmc: omap_hsmmc: convert to dma_request_slave_channel_compat() Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 11/16] mmc: omap_hsmmc: limit max_segs with the EDMA DMAC Matt Porter
2012-10-29 8:18 ` Sekhar Nori
2013-01-10 19:30 ` Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 12/16] mmc: omap_hsmmc: add generic DMA request support to the DT binding Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 13/16] ARM: dts: add AM33XX MMC support Matt Porter
2012-10-30 5:33 ` AnilKumar, Chimata
2013-01-10 20:26 ` Matt Porter
2013-01-03 10:03 ` Hebbar, Gururaja
2012-10-18 13:26 ` [RFC PATCH v3 14/16] spi: omap2-mcspi: convert to dma_request_slave_channel_compat() Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 15/16] spi: omap2-mcspi: add generic DMA request support to the DT binding Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 16/16] ARM: dts: add AM33XX SPI support Matt Porter
2012-10-28 11:31 ` Sekhar Nori
2013-01-10 19:35 ` Matt Porter
2013-01-10 19:46 ` Nishanth Menon
2013-01-10 20:49 ` Matt Porter
2013-01-10 20:49 ` Nishanth Menon
2012-10-29 9:11 ` Philip, Avinash
2012-10-30 9:41 ` Philip, Avinash
2012-10-31 10:16 ` Benoit Cousson
2012-10-31 10:35 ` Benoit Cousson
2012-10-31 11:03 ` Philip, Avinash
2012-10-19 10:26 ` [RFC PATCH v3 00/16] DMA Engine support for AM33XX Bedia, Vaibhav
2012-10-19 11:15 ` Matt Porter
2012-10-19 12:02 ` Bedia, Vaibhav
2012-10-19 16:46 ` Matt Porter
2012-10-22 5:53 ` Bedia, Vaibhav
2012-10-26 8:32 ` Russ Dill
2012-11-05 7:19 ` Hebbar, Gururaja
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50FEB2D6.50300@ti.com \
--to=nsekhar@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox