Skip to contentSkip to conversation

Git tree updated

DISCUSSION Tony Lindgren 5 participants 11 messages May 8, 2007 – May 10, 2007

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Tony Lindgren

author maintainer
#0 lore raw

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

#1 lore raw

Tony,

Quoted 11 lines · 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 :)

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

Signature · 1 line
--Trilok Soni

From 80b2b47d373c840903e8c4dfa68b1485cd490c83 Mon Sep 17 00:00:00 2001
From: Trilok Soni <[email protected]>
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 <[email protected]>
---
 arch/arm/mach-omap2/io.c |   44 --------------------------------------------
 1 files changed, 0 insertions(+), 44 deletions(-)
arch/arm/mach-omap2/io.c +0 -44
index a88bd1e..fba2e86 100644
@@ -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)
Signature · 1 line
1.5.0
author maintainer
#2 lore raw
Quoted 11 lines · Trilok Soni

Tony,

Quoted 8 lines · 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.

Quoted 7 lines
Quoted 3 lines

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

#3 lore raw
In reply to Tony Lindgren

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.

Quoted 2 lines

-----Original Message-----
From: [email protected]

[mailto:linux-omap-

Quoted 7 lines

[email protected]] On Behalf Of Tony Lindgren
Sent: Monday, May 07, 2007 10:20 PM
To: [email protected]
Subject: Git tree updated

Hi all,

Quoted 7 lines

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,

Quoted 9 lines

if somebody gets it working before that, please post the patch :)

Regards,

Tony
_______________________________________________
Linux-omap-open-source mailing list
[email protected]
http://linux.omap.com/mailman/listinfo/linux-omap-open-source

#4 lore raw

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
Quoted 46 lines

-----Original Message-----
From: [email protected] [mailto:linux-omap- [email protected]] On Behalf Of Woodruff, Richard
Sent: Tuesday, May 08, 2007 12:45 PM
To: Tony Lindgren; [email protected]
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.

Quoted 2 lines

-----Original Message-----
From: [email protected]

[mailto:linux-omap-

Quoted 7 lines

[email protected]] On Behalf Of Tony Lindgren
Sent: Monday, May 07, 2007 10:20 PM
To: [email protected]
Subject: Git tree updated

Hi all,

Quoted 7 lines

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,

Quoted 9 lines

if somebody gets it working before that, please post the patch :)

Regards,

Tony
_______________________________________________
Linux-omap-open-source mailing list
[email protected]
http://linux.omap.com/mailman/listinfo/linux-omap-open-source

_______________________________________________
Linux-omap-open-source mailing list
[email protected]
http://linux.omap.com/mailman/listinfo/linux-omap-open-source

author maintainer
#5 lore raw
Quoted 9 lines · 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.

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

Tony

#6 lore raw
Quoted 2 lines

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

author maintainer
#7 lore raw
Quoted 4 lines · Syed Mohammed, Khasim
Quoted 2 lines

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

Fix booting of 24xx

Looks like automerge again...

Signed-off-by Tony Lindgren <[email protected]>
arch/arm/mach-omap2/io.c +6 -0
@@ -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,
#8 lore raw

Hi Tony,

Quoted 5 lines
Quoted 1 line

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

author maintainer
#10 lore raw
Quoted 9 lines · Dirk Behme
Quoted 2 lines · Tony Lindgren

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