Git tree updated

Git tree updated

[Tony Lindgren]

Hi all,

As discussed earlier, I've made some changes to our git tree to make it
easier to send patches upstream. I've added some branches internally to
the git tree, and the master branch is based on these new branches.

>From usage point of view, this change is transparent. Git pull should
work as earlier, there are just new branches there. The master branch
is still our development branch, and the other branches are just queues
for upstream.

Now we have following branches:

linus
     \
      omap-fixes
                \
                 omap-upstream
                              \
                               omap-drivers
                                           \
                                            master

The branches have following purpose:

linus		Linus' mainline tree
omap-fixes	Queue of omap fixes for -rcN series
omap-upstream	Queue of omap core patches for next merge window
omap-drivers	Queue of omap drivers for next merge window
master		Linux omap tree

I'll be rebasing the omap-fixes, omap-upstream, and omap-drivers branches
against the mainline tree, and then merging the changes to the master
branch.

Sorry if this change took a bit longer than expected, I got interrupted
with few other things and was not happy with the branch layout until
today :)

In case anybody is wondering, I rebuilt the new master branch by
applying the patch queues on top of 2.6.20 to various branches,
and then merged in our old tree so the resulting trees were identical.

Today I also updated the new tree few times to make sure things work
out as planned, so the tree is now in sync with the mainline tree.

Regards,

Tony

Re: Git tree updated

[Dirk Behme]

Tony Lindgren wrote:
> Now we have following branches:
> 
> linus
>      \
>       omap-fixes
>                 \
>                  omap-upstream
>                               \
>                                omap-drivers
>                                            \
>                                             master
> 
> The branches have following purpose:
> 
> linus		Linus' mainline tree
> omap-fixes	Queue of omap fixes for -rcN series

Looks like this starts to work:

http://www.ussg.iu.edu/hypermail/linux/kernel/0703.2/0246.html

http://www.uwsg.iu.edu/hypermail/linux/kernel/0703.0/2536.html

-> search for "OMAP"

:)

How do the changes in omap-fixes find their way to Linus? 
Does Linus pull directly from omap-fixes? How is this triggered?

Cheers

Dirk

Re: Git tree updated

[tony]

Hi,

* Dirk Behme <dirk.behme@googlemail.com> [070316 15:57]:
> Tony Lindgren wrote:
> >Now we have following branches:
> >
> >linus
> >     \
> >      omap-fixes
> >                \
> >                 omap-upstream
> >                              \
> >                               omap-drivers
> >                                           \
> >                                            master
> >
> >The branches have following purpose:
> >
> >linus		Linus' mainline tree
> >omap-fixes	Queue of omap fixes for -rcN series
> 
> Looks like this starts to work:
> 
> http://www.ussg.iu.edu/hypermail/linux/kernel/0703.2/0246.html
> 
> http://www.uwsg.iu.edu/hypermail/linux/kernel/0703.0/2536.html
> 
> -> search for "OMAP"
> 
> :)

Yeah!
 
> How do the changes in omap-fixes find their way to Linus? 
> Does Linus pull directly from omap-fixes? How is this triggered?

I post the omap-fixes to Russell's patch system and then
Russell pulls them.

I'll be cleaning up the omap-upstream queue more to get ready for
post 2.6.21 merge :)

Tony

Git tree updated

[Tony Lindgren]

Hi all,

I've updated our git tree to be in sync with mainline tree as Russell
has merged some of our pending patches.

Looks like 24xx does not currently boot, it seems to hang at
devicemaps_init(). I've verified that at least 16xx boots.

I'll have to continue debugging the 24xx devicemaps_init issue tomorrow,
if somebody gets it working before that, please post the patch :)

Regards,

Tony

Re: Git tree updated

[Trilok Soni]

[-- Attachment #1: Type: text/plain, Size: 610 bytes --]

Tony,

On 5/8/07, Tony Lindgren <tony@atomide.com> wrote:
> Hi all,
>
> I've updated our git tree to be in sync with mainline tree as Russell
> has merged some of our pending patches.
>
> Looks like 24xx does not currently boot, it seems to hang at
> devicemaps_init(). I've verified that at least 16xx boots.
>
> I'll have to continue debugging the 24xx devicemaps_init issue tomorrow,
> if somebody gets it working before that, please post the patch :)
>

arch/arm/mach-omap2/io.c seems have some duplication due to merging
problem it seems.
I have attached patch to remove those entries.

