From 2f96937eff7b5b6edd96603328fe6a1444fa1c2c Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Wed, 15 Sep 2010 22:40:19 +0530
Subject: [PATCH] --- yaml --- r: 216912 b: refs/heads/master c:
 455d4d2dc76471baec0c70daf8ff6c09fc743c24 h: refs/heads/master v: v3

---
 [refs]                                                        | 2 +-
 .../arch/arm/configs/{omap3_defconfig => omap2plus_defconfig} | 3 +++
 trunk/arch/arm/mach-omap2/Kconfig                             | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename trunk/arch/arm/configs/{omap3_defconfig => omap2plus_defconfig} (99%)

diff --git a/[refs] b/[refs]
index a9b2d9675312..5bbc5a91a95d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61e9beafdd6f2b2d27ad5935a2de9c46709b9671
+refs/heads/master: 455d4d2dc76471baec0c70daf8ff6c09fc743c24
diff --git a/trunk/arch/arm/configs/omap3_defconfig b/trunk/arch/arm/configs/omap2plus_defconfig
similarity index 99%
rename from trunk/arch/arm/configs/omap3_defconfig
rename to trunk/arch/arm/configs/omap2plus_defconfig
index 833a9bccb6af..3d27dd0ed409 100644
--- a/trunk/arch/arm/configs/omap3_defconfig
+++ b/trunk/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/trunk/arch/arm/mach-omap2/Kconfig b/trunk/arch/arm/mach-omap2/Kconfig
index b48bacf0a7aa..bb85f24c3643 100644
--- a/trunk/arch/arm/mach-omap2/Kconfig
+++ b/trunk/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