* [GIT] pull request: DMA hwmod changes
@ 2010-12-19 3:59 G, Manjunath Kondaiah
2010-12-20 10:45 ` Cousson, Benoit
0 siblings, 1 reply; 5+ messages in thread
From: G, Manjunath Kondaiah @ 2010-12-19 3:59 UTC (permalink / raw)
To: linux-arm-kernel
Hi Tony,
Please pull the following dma hwmod changes into linux omap master
branch.
This pull request includes
v2[http://thread.gmane.org/gmane.linux.ports.arm.omap/48695]
+
paul's sidle mode comments incorporated
+
acks for patch 3 and 4.
The final series is boot tested on:
OMAP3530(Beagle)
N800
SDP2430
OMAP4430SDP(ES2.1)
Full testing is done once again for SDP2430 and logs can be accessed at:
http://pastebin.com/aJZGjdar
The following changes since commit
205e4d6e8d892176d791b77a974efe7f561ca4c3:
Merge branch 'for-next' (2010-12-17 19:32:47 -0800)
are available in the git repository at:
git://dev.omapzoom.org/pub/scm/manju/kernel-omap3-dev.git dma_hwmod
Benoit Cousson (1):
OMAP4: hwmod data: add system DMA
G, Manjunath Kondaiah (8):
OMAP: DMA: Replace read/write macros with functions
OMAP: DMA: Introduce errata handling feature
OMAP2420: hwmod data: add system DMA
OMAP2430: hwmod data: add system DMA
OMAP3: hwmod data: add system DMA
OMAP1: DMA: Implement in platform device model
OMAP2+: DMA: hwmod: Device registration
OMAP: DMA: Convert DMA library into platform driver
arch/arm/mach-omap1/Makefile | 2 +-
arch/arm/mach-omap1/dma.c | 390 ++++++++++++++++
arch/arm/mach-omap2/Makefile | 2 +-
arch/arm/mach-omap2/dma.c | 297 ++++++++++++
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 86 ++++
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 86 ++++
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 97 ++++
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 101 ++++
arch/arm/plat-omap/dma.c | 697
++++++++++++----------------
arch/arm/plat-omap/include/plat/dma.h | 232 ++++------
10 files changed, 1450 insertions(+), 540 deletions(-)
create mode 100644 arch/arm/mach-omap1/dma.c
create mode 100644 arch/arm/mach-omap2/dma.c
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT] pull request: DMA hwmod changes
2010-12-19 3:59 [GIT] pull request: DMA hwmod changes G, Manjunath Kondaiah
@ 2010-12-20 10:45 ` Cousson, Benoit
2010-12-21 2:11 ` G, Manjunath Kondaiah
0 siblings, 1 reply; 5+ messages in thread
From: Cousson, Benoit @ 2010-12-20 10:45 UTC (permalink / raw)
To: linux-arm-kernel
Hi Manju,
I still have 2 comments on the patch #6: OMAP4: hwmod data: add system DMA.
I'll sent them in a couple of minutes.
Regards,
Benoit
On 12/19/2010 4:59 AM, G, Manjunath Kondaiah wrote:
> Hi Tony,
> Please pull the following dma hwmod changes into linux omap master
> branch.
>
> This pull request includes
> v2[http://thread.gmane.org/gmane.linux.ports.arm.omap/48695]
> +
> paul's sidle mode comments incorporated
> +
> acks for patch 3 and 4.
>
> The final series is boot tested on:
> OMAP3530(Beagle)
> N800
> SDP2430
> OMAP4430SDP(ES2.1)
>
> Full testing is done once again for SDP2430 and logs can be accessed at:
> http://pastebin.com/aJZGjdar
>
> The following changes since commit
> 205e4d6e8d892176d791b77a974efe7f561ca4c3:
>
> Merge branch 'for-next' (2010-12-17 19:32:47 -0800)
>
> are available in the git repository at:
>
> git://dev.omapzoom.org/pub/scm/manju/kernel-omap3-dev.git dma_hwmod
>
> Benoit Cousson (1):
> OMAP4: hwmod data: add system DMA
>
> G, Manjunath Kondaiah (8):
> OMAP: DMA: Replace read/write macros with functions
> OMAP: DMA: Introduce errata handling feature
> OMAP2420: hwmod data: add system DMA
> OMAP2430: hwmod data: add system DMA
> OMAP3: hwmod data: add system DMA
> OMAP1: DMA: Implement in platform device model
> OMAP2+: DMA: hwmod: Device registration
> OMAP: DMA: Convert DMA library into platform driver
>
> arch/arm/mach-omap1/Makefile | 2 +-
> arch/arm/mach-omap1/dma.c | 390 ++++++++++++++++
> arch/arm/mach-omap2/Makefile | 2 +-
> arch/arm/mach-omap2/dma.c | 297 ++++++++++++
> arch/arm/mach-omap2/omap_hwmod_2420_data.c | 86 ++++
> arch/arm/mach-omap2/omap_hwmod_2430_data.c | 86 ++++
> arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 97 ++++
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 101 ++++
> arch/arm/plat-omap/dma.c | 697
> ++++++++++++----------------
> arch/arm/plat-omap/include/plat/dma.h | 232 ++++------
> 10 files changed, 1450 insertions(+), 540 deletions(-)
> create mode 100644 arch/arm/mach-omap1/dma.c
> create mode 100644 arch/arm/mach-omap2/dma.c
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT] pull request: DMA hwmod changes
2010-12-20 10:45 ` Cousson, Benoit
@ 2010-12-21 2:11 ` G, Manjunath Kondaiah
2010-12-21 3:48 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: G, Manjunath Kondaiah @ 2010-12-21 2:11 UTC (permalink / raw)
To: linux-arm-kernel
Hi Tony,
Benoit comments are taken care and new pull request is generated as
below. The omap4 hwmod database for dma is rearranged as per Benoit's
convention + no idlest flag entry is removed + sysc_flags are barrowed
from latest omap4 hwmod data base.
The changes are aligned and benoit has agreed for these changes.
Tested again on OMAP4 SDP(boot and DMA tests) and here is pull request
against linux omap master branch.
The following changes since commit 205e4d6e8d892176d791b77a974efe7f561ca4c3:
Merge branch 'for-next' (2010-12-17 19:32:47 -0800)
are available in the git repository at:
git://dev.omapzoom.org/pub/scm/manju/kernel-omap3-dev.git dma_for_2.6.38
Benoit Cousson (1):
OMAP4: hwmod data: add system DMA
G, Manjunath Kondaiah (8):
OMAP: DMA: Replace read/write macros with functions
OMAP: DMA: Introduce errata handling feature
OMAP2420: hwmod data: add system DMA
OMAP2430: hwmod data: add system DMA
OMAP3: hwmod data: add system DMA
OMAP1: DMA: Implement in platform device model
OMAP2+: DMA: hwmod: Device registration
OMAP: DMA: Convert DMA library into platform driver
arch/arm/mach-omap1/Makefile | 2 +-
arch/arm/mach-omap1/dma.c | 390 ++++++++++++++++
arch/arm/mach-omap2/Makefile | 2 +-
arch/arm/mach-omap2/dma.c | 297 ++++++++++++
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 86 ++++
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 86 ++++
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 97 ++++
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 102 ++++
arch/arm/plat-omap/dma.c | 697 ++++++++++++----------------
arch/arm/plat-omap/include/plat/dma.h | 232 ++++------
10 files changed, 1451 insertions(+), 540 deletions(-)
create mode 100644 arch/arm/mach-omap1/dma.c
create mode 100644 arch/arm/mach-omap2/dma.c
-Manjunath
On Mon, Dec 20, 2010 at 11:45:29AM +0100, Cousson, Benoit wrote:
> Hi Manju,
>
> I still have 2 comments on the patch #6: OMAP4: hwmod data: add system DMA.
>
> I'll sent them in a couple of minutes.
>
> Regards,
> Benoit
>
> On 12/19/2010 4:59 AM, G, Manjunath Kondaiah wrote:
> >Hi Tony,
> >Please pull the following dma hwmod changes into linux omap master
> >branch.
> >
> >This pull request includes
> >v2[http://thread.gmane.org/gmane.linux.ports.arm.omap/48695]
> >+
> >paul's sidle mode comments incorporated
> >+
> >acks for patch 3 and 4.
> >
> >The final series is boot tested on:
> >OMAP3530(Beagle)
> >N800
> >SDP2430
> >OMAP4430SDP(ES2.1)
> >
> >Full testing is done once again for SDP2430 and logs can be accessed at:
> >http://pastebin.com/aJZGjdar
> >
> >The following changes since commit
> >205e4d6e8d892176d791b77a974efe7f561ca4c3:
> >
> > Merge branch 'for-next' (2010-12-17 19:32:47 -0800)
> >
> >are available in the git repository at:
> >
> > git://dev.omapzoom.org/pub/scm/manju/kernel-omap3-dev.git dma_hwmod
> >
> >Benoit Cousson (1):
> > OMAP4: hwmod data: add system DMA
> >
> >G, Manjunath Kondaiah (8):
> > OMAP: DMA: Replace read/write macros with functions
> > OMAP: DMA: Introduce errata handling feature
> > OMAP2420: hwmod data: add system DMA
> > OMAP2430: hwmod data: add system DMA
> > OMAP3: hwmod data: add system DMA
> > OMAP1: DMA: Implement in platform device model
> > OMAP2+: DMA: hwmod: Device registration
> > OMAP: DMA: Convert DMA library into platform driver
> >
> > arch/arm/mach-omap1/Makefile | 2 +-
> > arch/arm/mach-omap1/dma.c | 390 ++++++++++++++++
> > arch/arm/mach-omap2/Makefile | 2 +-
> > arch/arm/mach-omap2/dma.c | 297 ++++++++++++
> > arch/arm/mach-omap2/omap_hwmod_2420_data.c | 86 ++++
> > arch/arm/mach-omap2/omap_hwmod_2430_data.c | 86 ++++
> > arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 97 ++++
> > arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 101 ++++
> > arch/arm/plat-omap/dma.c | 697
> >++++++++++++----------------
> > arch/arm/plat-omap/include/plat/dma.h | 232 ++++------
> > 10 files changed, 1450 insertions(+), 540 deletions(-)
> > create mode 100644 arch/arm/mach-omap1/dma.c
> > create mode 100644 arch/arm/mach-omap2/dma.c
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT] pull request: DMA hwmod changes
2010-12-21 2:11 ` G, Manjunath Kondaiah
@ 2010-12-21 3:48 ` Tony Lindgren
2010-12-21 4:49 ` G, Manjunath Kondaiah
0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2010-12-21 3:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
* G, Manjunath Kondaiah <manjugk@ti.com> [101220 18:11]:
> Hi Tony,
> Benoit comments are taken care and new pull request is generated as
> below. The omap4 hwmod database for dma is rearranged as per Benoit's
> convention + no idlest flag entry is removed + sysc_flags are barrowed
> from latest omap4 hwmod data base.
OK great, I've applied them now.
> The following changes since commit 205e4d6e8d892176d791b77a974efe7f561ca4c3:
>
> Merge branch 'for-next' (2010-12-17 19:32:47 -0800)
I ended up cherry picking them. For next time, note that you should not
do any git branches to pull against anything but mainline tags. Otherwise
tons of non-mainline history would get merged..
If you cannot base your branch on some recent mainline tag because of
conflicts, then you should use some branch that will stay around,
like what we have queued into omap-for-linus.
Cheers,
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT] pull request: DMA hwmod changes
2010-12-21 3:48 ` Tony Lindgren
@ 2010-12-21 4:49 ` G, Manjunath Kondaiah
0 siblings, 0 replies; 5+ messages in thread
From: G, Manjunath Kondaiah @ 2010-12-21 4:49 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Dec 20, 2010 at 07:48:36PM -0800, Tony Lindgren wrote:
> Hi,
>
> * G, Manjunath Kondaiah <manjugk@ti.com> [101220 18:11]:
> > Hi Tony,
> > Benoit comments are taken care and new pull request is generated as
> > below. The omap4 hwmod database for dma is rearranged as per Benoit's
> > convention + no idlest flag entry is removed + sysc_flags are barrowed
> > from latest omap4 hwmod data base.
>
> OK great, I've applied them now.
Thanks.
>
> > The following changes since commit 205e4d6e8d892176d791b77a974efe7f561ca4c3:
> >
> > Merge branch 'for-next' (2010-12-17 19:32:47 -0800)
>
> I ended up cherry picking them. For next time, note that you should not
> do any git branches to pull against anything but mainline tags. Otherwise
> tons of non-mainline history would get merged..
ok. Since you mentioned in one of previous mail that, you will be
merging these changes to l-o master for testing hence I generated pull
request against l-o master.
>
> If you cannot base your branch on some recent mainline tag because of
> conflicts, then you should use some branch that will stay around,
> like what we have queued into omap-for-linus.
ok. Will do this in future.
-Manjunath
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-21 4:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-19 3:59 [GIT] pull request: DMA hwmod changes G, Manjunath Kondaiah
2010-12-20 10:45 ` Cousson, Benoit
2010-12-21 2:11 ` G, Manjunath Kondaiah
2010-12-21 3:48 ` Tony Lindgren
2010-12-21 4:49 ` G, Manjunath Kondaiah
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).