omap: switch to 4.4

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

1 files changed, 61 insertions, 97 deletions

diff --git a/target/linux/omap/config-4.4 b/target/linux/omap/config-4.4
index 0b0639bbec..a483ab2940 100644
--- a/target/linux/omap/config-4.4
+++ b/target/linux/omap/config-4.4
@@ -6,13 +6,14 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_MULTI_CPU_AUTO is not set
-CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
+CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_NR_GPIO=0
 CONFIG_ARCH_OMAP=y
 CONFIG_ARCH_OMAP2PLUS=y
@@ -30,39 +31,39 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_ARCH_WM8750 is not set
 CONFIG_ARM=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_ARM_CPU_SUSPEND is not set
-CONFIG_ARM_ERRATA_411920=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_754322=y
+CONFIG_ARM_ERRATA_775420=y
+CONFIG_ARM_GIC=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_HEAVY_MB=y
-CONFIG_ARM_L1_CACHE_SHIFT=5
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_VIRT_EXT=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_AT803X_PHY=y
 CONFIG_ATA=y
-# CONFIG_ATH_CARDS is not set
 CONFIG_AUDIT=y
 # CONFIG_AUDITSYSCALL is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
 # CONFIG_BACKLIGHT_PWM is not set
 # CONFIG_BACKLIGHT_TPS65217 is not set
 CONFIG_BCH=y
 CONFIG_BINFMT_MISC=y
-CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -74,6 +75,7 @@ CONFIG_BOUNCE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BUILD_BIN2C=y
 CONFIG_CACHE_L2X0=y
+# CONFIG_CHARGER_TPS65217 is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLKSRC_OF=y
@@ -97,22 +99,18 @@ CONFIG_COMMON_CLK=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_CONNECTOR=y
 CONFIG_CPUFREQ_DT=y
-CONFIG_CPUSETS=y
-CONFIG_CPU_32v6=y
 CONFIG_CPU_32v6K=y
-CONFIG_CPU_ABRT_EV6=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_CPU_CACHE_V6=y
+CONFIG_CPU_CACHE_V7=y
 CONFIG_CPU_CACHE_VIPT=y
 CONFIG_CPU_COPY_V6=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
@@ -126,20 +124,28 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_PABRT_V6=y
+CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_THERMAL=y
-CONFIG_CPU_TLB_V6=y
-CONFIG_CPU_V6=y
-CONFIG_CPU_V6K=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_V7=y
 CONFIG_CRAMFS=y
 CONFIG_CRC16=y
 CONFIG_CRC7=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC_T10DIF=y
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_XZ=y
+CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DDR=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_DEBUG_GPIO=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
@@ -148,7 +154,6 @@ CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_SPINLOCK=y
 # CONFIG_DEBUG_UART_8250 is not set
 # CONFIG_DEBUG_USER is not set
-CONFIG_DEV_COREDUMP=y
 CONFIG_DISPLAY_CONNECTOR_ANALOG_TV=y
 CONFIG_DISPLAY_CONNECTOR_DVI=y
 CONFIG_DISPLAY_CONNECTOR_HDMI=y
@@ -176,7 +181,6 @@ CONFIG_DTC=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EEPROM_93CX6=y
-# CONFIG_EVM is not set
 CONFIG_EXPORTFS=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
@@ -184,27 +188,20 @@ CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
-# CONFIG_EXTCON_ADC_JACK is not set
-# CONFIG_EXTCON_GPIO is not set
 CONFIG_EXTCON_PALMAS=y
-# CONFIG_EXTCON_RT8973A is not set
-# CONFIG_EXTCON_SM5502 is not set
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 CONFIG_FAT_FS=y
-# CONFIG_FB_OMAP2 is not set
 CONFIG_FHANDLE=y
-CONFIG_FIRMWARE_EDID=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FRAME_POINTER=y
-CONFIG_FREEZER=y
 CONFIG_FS_MBCACHE=y
 CONFIG_FS_POSIX_ACL=y
+# CONFIG_FB_OMAP2 is not set
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_IRQ_CHIP=y
@@ -227,11 +224,9 @@ CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCF857X=y
 CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_TPS6586X=y
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TWL4030=y
 CONFIG_GPIO_TWL6040=y
-# CONFIG_GPIO_WM8994 is not set
 CONFIG_GRACE_PERIOD=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDIRQS_SW_RESEND=y
@@ -246,6 +241,8 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_ARM_SCU=y
+CONFIG_HAVE_ARM_TWD=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_HAVE_BPF_JIT=y
 CONFIG_HAVE_CC_STACKPROTECTOR=y
@@ -280,6 +277,7 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_SMP=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_UID16=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -290,7 +288,6 @@ CONFIG_HIGHPTE=y
 CONFIG_HSI=y
 CONFIG_HSI_BOARDINFO=y
 # CONFIG_HSI_CHAR is not set