-- 
--Trilok Soni

[-- Attachment #2: 0001-ARM-OMAP-Remove-duplicate-entries-from-omap2-io.c.patch --]
[-- Type: text/x-patch, Size: 1835 bytes --]

From 80b2b47d373c840903e8c4dfa68b1485cd490c83 Mon Sep 17 00:00:00 2001
From: Trilok Soni <soni.trilok@gmail.com>
Date: Tue, 8 May 2007 23:05:25 +0530
Subject: [PATCH] ARM: OMAP: Remove duplicate entries from omap2 io.c

- Remove duplicate entries generated due to merging.

Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
---
 arch/arm/mach-omap2/io.c |   44 --------------------------------------------
 1 files changed, 0 insertions(+), 44 deletions(-)

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index a88bd1e..fba2e86 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -88,50 +88,6 @@ static struct map_desc omap2_io_desc[] __initdata = {
 		.length		= DSP_MMU_24XX_SIZE,
 		.type		= MT_DEVICE
 	},
-#ifdef CONFIG_ARCH_OMAP2430
-	{
-		.virtual	= L4_WK_243X_VIRT,
-		.pfn		= __phys_to_pfn(L4_WK_243X_PHYS),
-		.length		= L4_WK_243X_SIZE,
-		.type		= MT_DEVICE
-	},
-	{
-		.virtual	= OMAP243X_GPMC_VIRT,
-		.pfn		= __phys_to_pfn(OMAP243X_GPMC_PHYS),
-		.length		= OMAP243X_GPMC_SIZE,
-		.type		= MT_DEVICE
-	},
-	{
-		.virtual	= OMAP243X_SDRC_VIRT,
-		.pfn		= __phys_to_pfn(OMAP243X_SDRC_PHYS),
-		.length		= OMAP243X_SDRC_SIZE,
-		.type		= MT_DEVICE
-	},
-	{
-		.virtual	= OMAP243X_SMS_VIRT,
-		.pfn		= __phys_to_pfn(OMAP243X_SMS_PHYS),
-		.length		= OMAP243X_SMS_SIZE,
-		.type		= MT_DEVICE
-	},
-#endif
-	{
-		.virtual	= DSP_MEM_24XX_VIRT,
-		.pfn		= __phys_to_pfn(DSP_MEM_24XX_PHYS),
-		.length		= DSP_MEM_24XX_SIZE,
-		.type		= MT_DEVICE
-	},
-	{
-		.virtual	= DSP_IPI_24XX_VIRT,
-		.pfn		= __phys_to_pfn(DSP_IPI_24XX_PHYS),
-		.length		= DSP_IPI_24XX_SIZE,
-		.type		= MT_DEVICE
-	},
-	{
-		.virtual	= DSP_MMU_24XX_VIRT,
-		.pfn		= __phys_to_pfn(DSP_MMU_24XX_PHYS),
-		.length		= DSP_MMU_24XX_SIZE,
-		.type		= MT_DEVICE
-	}
 };
 
 void __init omap2_map_common_io(void)
-- 
1.5.0


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: Git tree updated

[Tony Lindgren]

* Trilok Soni <soni.trilok@gmail.com> [070508 05:06]:
> Tony,
> 
> On 5/8/07, Tony Lindgren <tony@atomide.com> wrote:
> >Hi all,
> >
> >I've updated our git tree to be in sync with mainline tree as Russell
> >has merged some of our pending patches.
> >
> >Looks like 24xx does not currently boot, it seems to hang at
> >devicemaps_init(). I've verified that at least 16xx boots.
> >
> >I'll have to continue debugging the 24xx devicemaps_init issue tomorrow,
> >if somebody gets it working before that, please post the patch :)
> >
> 
> arch/arm/mach-omap2/io.c seems have some duplication due to merging
> problem it seems.
> I have attached patch to remove those entries.

Ah, thanks, it's that thing again!

OK I need to get it merged in the omap-upstream branch, otherwise
the automerge always seems to mess it up...

Regards,

Tony

RE: Git tree updated

[Woodruff, Richard]

I noticed that MMC doesn't compile either.

The include/linux/mmc/card.h structure mmc_card changed removing the
'node' element.

Regards,
Richard W.

