update all defconfigs for v2.6.34 and SI label u8500-android-2.1_r1_v0.0.11

Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: I5ab68676138970b2a8e99e0a6ebef19d76c9121a
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2414
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>

4 files changed, 140 insertions, 63 deletions

diff --git a/arch/arm/configs/mop500_USB_HOST_defconfig b/arch/arm/configs/mop500_USB_HOST_defconfig
index 4d5baad47af..3a42dd86f9d 100755
--- a/arch/arm/configs/mop500_USB_HOST_defconfig
+++ b/arch/arm/configs/mop500_USB_HOST_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Mon May 31 15:00:14 2010
+# Mon Jun 14 15:39:50 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -251,7 +251,7 @@ CONFIG_STM_DMA=y
 #
 
 #
-# Display Selection
+# Display selection
 #
 CONFIG_DISPLAY_GENERIC_DSI_PRIMARY=y
 # CONFIG_DISPLAY_GENERIC_DSI_SECONDARY is not set
@@ -548,16 +548,17 @@ CONFIG_MAC80211_LEDS=y
 #
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_SOCK=m
 CONFIG_CAIF_NETDEV=m
 CONFIG_CAIF_CHARDEV=m
+CONFIG_CAIF_KERNEL_API=m
 
 #
 # CAIF transport drivers
 #
 CONFIG_CAIF_TTY=m
-# CONFIG_CAIF_PHYIF_MSPI is not set
-# CONFIG_CAIF_PHYIF_SSPI is not set
+# CONFIG_CAIF_TTY_NOFCS is not set
+# CONFIG_CAIF_SPI_MASTER is not set
+# CONFIG_CAIF_SPI_SLAVE is not set
 # CONFIG_CAIF_SHM is not set
 # CONFIG_CAIF_LOOPBACK is not set
 
@@ -635,10 +636,11 @@ CONFIG_U8500_HSI_MODEM_EXTERNAL=y
 # CONFIG_U8500_HSI_MODEM_INTERNAL is not set
 CONFIG_U8500_HSI_MODEM_DIRECTION=0x1
 CONFIG_U8500_SHRM=y
-# CONFIG_ED_V1_VERSION is not set
-CONFIG_V1_UPDATES_VERSION=y
+# CONFIG_SHRM_ED_V1_VERSION is not set
+CONFIG_SHRM_V1_UPDATES_VERSION=y
 # CONFIG_U8500_SHRM_LOOP_BACK is not set
 CONFIG_STE_AUDIO_IO_DEV=y
+# CONFIG_AB8500_DENC is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -757,6 +759,9 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_TC35893_KEYPAD=y
+# CONFIG_TC_KEYPAD_POLL is not set
+CONFIG_TC_KEYPAD_INTR=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
@@ -784,9 +789,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
-CONFIG_TOUCHSCREEN_BU21013=y
-CONFIG_BU21013_TSC_CNTL1=y
-# CONFIG_BU21013_TSC_CNTL2 is not set
 # CONFIG_INPUT_MISC is not set
 
 #
@@ -986,15 +988,15 @@ CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -1006,8 +1008,9 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 #
 CONFIG_FB_MCDE=y
 CONFIG_MCDE_DISPLAY_GENERIC_DSI=y
+# CONFIG_MCDE_DISPLAY_AV8100 is not set
 # CONFIG_MCDE_DISPLAY_AB8500_DENC is not set
-# CONFIG_MCDE_DISPLAY_AV8100  is not set
+# CONFIG_FB_MCDE_DEBUG is not set
 # CONFIG_FB_ARMCLCD is not set
 CONFIG_FB_B2R2=y
 # CONFIG_FB_S1D13XXX is not set
@@ -1021,6 +1024,7 @@ CONFIG_FB_B2R2=y
 # Display device support
 #
 # CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_AV8100 is not set
 
 #
 # Console display driver support
@@ -1220,6 +1224,7 @@ CONFIG_LEDS_CLASS=y
 #
 # LED drivers
 #
+CONFIG_LEDS_AB8500=y
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_LP3944 is not set
@@ -1460,6 +1465,7 @@ CONFIG_CIFS_DEBUG2=y
 # Partition Types
 #
 # CONFIG_PARTITION_ADVANCED is not set
