config: Update the u8500 def config

Change-Id: I6f0959ab3d5496d54d35cdf74354b27d616ba8cf
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>

1 files changed, 19 insertions, 120 deletions

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 270ea71edaf..70ad5d8ce98 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -23,41 +23,17 @@ CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y
-CONFIG_U8500_REGULATOR_DEBUG=y
+CONFIG_DBX500_PRCMU_DEBUG=y
 CONFIG_DB8500_MLOADER=y
-CONFIG_DISPLAY_GENERIC_PRIMARY=y
-CONFIG_DISPLAY_GENERIC_DSI_PRIMARY=y
 CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y
-CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_90=y
-CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_ANGLE=90
 CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
 CONFIG_DISPLAY_AV8100_TERTIARY=y
 CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER=y
-CONFIG_DBX500_PRCMU_QOS_POWER=y
-CONFIG_DBX500_PRCMU_DEBUG=y
-CONFIG_CPU_IDLE=y
-CONFIG_UX500_CPUIDLE=y
-# CONFIG_UX500_DEBUG_NO_LAUTERBACH is not set
-CONFIG_U8500_CPUIDLE_DEEPEST_STATE=2
-CONFIG_UX500_CPUIDLE_DEBUG=y
-CONFIG_UX500_SOC_DB5500=y
-CONFIG_MACH_U5500=y
-CONFIG_UX500_DEBUG_UART=0
-CONFIG_U5500_MLOADER=y
-CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
-CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY=y
 CONFIG_UX500_SUSPEND=y
-CONFIG_UX500_SUSPEND_DBG=y
-CONFIG_UX500_SUSPEND_DBG_WAKE_ON_UART=y
 CONFIG_UX500_SUSPEND_STANDBY=y
 CONFIG_UX500_SUSPEND_MEM=y
-CONFIG_UX500_CONTEXT=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=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
@@ -68,6 +44,15 @@ CONFIG_HIGHMEM=y
 CONFIG_CMDLINE="root=/dev/ram0 init=init rw console=ttyAMA2,115200n8 mem=256M initrd=0x800000,72M"
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_IDLE=y
+CONFIG_U8500_CPUIDLE_DEEPEST_STATE=2
+CONFIG_UX500_CPUIDLE_DEBUG=y
 CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -77,13 +62,9 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=y
-# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
 CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_LRO is not set
@@ -93,7 +74,6 @@ CONFIG_IPV6=y
 # CONFIG_INET6_XFRM_MODE_BEET is not set
 # CONFIG_IPV6_SIT is not set
 CONFIG_NETFILTER=y
-CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_NETLINK_QUEUE=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
@@ -108,7 +88,6 @@ CONFIG_NF_NAT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_PHONET=y
 CONFIG_NET_SCHED=y
-# CONFIG_IPV6 is not set
 CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=y
@@ -117,40 +96,11 @@ CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
-CONFIG_AVERAGE=y
-
-#WIRELESS
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_COMPAT_WIRELESS=y
-CONFIG_COMPAT_WIRELESS_MODULES=y
 CONFIG_CFG80211=y
-CONFIG_COMPAT_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_COMPAT_RFKILL=y
 CONFIG_NL80211_TESTMODE=y
-CONFIG_CFG80211_DEFAULT_PS=y
 CONFIG_CFG80211_REG_DEBUG=y
-CONFIG_MAC80211_RC_PID=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_LEDS=y
-CONFIG_MAC80211_MESH=y
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
 # CONFIG_CFG80211_WEXT is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC80211_HAS_RC is not set
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-# CONFIG_MAC80211_RC_DEFAULT is not set
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-# CONFIG_WIMAX is not set
 CONFIG_RFKILL=y
-CONFIG_RFKILL_PM=y
-CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_NET_9P=y
 CONFIG_CAIF=y
@@ -163,9 +113,8 @@ CONFIG_MISC_DEVICES=y
 CONFIG_AB8500_PWM=y
 CONFIG_SENSORS_BH1780=y
 CONFIG_STE_TRACE_MODEM=y
-CONFIG_U8500_SIM_DETECT=y
-# CONFIG_STM_TRACE=y
 CONFIG_DISPDEV=y
