> -----Original Message----- > From: Tony Lindgren [mailto:tony@atomide.com] > Sent: Wednesday, September 15, 2010 9:41 PM > To: Shilimkar, Santosh > Cc: Russell King - ARM Linux; linux-arm-kernel@lists.infradead.org; linux- > omap@vger.kernel.org; bryan.wu@canonical.com > Subject: Re: [PATCH] omap: Update omap3_defconfig to work with SMP_ON_UP > > * Shilimkar, Santosh [100914 23:03]: > > > > > > Sounds like you're having these problems anyways and they > > > are not related to the defconfigs? > > > > > Well the issues are because of defconfig but mostly fixable. > > Will hold on my comments till I test the new defconfig on OMAP4. > > OK > > > > Considering Linus' earlier comments on the defconfigs, I don't > > > see any reasonds not to merge this patch. If TI wants to fix up > > > some other things, there's still about two weeks before -rc6. > > > > > Sure. I am just saying let's attempt to fix the remaining issues > > and if it doesn't happen in next week, anyway this patch will > > get merged. > > OK let's plan on doing that. > Here is the patch which fixes most of the omap4 issues with common Omap3_defconfig. To enable local Timers for es1.0, I made some progress but looks like it needs more changes in generic code. Will have a look at it tomorrow. The patch is on top of the patches being discussed here. It's boot-tested with single image on OMAP3 and OMAP4 SMP. >From 26c908cd9baf3cc0b22f04f29cbeb26e08ad05e8 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Wed, 15 Sep 2010 22:40:19 +0530 Subject: [PATCH] omap: Update and rename common defconfig for omap2plus devices This patch addresses below things: - Renaming existing omap3_defconfig which has OMAP2, OMAP3 and OMAP4 builds enabled to more appropriate name 'omap2plus_defconfig' - L1 cache shift is suppose to be 5 on OMAP4 where as it is 6 on previous OMAPs. Keeping it to 5 is safer option for OMAP4 and previous OMAPs. For OMAP3 only build the shift would be still 6 - Enable needed Errata's for OMAP4 to work with DMA based device drivers CONFIG_PL310_ERRATA_588369=y CONFIG_ARM_ERRATA_720789=y - Enable the Micrel ethernet controller CONFIG_KS8851=y CONFIG_KS8851_MLL=y With above three changes, OMAP4 ethernet, mmc etc works reliably. Signed-off-by: Santosh Shilimkar --- .../{omap3_defconfig => omap2plus_defconfig} | 3 +++ arch/arm/mach-omap2/Kconfig | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) rename arch/arm/configs/{omap3_defconfig => omap2plus_defconfig} (99%) diff --git a/arch/arm/configs/omap3_defconfig b/arch/arm/configs/omap2plus_defconfig similarity index 99% rename from arch/arm/configs/omap3_defconfig rename to arch/arm/configs/omap2plus_defconfig index 833a9bc..3d27dd0 100644 --- a/arch/arm/configs/omap3_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -53,6 +53,7 @@ CONFIG_MACH_SBC3530=y CONFIG_MACH_OMAP_3630SDP=y CONFIG_MACH_OMAP_4430SDP=y CONFIG_ARM_THUMBEE=y +CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y @@ -139,6 +140,8 @@ CONFIG_SMSC_PHY=y CONFIG_NET_ETHERNET=y CONFIG_SMC91X=y CONFIG_SMSC911X=y +CONFIG_KS8851=y +CONFIG_KS8851_MLL=y CONFIG_LIBERTAS=y CONFIG_LIBERTAS_USB=y CONFIG_LIBERTAS_SDIO=y diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index b48bacf..bb85f24 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -35,7 +35,7 @@ config ARCH_OMAP3 default y select CPU_V7 select USB_ARCH_HAS_EHCI - select ARM_L1_CACHE_SHIFT_6 + select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4 config ARCH_OMAP4 bool "TI OMAP4" @@ -43,6 +43,8 @@ config ARCH_OMAP4 depends on ARCH_OMAP2PLUS select CPU_V7 select ARM_GIC + select PL310_ERRATA_588369 + select ARM_ERRATA_720789 comment "OMAP Core Type" depends on ARCH_OMAP2 -- 1.6.0.4