+# CONFIG_BLKDEV_PARTITION is not set
 CONFIG_MSDOS_PARTITION=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
diff --git a/arch/arm/configs/mop500_defconfig b/arch/arm/configs/mop500_defconfig
index d5a6b934a81..d92422605ff 100755
--- a/arch/arm/configs/mop500_defconfig
+++ b/arch/arm/configs/mop500_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Mon May 31 14:57:31 2010
+# Mon Jun 14 15:40:43 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -250,7 +250,7 @@ CONFIG_STM_DMA=y
 #
 
 #
-# Display Selection
+# Display selection
 #
 CONFIG_DISPLAY_GENERIC_DSI_PRIMARY=y
 # CONFIG_DISPLAY_GENERIC_DSI_SECONDARY is not set
@@ -665,16 +665,17 @@ CONFIG_RFKILL_INPUT=y
 #
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_SOCK=m
 CONFIG_CAIF_NETDEV=m
 CONFIG_CAIF_CHARDEV=m
+CONFIG_CAIF_KERNEL_API=m
 
 #
 # CAIF transport drivers
 #
 CONFIG_CAIF_TTY=m
-# CONFIG_CAIF_PHYIF_MSPI is not set
-# CONFIG_CAIF_PHYIF_SSPI is not set
+# CONFIG_CAIF_TTY_NOFCS is not set
+# CONFIG_CAIF_SPI_MASTER is not set
+# CONFIG_CAIF_SPI_SLAVE is not set
 # CONFIG_CAIF_SHM is not set
 # CONFIG_CAIF_LOOPBACK is not set
 
@@ -752,10 +753,11 @@ CONFIG_U8500_HSI_MODEM_EXTERNAL=y
 # CONFIG_U8500_HSI_MODEM_INTERNAL is not set
 CONFIG_U8500_HSI_MODEM_DIRECTION=0x1
 CONFIG_U8500_SHRM=y
-CONFIG_ED_V1_VERSION=y
-# CONFIG_V1_UPDATES_VERSION is not set
+# CONFIG_SHRM_ED_V1_VERSION is not set
+CONFIG_SHRM_V1_UPDATES_VERSION=y
 # CONFIG_U8500_SHRM_LOOP_BACK is not set
 CONFIG_STE_AUDIO_IO_DEV=y
+# CONFIG_AB8500_DENC is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -876,6 +878,9 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 CONFIG_KEYPAD_U8500=y
+CONFIG_TC35893_KEYPAD=y
+# CONFIG_TC_KEYPAD_POLL is not set
+CONFIG_TC_KEYPAD_INTR=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
@@ -903,7 +908,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
-CONFIG_TOUCHP_TUNING=y
 CONFIG_TOUCHSCREEN_BU21013=y
 CONFIG_BU21013_TSC_CNTL1=y
 # CONFIG_BU21013_TSC_CNTL2 is not set
@@ -1244,15 +1248,15 @@ CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -1264,8 +1268,9 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 #
 CONFIG_FB_MCDE=y
 CONFIG_MCDE_DISPLAY_GENERIC_DSI=y
+# CONFIG_MCDE_DISPLAY_AV8100 is not set
 # CONFIG_MCDE_DISPLAY_AB8500_DENC is not set
-# CONFIG_MCDE_DISPLAY_AV8100  is not set
+# CONFIG_FB_MCDE_DEBUG is not set
 # CONFIG_FB_ARMCLCD is not set
 CONFIG_FB_B2R2=y
 # CONFIG_FB_S1D13XXX is not set
@@ -1279,6 +1284,7 @@ CONFIG_FB_B2R2=y
 # Display device support
 #
 # CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_AV8100 is not set
 
 #
 # Console display driver support
@@ -1299,6 +1305,51 @@ CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_U8500_ACODEC is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# Special HID drivers
+#
+# CONFIG_HID_3M_PCT is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MOSART is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_STANTUM is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_ZEROPLUS is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -1479,6 +1530,7 @@ CONFIG_LEDS_CLASS=y
 #
 # LED drivers
 #
