config: Align u8500_defconfig with STE internal defconfig

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

1 files changed, 6 insertions, 25 deletions

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index c6a1a58850a..c4ca3504034 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -33,8 +33,6 @@ CONFIG_UX500_SUSPEND_MEM=y
 CONFIG_UX500_SUSPEND_DBG=y
 CONFIG_UX500_SUSPEND_DBG_WAKE_ON_UART=y
 CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
-CONFIG_U8500_TV_OUTPUT_AV8100=y
-CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER=y
 CONFIG_DB8500_MLOADER=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -55,7 +53,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_IDLE=y
-CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_PM_RUNTIME=y
@@ -79,6 +76,7 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_QUEUE=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_FTP=y
 CONFIG_NF_CT_NETLINK=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
@@ -86,8 +84,6 @@ CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_ULOG=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_NAT_FTP=y
 CONFIG_NF_NAT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_PHONET=y
@@ -140,11 +136,9 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_NOMADIK_SKE=y
-CONFIG_KEYBOARD_STMPE=y
 CONFIG_KEYBOARD_TC3589X=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_BU21013=y
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=y
 CONFIG_TOUCHSCREEN_CYTTSP_SPI=y
 CONFIG_INPUT_MISC=y
@@ -177,20 +171,19 @@ CONFIG_SENSORS_LSM303DLHC=y
 CONFIG_SENSORS_L3G4200D=y
 CONFIG_WATCHDOG=y
 CONFIG_UX500_WATCHDOG_DEBUG=y
-CONFIG_TPS6105X=y
-CONFIG_MFD_STMPE=y
 CONFIG_MFD_TC3589X=y
 CONFIG_AB5500_CORE=y
 CONFIG_AB8500_CORE=y
+CONFIG_MFD_DB8500_PRCMU=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_DEBUG=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_AB8500=y
 CONFIG_REGULATOR_DB8500_PRCMU=y
 CONFIG_REGULATOR_AB8500_DEBUG=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
 # CONFIG_VIDEO_CAPTURE_DRIVERS is not set
 CONFIG_RADIO_CG2900=y
 CONFIG_DRM=y
@@ -198,8 +191,9 @@ CONFIG_GPU_MALI=y
 CONFIG_FB=y
 CONFIG_FB_MCDE=y
 CONFIG_MCDE_FB_AVOID_REALLOC=y
-CONFIG_MCDE_DISPLAY_SONY_ACX424AKP_DSI=y
 CONFIG_MCDE_DISPLAY_SAMSUNG_S6D16D0=y
+CONFIG_MCDE_DISPLAY_SONY_ACX424AKP_DSI=y
+CONFIG_MCDE_DISPLAY_AV8100=y
 # CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE is not set
 CONFIG_AV8100_HWTRIG_I2SDAT3=y
 CONFIG_FB_B2R2=y
@@ -238,13 +232,11 @@ CONFIG_USB_G_HID=m
 CONFIG_AB8500_USB=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
+CONFIG_MMC_BLOCK_MINORS=32
 # CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_ARMMMCI=y
-CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_LM3530=y
-CONFIG_LEDS_LP5521=y
 CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
@@ -270,7 +262,6 @@ CONFIG_U8500_MMIO=y
 CONFIG_U8500_CM=y
 CONFIG_U8500_FLASH=y
 CONFIG_HSEM_U8500=y
-CONFIG_MODEM=y
 CONFIG_MODEM_U8500=y
 CONFIG_U8500_SHRM=y
 CONFIG_U8500_SHRM_MODEM_SILENT_RESET=y
@@ -285,23 +276,13 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_QUOTA=y
 CONFIG_QFMT_V2=y
-CONFIG_AUTOFS4_FS=m
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_HFS_FS=m
-CONFIG_BEFS_FS=m
-CONFIG_CRAMFS=m
-CONFIG_VXFS_FS=m
-CONFIG_MINIX_FS=m
-CONFIG_ROMFS_FS=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
 CONFIG_9P_FS=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_BLKDEV_PARTITION=y