> -----Original Message-----
> From: linux-omap-open-source-bounces@linux.omap.com
[mailto:linux-omap-
> open-source-bounces@linux.omap.com] On Behalf Of Tony Lindgren
> Sent: Monday, May 07, 2007 10:20 PM
> To: linux-omap-open-source@linux.omap.com
> Subject: Git tree updated
> 
> Hi all,
> 
> I've updated our git tree to be in sync with mainline tree as Russell
> has merged some of our pending patches.
> 
> Looks like 24xx does not currently boot, it seems to hang at
> devicemaps_init(). I've verified that at least 16xx boots.
> 
> I'll have to continue debugging the 24xx devicemaps_init issue
tomorrow,
> if somebody gets it working before that, please post the patch :)
> 
> Regards,
> 
> Tony
> _______________________________________________
> Linux-omap-open-source mailing list
> Linux-omap-open-source@linux.omap.com
> http://linux.omap.com/mailman/listinfo/linux-omap-open-source

RE: Git tree updated

[Syed Mohammed, Khasim]

Yeah, I was also getting an error for the "if(i2c_del_driver" in twl4030 driver. The i2c_del_driver is a void function and we were testing the return condition.

static void __exit twl4030_exit(void)
{
        if (i2c_del_driver(&twl4030_driver))
                printk(KERN_ERR
                        "TWL4030: Driver remove failed, module not removed\n");

Temporarily I disabled MMC and corrected io.c and T2. 2430 SDP hangs while booting, I think this is what Tony was debugging yesterday.

Uncompressing Linux.............................................................
................................. done, booting the kernel.
<5>Linux version 2.6.21-omap1-gf2c4487d-dirty (khasim@omap-linux2) (gcc version
4.1.1 (CodeSourcery ARM Sourcery G++ 2006q3-26)) #1 PREEMPT Tue May 8 12:36:26 C
DT 2007
CPU: ARMv6-compatible processor [4107b366] revision 6 (ARMv6TEJ), cr=00c5387f
Machine: OMAP2430 sdp2430 board
Memory policy: ECC disabled, Data cache writeback
<7>On node 0 totalpages: 32768
<7>  DMA zone: 256 pages used for memmap
<7>  DMA zone: 0 pages reserved
<7>  DMA zone: 32512 pages, LIFO batch:7
<7>  Normal zone: 0 pages used for memmap



   

>-----Original Message-----
>From: linux-omap-open-source-bounces@linux.omap.com [mailto:linux-omap-
>open-source-bounces@linux.omap.com] On Behalf Of Woodruff, Richard
>Sent: Tuesday, May 08, 2007 12:45 PM
>To: Tony Lindgren; linux-omap-open-source@linux.omap.com
>Subject: RE: Git tree updated
>
>I noticed that MMC doesn't compile either.
>
>The include/linux/mmc/card.h structure mmc_card changed removing the
>'node' element.
>
>Regards,
>Richard W.
>
>> -----Original Message-----
>> From: linux-omap-open-source-bounces@linux.omap.com
>[mailto:linux-omap-
>> open-source-bounces@linux.omap.com] On Behalf Of Tony Lindgren
>> Sent: Monday, May 07, 2007 10:20 PM
>> To: linux-omap-open-source@linux.omap.com
>> Subject: Git tree updated
>>
>> Hi all,
>>
>> I've updated our git tree to be in sync with mainline tree as Russell
>> has merged some of our pending patches.
>>
>> Looks like 24xx does not currently boot, it seems to hang at
>> devicemaps_init(). I've verified that at least 16xx boots.
>>
>> I'll have to continue debugging the 24xx devicemaps_init issue
>tomorrow,
>> if somebody gets it working before that, please post the patch :)
>>
>> Regards,
>>
>> Tony
>> _______________________________________________
>> Linux-omap-open-source mailing list
>> Linux-omap-open-source@linux.omap.com
>> http://linux.omap.com/mailman/listinfo/linux-omap-open-source
>_______________________________________________
>Linux-omap-open-source mailing list
>Linux-omap-open-source@linux.omap.com
>http://linux.omap.com/mailman/listinfo/linux-omap-open-source

Re: Git tree updated

[Tony Lindgren]