+CONFIG_LEDS_AB8500=y
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_LP3944 is not set
@@ -1709,6 +1761,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # Partition Types
 #
 # CONFIG_PARTITION_ADVANCED is not set
+# CONFIG_BLKDEV_PARTITION is not set
 CONFIG_MSDOS_PARTITION=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
diff --git a/arch/arm/configs/mop500_ed_defconfig b/arch/arm/configs/mop500_ed_defconfig
index f54d89a9d47..62a275cd5fa 100755
--- a/arch/arm/configs/mop500_ed_defconfig
+++ b/arch/arm/configs/mop500_ed_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Mon May 31 14:58:33 2010
+# Mon Jun 14 15:41:40 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -249,6 +249,8 @@ CONFIG_STM_DMA=y
 #
 
 #
+# Display selection
+#
 CONFIG_FORCE_MAX_ZONEORDER=12
 
 #
@@ -644,16 +646,17 @@ CONFIG_RFKILL_INPUT=y
 #
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_SOCK=m
 CONFIG_CAIF_NETDEV=m
 CONFIG_CAIF_CHARDEV=m
+CONFIG_CAIF_KERNEL_API=m
 
 #
 # CAIF transport drivers
 #
 CONFIG_CAIF_TTY=m
-# CONFIG_CAIF_PHYIF_MSPI is not set
-# CONFIG_CAIF_PHYIF_SSPI is not set
+# CONFIG_CAIF_TTY_NOFCS is not set
+# CONFIG_CAIF_SPI_MASTER is not set
+# CONFIG_CAIF_SPI_SLAVE is not set
 # CONFIG_CAIF_SHM is not set
 # CONFIG_CAIF_LOOPBACK is not set
 
@@ -731,10 +734,11 @@ CONFIG_U8500_HSI_MODEM_EXTERNAL=y
 # CONFIG_U8500_HSI_MODEM_INTERNAL is not set
 CONFIG_U8500_HSI_MODEM_DIRECTION=0x1
 CONFIG_U8500_SHRM=y
-# CONFIG_ED_V1_VERSION is not set
-CONFIG_V1_UPDATES_VERSION=y
+# CONFIG_SHRM_ED_V1_VERSION is not set
+CONFIG_SHRM_V1_UPDATES_VERSION=y
 # CONFIG_U8500_SHRM_LOOP_BACK is not set
 CONFIG_STE_AUDIO_IO_DEV=y
+# CONFIG_AB8500_DENC is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -854,6 +858,9 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 CONFIG_KEYPAD_U8500=y
+CONFIG_TC35893_KEYPAD=y
+# CONFIG_TC_KEYPAD_POLL is not set
+CONFIG_TC_KEYPAD_INTR=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
@@ -881,10 +888,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
-CONFIG_TOUCHP_TUNING=y
-CONFIG_TOUCHSCREEN_BU21013=y
-#CONFIG_BU21013_TSC_CNTL1=y
-# CONFIG_BU21013_TSC_CNTL2 is not set
 # CONFIG_INPUT_MISC is not set
 
 #
@@ -1165,9 +1168,9 @@ CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
@@ -1183,7 +1186,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 #
 # Frame buffer hardware drivers
 #
-# CONFIG_FB_HDMI is not set
+# CONFIG_FB_MCDE is not set
 # CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_B2R2 is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -1197,6 +1200,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # Display device support
 #
 # CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_AV8100 is not set
 
 #
 # Console display driver support
@@ -1442,6 +1446,7 @@ CONFIG_LEDS_CLASS=y
 #
 # LED drivers
 #
+CONFIG_LEDS_AB8500=y
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_LP3944 is not set
@@ -1606,6 +1611,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # Partition Types
 #
 # CONFIG_PARTITION_ADVANCED is not set
+# CONFIG_BLKDEV_PARTITION is not set
 CONFIG_MSDOS_PARTITION=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