+CONFIG_U8500_SIM_DETECT=y
 # CONFIG_STE_AUDIO_IO_DEV is not set
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
@@ -182,17 +131,8 @@ CONFIG_SMSC911X=y
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_WLAN is not set
 CONFIG_PPP=y
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
 CONFIG_PPP_ASYNC=y
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPP_DEFLATE is not set
-# CONFIG_PPP_BSDCOMP is not set
 CONFIG_PPP_MPPE=y
-# CONFIG_PPPOE is not set
-CONFIG_PPPOLAC=y
-CONFIG_PPPOPNS=y
-CONFIG_SLHC=y
 # CONFIG_INPUT_MOUSEDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
@@ -225,60 +165,33 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TC3589X=y
 CONFIG_GPIO_AB8500=y
 CONFIG_POWER_SUPPLY=y
-CONFIG_SENSORS_AB8500=y
 CONFIG_AB8500_BM=y
-CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=n
-CONFIG_AB5500_BM=y
-CONFIG_AB5500_BATTERY_THERM_ON_BATCTRL=y
-CONFIG_SENSORS_AB5500=y
+CONFIG_SENSORS_AB8500=y
 CONFIG_SENSORS_LSM303DLH=y
 CONFIG_SENSORS_L3G4200D=y
 CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_U8500_WATCHDOG_DEBUG=y
+CONFIG_TPS6105X=y
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_TC3589X=y
-CONFIG_MFD_DB8500_PRCMU=y
-CONFIG_TPS6105X=y
 CONFIG_AB5500_CORE=y
 CONFIG_AB8500_CORE=y
-CONFIG_MFD_DB5500_PRCMU=y
-CONFIG_REGULATOR=y
+CONFIG_MFD_DB8500_PRCMU=y
 CONFIG_REGULATOR_DEBUG=y
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_AB8500=y
 CONFIG_REGULATOR_DB8500_PRCMU=y
-CONFIG_REGULATOR_AB5500=y
-CONFIG_REGULATOR_DB5500_PRCMU=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_GPU_MALI=y
-CONFIG_GPU_MALI_DEBUG=y
 CONFIG_FB=y
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_MCDE=y
-CONFIG_MCDE_DISPLAY_GENERIC_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
 CONFIG_B2R2_PLUG_CONF=y
-CONFIG_B2R2_OPSIZE_64=y
-CONFIG_B2R2_CHSIZE_128=y
-CONFIG_B2R2_MGSIZE_128=y
-CONFIG_B2R2_PGSIZE_256=y
-CONFIG_B2R2_GENERIC=y
-CONFIG_B2R2_GENERIC_FALLBACK=y
-CONFIG_AV8100=y
-CONFIG_AV8100_HWTRIG_I2SDAT3=y
-CONFIG_DUMMY_CONSOLE=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
@@ -293,27 +206,19 @@ CONFIG_USB=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG_WHITELIST is not set
 CONFIG_USB_MON=y
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_UX500=y
-CONFIG_SND_SOC_U5500=y
-CONFIG_SND_SOC_UX500_AB5500=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
 CONFIG_USB_STORAGE=y
 CONFIG_USB_LIBUSUAL=y
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_MUSB_DEBUG=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_AB8500_USB=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_CLKGATE=y
-CONFIG_MMC_PARANOID_SD_INIT=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_ARMMMCI=y
 CONFIG_NEW_LEDS=y
@@ -323,7 +228,6 @@ CONFIG_LEDS_LP5521=y
 CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_SWITCH=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AB=y
 CONFIG_RTC_DRV_AB8500=y
@@ -346,7 +250,6 @@ CONFIG_MODEM=y
 CONFIG_MODEM_U8500=y
 CONFIG_U8500_SHRM=y
 CONFIG_U8500_SHRM_MODEM_SILENT_RESET=y
-CONFIG_U5500_MMIO=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
@@ -399,16 +302,12 @@ CONFIG_DEBUG_INFO=y
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
 CONFIG_KEYS=y
 CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_TWOFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_UX500=y
-# CONFIG_CRYPTO_DEV_UX500_CRYP is not set
 CONFIG_CRYPTO_DEV_UX500_HASH=y
 CONFIG_CRC7=y
 CONFIG_LIBCRC32C=m
+CONFIG_AVERAGE=y