* Syed Mohammed, Khasim <x0khasim@ti.com> [070508 10:52]:
> Yeah, I was also getting an error for the "if(i2c_del_driver" in twl4030 driver. The i2c_del_driver is a void function and we were testing the return condition.
> 
> static void __exit twl4030_exit(void)
> {
>         if (i2c_del_driver(&twl4030_driver))
>                 printk(KERN_ERR
>                         "TWL4030: Driver remove failed, module not removed\n");
> 
> Temporarily I disabled MMC and corrected io.c and T2. 2430 SDP hangs while booting, I think this is what Tony was debugging yesterday.

Yeah, I thought Trilok's patch fixed this, but it seems it not the
case, 24xx still does not boot.

Tony

RE: Git tree updated

[Syed Mohammed, Khasim]

>Yeah, I thought Trilok's patch fixed this, but it seems it not the
>case, 24xx still does not boot.

I applied Trilok's patch, but still it doesn't boot on 2430 SDP. Need to debug more. 

Regards,
Khasim

Re: Git tree updated

[Tony Lindgren]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

* Syed Mohammed, Khasim <x0khasim@ti.com> [070508 11:02]:
> >Yeah, I thought Trilok's patch fixed this, but it seems it not the
> >case, 24xx still does not boot.
> 
> I applied Trilok's patch, but still it doesn't boot on 2430 SDP. Need to debug more. 

Found it, see below.

Tony


[-- Attachment #2: fix-24xx-boot.patch --]
[-- Type: text/x-diff, Size: 482 bytes --]

Fix booting of 24xx

Looks like automerge again...

Signed-off-by: Tony Lindgren <tony@atomide.com>

--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -42,6 +42,12 @@ static struct map_desc omap2_io_desc[] __initdata = {
 		.length		= L3_24XX_SIZE,
 		.type		= MT_DEVICE
 	},
+	{
+		.virtual	= L4_24XX_VIRT,
+		.pfn		= __phys_to_pfn(L4_24XX_PHYS),
+		.length		= L4_24XX_SIZE,
+		.type		= MT_DEVICE
+	},
 #ifdef CONFIG_ARCH_OMAP2430
 	{
 		.virtual	= L4_WK_243X_VIRT,

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

RE: Git tree updated

[Syed Mohammed, Khasim]

Hi Tony,

>> I applied Trilok's patch, but still it doesn't boot on 2430 SDP. Need to
>debug more.
>
>Found it, see below.
>

This boots on 2430.

Thanks.

Regards,
Khasim

Re: Git tree updated

[Dirk Behme]

Tony Lindgren wrote:
> I've updated our git tree to be in sync with mainline tree as Russell
> has merged some of our pending patches.

Looks like some stuff went upstream:

http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git&a=search&h=HEAD&st=commit&s=OMAP

:)

Dirk

Re: Git tree updated

[Tony Lindgren]

* Dirk Behme <dirk.behme@googlemail.com> [070510 08:49]:
> Tony Lindgren wrote:
> >I've updated our git tree to be in sync with mainline tree as Russell
> >has merged some of our pending patches.
> 
> Looks like some stuff went upstream:
> 
> http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git&a=search&h=HEAD&st=commit&s=OMAP
> 
> :)

Yeah cool. That's all Russell's going to merge this time so
we have to wait for next merge window again to get more merged.

Tony

Git tree updated

[Tony Lindgren]

Hi all,

I've updated our git tree to 2.6.22 and posted 2.6.22-omap1 to the
usual places.

I've also merged Khasim's 3430 patches which should not affect other
platforms. Please report in case you see some breakage.

I'm mostly on vacation during July, so my response time may be slow,
I'll try to check my email few times a week though :)

Regards,

Tony

RE: Git tree updated

[Syed Mohammed, Khasim]

>I've updated our git tree to 2.6.22 and posted 2.6.22-omap1 to the
>usual places.
>
>I've also merged Khasim's 3430 patches which should not affect other
>platforms. Please report in case you see some breakage.
>
>I'm mostly on vacation during July, so my response time may be slow,
>I'll try to check my email few times a week though :)
>

I validated 2420 H4, 2430 SDP and 3430 SDP on this merge. Every thing seems to be booting fine, I didn't find any new issues as such.

Tony, thanks for considering 3430 patches and working during vacation :)

Regards,
Khasim

RE: Git tree updated

[Kyungmin Park]

> >I've updated our git tree to 2.6.22 and posted 2.6.22-omap1 to the
> >usual places.
> >
> >I've also merged Khasim's 3430 patches which should not affect other
> >platforms. Please report in case you see some breakage.
> >
> >I'm mostly on vacation during July, so my response time may be slow,
> >I'll try to check my email few times a week though :)
> >
> 
> I validated 2420 H4, 2430 SDP and 3430 SDP on this merge. Every thing seems to be booting fine, I
> didn't find any new issues as such.
> 