diff --git a/arch/arm/configs/mop500_power_defconfig b/arch/arm/configs/mop500_power_defconfig
index c08e7897003..f0203b3f1db 100755
--- a/arch/arm/configs/mop500_power_defconfig
+++ b/arch/arm/configs/mop500_power_defconfig
@@ -1,13 +1,14 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Mon May 31 14:59:22 2010
+# Mon Jun 14 15:42:42 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_STACKTRACE_SUPPORT=y
@@ -237,6 +238,7 @@ CONFIG_UX500_SOC_DB8500=y
 # CONFIG_MACH_U8500_SIMULATOR is not set
 # CONFIG_MACH_U5500_SIMULATOR is not set
 CONFIG_MACH_U8500_MOP=y
+CONFIG_U8500_CPUIDLE=y
 CONFIG_U8500_CPUFREQ=y
 CONFIG_U8500_PM=y
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
@@ -250,7 +252,7 @@ CONFIG_STM_DMA=y
 #
 
 #
-# Display Selection
+# Display selection
 #
 CONFIG_DISPLAY_GENERIC_DSI_PRIMARY=y
 # CONFIG_DISPLAY_GENERIC_DSI_SECONDARY is not set
@@ -373,6 +375,8 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
 
 #
 # Floating point emulation
@@ -665,16 +669,17 @@ CONFIG_RFKILL_INPUT=y
 #
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_SOCK=m
 CONFIG_CAIF_NETDEV=m
 CONFIG_CAIF_CHARDEV=m
+CONFIG_CAIF_KERNEL_API=m
 
 #
 # CAIF transport drivers
 #
 CONFIG_CAIF_TTY=m
-# CONFIG_CAIF_PHYIF_MSPI is not set
-# CONFIG_CAIF_PHYIF_SSPI is not set
+# CONFIG_CAIF_TTY_NOFCS is not set
+# CONFIG_CAIF_SPI_MASTER is not set
+# CONFIG_CAIF_SPI_SLAVE is not set
 # CONFIG_CAIF_SHM is not set
 # CONFIG_CAIF_LOOPBACK is not set
 
@@ -756,6 +761,7 @@ CONFIG_U8500_SHRM=y
 CONFIG_SHRM_V1_UPDATES_VERSION=y
 # CONFIG_U8500_SHRM_LOOP_BACK is not set
 CONFIG_STE_AUDIO_IO_DEV=y
+# CONFIG_AB8500_DENC is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -876,6 +882,9 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 CONFIG_KEYPAD_U8500=y
+CONFIG_TC35893_KEYPAD=y
+# CONFIG_TC_KEYPAD_POLL is not set
+CONFIG_TC_KEYPAD_INTR=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
@@ -903,9 +912,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
-CONFIG_TOUCHP_TUNING=y
 CONFIG_TOUCHSCREEN_BU21013=y
-#CONFIG_BU21013_TSC_CNTL1=y
+CONFIG_BU21013_TSC_CNTL1=y
 # CONFIG_BU21013_TSC_CNTL2 is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ATI_REMOTE is not set
@@ -1257,15 +1265,15 @@ CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -1277,8 +1285,9 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 #
 CONFIG_FB_MCDE=y
 CONFIG_MCDE_DISPLAY_GENERIC_DSI=y
+# CONFIG_MCDE_DISPLAY_AV8100 is not set
 # CONFIG_MCDE_DISPLAY_AB8500_DENC is not set
-# CONFIG_MCDE_DISPLAY_AV8100  is not set
+# CONFIG_FB_MCDE_DEBUG is not set
 # CONFIG_FB_ARMCLCD is not set
 CONFIG_FB_B2R2=y
 # CONFIG_FB_S1D13XXX is not set
@@ -1292,6 +1301,7 @@ CONFIG_FB_B2R2=y
 # Display device support
 #
 # CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_AV8100 is not set
 
 #
 # Console display driver support
@@ -1537,6 +1547,7 @@ CONFIG_LEDS_CLASS=y
 #
 # LED drivers
 #
+CONFIG_LEDS_AB8500=y
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_LP3944 is not set
@@ -1768,6 +1779,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # Partition Types
 #
 # CONFIG_PARTITION_ADVANCED is not set
+# CONFIG_BLKDEV_PARTITION is not set
 CONFIG_MSDOS_PARTITION=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"