configs: update to a working u8500 defconfig

U5500 & CW1200 withdrawn (To be fixed)

Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>

Conflicts:

	arch/arm/configs/u8500_defconfig

1 files changed, 13 insertions, 31 deletions

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 43daa8e8e9b..655276b6718 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -8,8 +8,8 @@ CONFIG_CGROUPS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS_ALL=y
+CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
 CONFIG_BOOTTIME=y
@@ -23,11 +23,8 @@ CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y
-CONFIG_MACH_U8500_SNOWBALL=y
-CONFIG_MACH_U5500=y
 CONFIG_UX500_PRCMU_TIMER=y
 CONFIG_DB8500_MLOADER=y
-CONFIG_UX500_DEBUG_HWREG=y
 CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y
 CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
 CONFIG_DISPLAY_AV8100_TERTIARY=y
@@ -35,8 +32,6 @@ CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER=y
 CONFIG_UX500_SUSPEND=y
 CONFIG_UX500_SUSPEND_STANDBY=y
 CONFIG_UX500_SUSPEND_MEM=y
-CONFIG_UX500_SUSPEND_DBG=y
-CONFIG_UX500_SUSPEND_DBG_WAKE_ON_UART=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SMP=y
@@ -57,7 +52,6 @@ CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM=y
 CONFIG_PM_RUNTIME=y
 CONFIG_NET=y
 CONFIG_PACKET=y
@@ -81,7 +75,6 @@ CONFIG_IP_NF_FILTER=y
 CONFIG_NF_NAT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_PHONET=y
-CONFIG_PHONET_PIPECTRLR=y
 CONFIG_NET_SCHED=y
 CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
@@ -91,6 +84,8 @@ CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
 CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
@@ -104,14 +99,6 @@ CONFIG_BLK_DEV_RAM_SIZE=73728
 CONFIG_MISC_DEVICES=y
 CONFIG_AB8500_PWM=y
 CONFIG_SENSORS_BH1780=y
-CONFIG_NETDEVICES=y
-CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMSC911X=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_STE_TRACE_MODEM=y
 CONFIG_STM_TRACE=y
 CONFIG_U8500_SHRM=y
@@ -128,6 +115,9 @@ CONFIG_TUN=y
 CONFIG_SMSC_PHY=y
 CONFIG_NET_ETHERNET=y
 CONFIG_SMSC911X=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
@@ -180,9 +170,9 @@ CONFIG_VIDEO_DEV=y
 # CONFIG_VIDEO_CAPTURE_DRIVERS is not set
 CONFIG_FB=y
 CONFIG_FB_MCDE=y
+CONFIG_AV8100_HWTRIG_I2SDAT3=y
 CONFIG_FB_B2R2=y
 CONFIG_B2R2_PLUG_CONF=y
-CONFIG_AV8100_HWTRIG_I2SDAT3=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
@@ -198,6 +188,7 @@ CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG_WHITELIST is not set
 CONFIG_USB_MON=y
 CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_UX500=y
 CONFIG_USB_MUSB_OTG=y
 CONFIG_USB_GADGET_MUSB_HDRC=y
 CONFIG_USB_ACM=y
@@ -214,8 +205,8 @@ CONFIG_USB_G_MULTI=m
 # CONFIG_USB_G_MULTI_RNDIS is not set
 CONFIG_AB8500_USB=y
 CONFIG_MMC=y
-CONFIG_MMC_CLKGATE=y
 CONFIG_MMC_UNSAFE_RESUME=y
+CONFIG_MMC_CLKGATE=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_ARMMMCI=y
 CONFIG_NEW_LEDS=y
@@ -229,10 +220,6 @@ CONFIG_RTC_DRV_AB8500=y
 CONFIG_DMADEVICES=y
 CONFIG_STE_DMA40=y
 CONFIG_STAGING=y
-CONFIG_U8500_MMIO=y
-CONFIG_U8500_CM=y
-CONFIG_U8500_FLASH=y
-CONFIG_AUTOFS_FS=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
 CONFIG_CG2900=y
 CONFIG_CG2900_CHIP=y
@@ -241,9 +228,9 @@ CONFIG_CG2900_UART=y
 CONFIG_CG2900_AUDIO=y
 CONFIG_CG2900_TEST=y
 CONFIG_BT_CG2900=y
-CONFIG_CW1200=m
-CONFIG_CW1200_NON_POWER_OF_TWO_BLOCKSIZES=y
-CONFIG_CW1200_USE_GPIO_IRQ=y
+CONFIG_U8500_MMIO=y
+CONFIG_U8500_CM=y
+CONFIG_U8500_FLASH=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
@@ -293,14 +280,9 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_DEBUG_INFO=y
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_USER=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SCHED_TRACER=y
-CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_FTRACE is not set
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_ERRORS=y
 CONFIG_KEYS=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_MD5=m