It's OK with 2420 Apollon & Apollon Plus.

Thank you,
Kyungmin Park

Re: Git tree updated

[Luís Vitório Cargnini]

is the git tree of kernel org updated ?

On 7/11/07, Luís Cargnini <lvcargnini@gmail.com> wrote:
>
> s the git tree of kernel org updated ?
>
> On 7/11/07, Kyungmin Park <kyungmin.park@samsung.com> wrote:
> >
> > > >I've updated our git tree to 2.6.22 and posted 2.6.22-omap1 to the
> > > >usual places.
> > > >
> > > >I've also merged Khasim's 3430 patches which should not affect other
> > > >platforms. Please report in case you see some breakage.
> > > >
> > > >I'm mostly on vacation during July, so my response time may be slow,
> > > >I'll try to check my email few times a week though :)
> > > >
> > >
> > > I validated 2420 H4, 2430 SDP and 3430 SDP on this merge. Every thing
> > seems to be booting fine, I
> > > didn't find any new issues as such.
> > >
> >
> > It's OK with 2420 Apollon & Apollon Plus.
> >
> > Thank you,
> > Kyungmin Park
> >
> > _______________________________________________
> > Linux-omap-open-source mailing list
> > Linux-omap-open-source@linux.omap.com
> > http://linux.omap.com/mailman/listinfo/linux-omap-open-source
> >
>
>
>
> --
>
> ------------------------------------------------------------------------------
> Thanks && Regards
> Msc. Bsc. Luís Vitório Cargnini
> IEEE Member
> Electrical Engineer Faculty @ PUCRS
> Ipiranga Avenue, 6681 – Building 30
> P.O. Box: 90619-900 – Porto Alegre/RS
> Phone: +55 51 3320 3500  extension: 7696
> ---------------------------------------------------------------------------------
>
>



-- 
------------------------------------------------------------------------------
Thanks && Regards
Msc. Bsc. Luís Vitório Cargnini
IEEE Member
Electrical Engineer Faculty @ PUCRS
Ipiranga Avenue, 6681 – Building 30
P.O. Box: 90619-900 – Porto Alegre/RS
Phone: +55 51 3320 3500  extension: 7696
---------------------------------------------------------------------------------

Re: Git tree updated

[Nishanth Menon]

Luís Vitório Cargnini stated on 7/11/2007 8:44 PM:
> is the git tree of kernel org updated ?
>
http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=summary
and
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=summary
the history look the same... or is it some other tree that you are
looking for?

I am not sure of the tags though..
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=summary
shows a 2.6.22 tag of 3 days back, but omap tags 2.6.22-rc4! My
inexperience of git tells me the 2.6.22 merge is not complete.. but i
could be badly wrong..

> On 7/11/07, Luís Cargnini <lvcargnini@gmail.com> wrote:
Please dont top post..

Regards,
Nishanth Menon

Re: Git tree updated

[Luís Vitório Cargnini]

OK, thanks I will wait for the merge been complete


On 7/11/07, Nishanth Menon <menon.nishanth@gmail.com> wrote:
>
> Luís Vitório Cargnini stated on 7/11/2007 8:44 PM:
> > is the git tree of kernel org updated ?
> >
> http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=summary
> and
>
> http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=summary
> the history look the same... or is it some other tree that you are
> looking for?
>
> I am not sure of the tags though..
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=summary
> shows a 2.6.22 tag of 3 days back, but omap tags 2.6.22-rc4! My
> inexperience of git tells me the 2.6.22 merge is not complete.. but i
> could be badly wrong..
>
> > On 7/11/07, Luís Cargnini <lvcargnini@gmail.com> wrote:
> Please dont top post..
>
> Regards,
> Nishanth Menon
>



-- 
------------------------------------------------------------------------------
Thanks && Regards
Msc. Bsc. Luís Vitório Cargnini
IEEE Member
Electrical Engineer Faculty @ PUCRS
Ipiranga Avenue, 6681 – Building 30
P.O. Box: 90619-900 – Porto Alegre/RS
Phone: +55 51 3320 3500  extension: 7696
---------------------------------------------------------------------------------