-# CONFIG_HW_RANDOM_OMAP is not set
 CONFIG_HWMON=y
 CONFIG_HZ_FIXED=0
 CONFIG_I2C=y
@@ -299,17 +296,7 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_OMAP=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-# CONFIG_IMA is not set
-# CONFIG_IMX_THERMAL is not set
 CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INPUT_PALMAS_PWRBUTTON is not set
-CONFIG_INPUT_TPS65218_PWRBUTTON=y
-CONFIG_INPUT_TWL4030_PWRBUTTON=y
-CONFIG_INPUT_TWL4030_VIBRA=y
-CONFIG_INPUT_TWL6040_VIBRA=y
-CONFIG_INTEGRITY=y
-CONFIG_INTEGRITY_AUDIT=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
 CONFIG_IOMMU_HELPER=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -317,6 +304,7 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_RARP=y
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
@@ -327,46 +315,34 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_KEXEC=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEYS=y
-# CONFIG_KEYBOARD_TWL4030 is not set
 CONFIG_KPROBES=y
 CONFIG_KRETPROBES=y
 CONFIG_KS8851=y
 CONFIG_KS8851_MLL=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_PLATFORM=y
-CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LIBCRC32C=y
 CONFIG_LIBFDT=y
 CONFIG_LOCKD=y
 CONFIG_LOCKDEP=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 # CONFIG_MACH_NOKIA_RX51 is not set
-CONFIG_MACH_OMAP_GENERIC=y
-# CONFIG_MACH_OMAP_LDP is not set
 # CONFIG_MACH_OMAP3517EVM is not set
 # CONFIG_MACH_OMAP3_PANDORA is not set
+CONFIG_MACH_OMAP_GENERIC=y
+# CONFIG_MACH_OMAP_LDP is not set
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_SWAP_ENABLED=y
+CONFIG_MDIO_BOARDINFO=y
 CONFIG_MEMORY=y
 CONFIG_MEMORY_ISOLATION=y
-CONFIG_MENELAUS=y
 CONFIG_MFD_CORE=y
 CONFIG_MFD_PALMAS=y
 CONFIG_MFD_SYSCON=y
@@ -412,10 +388,9 @@ CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_NAMESPACES=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NEON=y
 CONFIG_NETFILTER=y
-# CONFIG_NETLABEL is not set
 # CONFIG_NET_CADENCE is not set
-# CONFIG_NET_CLS_CGROUP is not set
 CONFIG_NET_KEY=y
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_NS=y
@@ -461,7 +436,6 @@ CONFIG_OF_RESERVED_MEM=y
 CONFIG_OID_REGISTRY=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND3=y
-# CONFIG_OMAP_SSI is not set
 CONFIG_OMAP2_DSS=y
 CONFIG_OMAP2_DSS_DPI=y
 CONFIG_OMAP2_DSS_DSI=y
@@ -471,7 +445,6 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
 CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 CONFIG_OMAP2_DSS_VENC=y
-CONFIG_OMAP2_VRFB=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 CONFIG_OMAP3_THERMAL=y
@@ -484,6 +457,7 @@ CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
 CONFIG_OMAP_INTERCONNECT=y
+CONFIG_OMAP_INTERCONNECT_BARRIER=y
 CONFIG_OMAP_IRQCHIP=y
 CONFIG_OMAP_MUX=y
 CONFIG_OMAP_MUX_DEBUG=y
@@ -491,12 +465,12 @@ CONFIG_OMAP_MUX_WARNINGS=y
 CONFIG_OMAP_OCP2SCP=y
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_OMAP_SSI is not set
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_OPROFILE=y
 CONFIG_OPTPROBES=y
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
-CONFIG_PAGE_COUNTER=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS_GENERIC is not set
@@ -507,8 +481,8 @@ CONFIG_PHYLIB=y
 # CONFIG_PHY_DM816X_USB is not set
 CONFIG_PINCTRL=y
 # CONFIG_PINCTRL_PALMAS is not set
-# CONFIG_PL310_ERRATA_588369 is not set
-# CONFIG_PL310_ERRATA_727915 is not set
+CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_727915=y
 # CONFIG_PL310_ERRATA_753970 is not set
 # CONFIG_PL310_ERRATA_769419 is not set
 CONFIG_PM=y
@@ -521,11 +495,11 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_POWER_AVS=y
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWER_AVS_OMAP_CLASS3=y
+CONFIG_POWER_SUPPLY=y
 CONFIG_PPS=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINT_QUOTA_WARNING=y
 CONFIG_PROC_EVENTS=y
-CONFIG_PROC_PID_CPUSET=y
 CONFIG_PROFILING=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_PROVE_RCU=y
@@ -551,6 +525,7 @@ CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_SPI=y
 CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_PBIAS=y
 CONFIG_REGULATOR_TI_ABB=y
