[U9500]:arm:config: Update u9500_defconfig with 8500 updates

Here is the list of changes:
* misc: audio_io: Remove obsolete and unused driver
* u8500: Enable IP multicast
* defconfig: enable SW reset feature
* U8500: enable again the STM trace driver
* ARM: u8500: configs: Enable regulator suspend force
* u8500_defconfig: Enable ip rule support (339665)
* ARM: config: u8500: Enable DB8500 regulators
* ARM: ux500: Use u8500_wdt
* u8500: watchdog: Reset to mainline status
* cpuidle: only go to ApIdle
* drivers:cpuidle U8500 support
* ARM: ux500: suspend_dbg: Add debug information
* ARM: ux500: suspend: Add wake on uart
* ARM: ux500: Add suspend support
* ARM: u8500: config: Enable cpufreq
* ARM: ux500: pm: Added context and pm
* ARM: ux500: Add prcmu-debug
* ARM: ux500: Add prcmu qos power
* ARM: ux500: Replace mach prcmu driver with mainlined version
* ARM: ux500: Remove powersave
* arm: u8500: Disable HDMI fb auto creation (364125)
* ARM: u8500: Not every u8500 has a TPS6105

ST-Ericsson Linux next: -
ST-Ericsson ID: 339665, 364125, 363600, 340331, 355020, 353690
ST-Ericsson FOSS-OUT ID: Trivial

Change-Id: Ic6a568411a70ed40e7ca3a14a4dfef0e17fc8543

Original Change-Ids:
 I4641468e1d67e8596b1fcd9af69b0b81b686a0a0
 Id652d38efceef6585fbb2505750edbacbc9e82a9
 I61e0026c248f4a4f1078a988b0dcd395140e5510
 I458d4565a5d1dedf84fbbc0c614daf80a9810693
 I26ba2f655d4fb65708913cdeda632e2ca35fea0a
 I3a570cdf0dbdbea2b2279428fa10d8a1fc63f659
 Ieb69b0092465a71e7233cc63bddb149998f96410
 I48b2a181e091c3095299646be376b7953a7d849c
 I14fd6f9990e3fe58671ff256baa8e6dfa0376b1f
 I952f7521284a41af56698cd8fc72b833210ea30e
 I792d4c1b4d78f3cf67cc0c0150f0c93341d81979
 I48792f56b4edc3fb93897d89ad18402a27652a4b
 Ia9ae6894333ee8d696a2b946b565496e1c26554f
 I039557aed52693dfad9b76ea0f2f746193aa4316
 I6d29a32251144e3ff33841516ea265ea9964f46e
 I1cfccc33d6e412dfcaaf1793ce19ea27c4b3b724
 I810ae725fe1914ff605cf9704f8bdfb1a07b8f9b
 Ic803dcddb6656c4c4be82b49b11530624942012d
 I0c8d97679ee186ca8205aeeafa0030568f540d2e
 I8ceaa65e5e0905fcd85bf8e793b4a5ab2d2df64c
 I4098a7640a91c7f2695748a7a7ddf96f16e7981b
 Iae2433a2060f2415dfcd30dd7a16338728b91ec2

Change-Id: Ic6a568411a70ed40e7ca3a14a4dfef0e17fc8543
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32735
Reviewed-by: Derek MORTON <derek.morton@stericsson.com>
Reviewed-by: Yann GAUTIER <yann.gautier@stericsson.com>
Tested-by: Yann GAUTIER <yann.gautier@stericsson.com>
Reviewed-by: Christophe GUIBOUT <christophe.guibout@stericsson.com>
Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>

1 files changed, 51 insertions, 16 deletions

diff --git a/arch/arm/configs/u9500_defconfig b/arch/arm/configs/u9500_defconfig
index 2c0d06f7259..c00f4825d14 100755
--- a/arch/arm/configs/u9500_defconfig
+++ b/arch/arm/configs/u9500_defconfig
@@ -24,9 +24,6 @@ CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y
-CONFIG_UX500_PRCMU_TIMER=y
-CONFIG_U8500_PRCMU=y
-CONFIG_UX500_PRCMU_DEBUG=y
 CONFIG_U8500_REGULATOR_DEBUG=y
 CONFIG_DB8500_MLOADER=y
 CONFIG_DISPLAY_GENERIC_PRIMARY=y
@@ -37,13 +34,25 @@ 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_U8500_CPUIDLE_DEBUG=y
+CONFIG_UX500_CPUIDLE_DEBUG=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_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_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SMP=y
@@ -53,14 +62,8 @@ CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 CONFIG_CMDLINE="root=/dev/ram0 init=init rw console=ttyAMA2,115200n8 mem=256M initrd=0x800000,72M"
 CONFIG_KEXEC=y
+CONFIG_CRASH_SWRESET=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_FPE_NWFPE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -70,7 +73,16 @@ CONFIG_PM_RUNTIME=y
 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_MULTICAST=y
+# CONFIG_IP_MROUTE is not set
+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
@@ -81,12 +93,17 @@ CONFIG_IPV6=y
 # CONFIG_IPV6_SIT is not set
 # CONFIG_ANDROID_PARANOID_NETWORK is not set
 CONFIG_NETFILTER=y
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_QUEUE=y
+CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CT_NETLINK=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_ULOG=y
 CONFIG_NF_NAT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_PHONET=y
@@ -103,6 +120,7 @@ CONFIG_BT_HIDP=y
 CONFIG_AVERAGE=y
 
 #WIRELESS
+CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_COMPAT_WIRELESS=y
 CONFIG_COMPAT_WIRELESS_MODULES=y
@@ -147,9 +165,8 @@ CONFIG_MISC_DEVICES=y
 CONFIG_AB8500_PWM=y
 CONFIG_SENSORS_BH1780=y
 CONFIG_STE_TRACE_MODEM=y
-# CONFIG_STM_TRACE=y
+CONFIG_STM_TRACE=y
 CONFIG_DISPDEV=y
-# CONFIG_STE_AUDIO_IO_DEV is not set
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_MD=y
@@ -167,6 +184,18 @@ CONFIG_SMSC911X=y
 CONFIG_CAIF_TTY=m
 # CONFIG_CAIF_SPI_SLAVE is not set
 CONFIG_CAIF_HSI=m
+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
@@ -213,13 +242,19 @@ CONFIG_SENSORS_DBX500=y
 CONFIG_SENSORS_LSM303DLH=y
 CONFIG_SENSORS_L3G4200D=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_U8500_WATCHDOG_DEBUG=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_REGULATOR_DEBUG=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_AB8500=y
+CONFIG_REGULATOR_AB8500_DEBUG=y
+CONFIG_REGULATOR_DB8500_PRCMU=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_COMMON=y
@@ -243,7 +278,7 @@ 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=y
+# CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE is not set
 CONFIG_FB_B2R2=y
 CONFIG_B2R2_PLUG_CONF=y
 CONFIG_B2R2_OPSIZE_64=y