@@ -564,17 +539,13 @@ CONFIG_REGULATOR_TWL4030=y
 CONFIG_RING_BUFFER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_ROOT_NFS=y
-# CONFIG_RSI_91X is not set
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1307=y
 CONFIG_RTC_DRV_OMAP=y
 CONFIG_RTC_DRV_PALMAS=y
 # CONFIG_RTC_DRV_TPS65910 is not set
 CONFIG_RTC_DRV_TWL4030=y
-CONFIG_RTC_DRV_TWL92330=y
-CONFIG_RT_GROUP_SCHED=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_RXKAD=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_HRTICK=y
@@ -600,45 +571,40 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIO=y
-# CONFIG_SG_SPLIT is not set
 CONFIG_SMC91X=y
 CONFIG_SMSC911X=y
 # CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SMSC_PHY=y
 CONFIG_SND=y
-# CONFIG_SND_EDMA_SOC is not set
+# CONFIG_SND_COMPRESS_OFFLOAD is not set
 CONFIG_SND_DAVINCI_SOC_MCASP=y
 CONFIG_SND_DEBUG=y
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DMAENGINE_PCM=y
-# CONFIG_SND_EMU10K1_SEQ is not set
+# CONFIG_SND_EDMA_SOC is not set
 CONFIG_SND_MIXER_OSS=y
 CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_DMIC=y
 # CONFIG_SND_OMAP_SOC_HDMI_AUDIO is not set
-# CONFIG_SND_OMAP_SOC_RX51 is not set
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_MCPDM=y
 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=y
 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=y
-# CONFIG_SND_OPL3_LIB_SEQ is not set
-# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_OMAP_SOC_RX51 is not set
 CONFIG_SND_PCM=y
 CONFIG_SND_PCM_OSS=y
-# CONFIG_SND_RAWMIDI_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SND_SIMPLE_CARD=y
 CONFIG_SND_SOC=y
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_FSL_SSI is not set
+CONFIG_SND_SOC_DMIC=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
-# CONFIG_SND_SOC_RT5677_SPI is not set
 CONFIG_SND_SOC_TLV320AIC3X=y
+CONFIG_SND_SOC_TWL4030=y
+CONFIG_SND_SOC_TWL6040=y
 CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
 CONFIG_SOC_BUS=y
 CONFIG_SOC_HAS_OMAP2_SDRC=y
-# CONFIG_SOC_OMAP2420 is not set
-# CONFIG_SOC_OMAP2430 is not set
 CONFIG_SOC_OMAP3430=y
 # CONFIG_SOC_TI81XX is not set
 CONFIG_SOUND=y
@@ -647,22 +613,18 @@ CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
-CONFIG_SPI_OMAP24XX=y
+# CONFIG_SPI_OMAP24XX is not set
 CONFIG_SPI_TI_QSPI=y
 CONFIG_SRAM=y
 CONFIG_SRCU=y
 CONFIG_STACKTRACE=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
-# CONFIG_SUNXI_SRAM is not set
 CONFIG_SWIOTLB=y
 CONFIG_SWP_EMULATE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_THERMAL=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_EMULATION is not set
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
@@ -670,14 +632,13 @@ CONFIG_THERMAL_OF=y
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_STATS=y
-CONFIG_TI_AM335X_ADC=y
 # CONFIG_TI_CPPI41 is not set
 CONFIG_TI_CPSW=y
 CONFIG_TI_CPSW_ALE=y
 CONFIG_TI_CPSW_PHY_SEL=y
 CONFIG_TI_CPTS=y
-CONFIG_TI_DAVINCI_EMAC=y
 CONFIG_TI_DAVINCI_CPDMA=y
+CONFIG_TI_DAVINCI_EMAC=y
 CONFIG_TI_DAVINCI_MDIO=y
 CONFIG_TI_DMA_CROSSBAR=y
 CONFIG_TI_EDMA=y
@@ -688,29 +649,32 @@ CONFIG_TI_THERMAL=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_TRACE_IRQFLAGS=y
-# CONFIG_TWL4030_MADC is not set
+CONFIG_TWL4030_CORE=y
+CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_WATCHDOG=y
 CONFIG_TWL6040_CORE=y
 CONFIG_UBIFS_FS=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_XZ=y
 CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_DWC3_OMAP=y
+# CONFIG_USB_DWC3_OMAP is not set
 # CONFIG_USERIO is not set
 # CONFIG_USER_NS is not set
 CONFIG_USE_OF=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VFAT_FS=y
 CONFIG_VFP=y
+CONFIG_VFPv3=y
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_W1=y
-CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_WATCHDOG_CORE=y
-# CONFIG_WILC1000_DRIVER is not set
 # CONFIG_WKUP_M3_RPROC is not set
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZLIB_DEFLATE=y