linux-omap4: add experimental 3.0.0 version

also clean up stale files Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
author: Koen Kooi <koen@dominion.thruhere.net> 2011-11-09 15:33:44 +0100
committer: Koen Kooi <koen@dominion.thruhere.net> 2011-11-09 15:33:44 +0100
commit: f1c2dd0ae57938899840342de33764685b6a5288 (patch)
tree: 6830d9aef4ef168e619b1b57b9891d11ff1c9ede /recipes-kernel
parent: 31c407823dbed73f9f33c333c7d955140d0aef70 (diff)
download: meta-ti-f1c2dd0ae57938899840342de33764685b6a5288.tar.gz
12 files changed, 681 insertions, 1084 deletions
diff --git a/recipes-kernel/linux/linux-omap4/omap4430-panda/defconfig b/recipes-kernel/linux/linux-omap4-3.0.0/omap4430-panda/defconfig
index 741db338..1be93fe1 100644
--- a/recipes-kernel/linux/linux-omap4/omap4430-panda/defconfig
+++ b/recipes-kernel/linux/linux-omap4-3.0.0/omap4430-panda/defconfig
@@ -1,18 +1,17 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.35.3
+# Linux/arm 3.0.4 Kernel Configuration
-# Sat May  7 15:52:24 2011
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_HAVE_SCHED_CLOCK=y
 CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_TIME=y
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_KTIME_SCALAR=y
 CONFIG_HAVE_PROC_CPU=y
-CONFIG_GENERIC_HARDIRQS=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -21,22 +20,20 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_LOCKBREAK=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_ARCH_HAS_CPUFREQ=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
 #
 # General setup
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INIT_PASS_ALL_PARAMS is not set
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -44,36 +41,46 @@ CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_LZO is not set
-CONFIG_VERSION_SIGNATURE=""
+CONFIG_DEFAULT_HOSTNAME="Pandaboard"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_FHANDLE=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_SPARSE_IRQ=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_RCU=y
+CONFIG_TREE_PREEMPT_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
+CONFIG_PREEMPT_RCU=y
-# CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_RCU_BOOST=y
+CONFIG_RCU_BOOST_PRIO=1
+CONFIG_RCU_BOOST_DELAY=500
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
@@ -82,30 +89,32 @@ CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 CONFIG_DEBUG_BLK_CGROUP=y
+# CONFIG_NAMESPACES is not set
+CONFIG_SCHED_AUTOGROUP=y
 CONFIG_MM_OWNER=y
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
-# CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
+CONFIG_RD_XZ=y
 # CONFIG_RD_LZO is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
 CONFIG_UID16=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -118,6 +127,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -138,14 +148,14 @@ CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
-CONFIG_SLOW_WORK=y
-# CONFIG_SLOW_WORK_DEBUG is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -161,6 +171,7 @@ CONFIG_BLOCK=y
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_THROTTLING=y
 #
 # IO Schedulers
@@ -208,7 +219,6 @@ CONFIG_FREEZER=y
 # System Type
 #
 CONFIG_MMU=y
-# CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_VERSATILE is not set
@@ -222,7 +232,7 @@ CONFIG_MMU=y
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_STMP3XXX is not set
+# CONFIG_ARCH_MXS is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IOP13XX is not set
@@ -231,17 +241,17 @@ CONFIG_MMU=y
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_DOVE is not set
 # CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MV78XX0 is not set
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_MSM is not set
@@ -250,67 +260,73 @@ CONFIG_MMU=y
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5P6440 is not set
+# CONFIG_ARCH_S5P64X0 is not set
-# CONFIG_ARCH_S5P6442 is not set
 # CONFIG_ARCH_S5PC100 is not set
 # CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_EXYNOS4 is not set
 # CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_TCC_926 is not set
 # CONFIG_ARCH_U300 is not set
 # CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_DAVINCI is not set
 CONFIG_ARCH_OMAP=y
 # CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_VT8500 is not set
+# CONFIG_GPIO_PCA953X is not set
+CONFIG_KEYBOARD_GPIO_POLLED=m
 #
-# TI OMAP Implementations
+# TI OMAP Common Features
 #
 # CONFIG_ARCH_OMAP1 is not set
 CONFIG_ARCH_OMAP2PLUS=y
-# CONFIG_ARCH_OMAP2 is not set
-# CONFIG_ARCH_OMAP3 is not set
-CONFIG_ARCH_OMAP4=y
 #
 # OMAP Feature Selections
 #
 CONFIG_OMAP_SMARTREFLEX=y
-# CONFIG_OMAP_SMARTREFLEX_TESTING is not set
 CONFIG_OMAP_SMARTREFLEX_CLASS3=y
 CONFIG_OMAP_RESET_CLOCKS=y
 # CONFIG_OMAP_MUX is not set
 CONFIG_OMAP_MCBSP=y
 CONFIG_OMAP_MBOX_FWK=y
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_OMAP_REMOTE_PROC=y
 CONFIG_OMAP_IOMMU=y
 CONFIG_OMAP_USER_DMM=y
 # CONFIG_OMAP_IOMMU_DEBUG is not set
-# CONFIG_OMAP_MPU_TIMER is not set
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
 CONFIG_OMAP_DM_TIMER=y
 # CONFIG_OMAP_PM_NONE is not set
-# CONFIG_OMAP_PM_NOOP is not set
+CONFIG_OMAP_PM_NOOP=y
-CONFIG_OMAP_PM=y
+#
+# TI OMAP2/3/4 Specific Features
+#
+CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
+# CONFIG_ARCH_OMAP2 is not set
+# CONFIG_ARCH_OMAP3 is not set
+CONFIG_ARCH_OMAP4=y
+CONFIG_OMAP_PACKAGE_CBL=y
+CONFIG_OMAP_PACKAGE_CBS=y
 #
 # OMAP Board Type
 #
-CONFIG_WIFI_CONTROL_FUNC=y
-CONFIG_TIWLAN_SDIO=y
-CONFIG_TIWLAN_MMC_CONTROLLER=5
-# CONFIG_OMAP4_ES1 is not set
 CONFIG_MACH_OMAP_4430SDP=y
 CONFIG_MACH_OMAP4_PANDA=y
-# CONFIG_ERRATA_OMAP4_AXI2OCP is not set
-# CONFIG_ENABLE_L3_ERRORS is not set
+#
+# System MMU
+#
 #
 # Processor Type
 #
-CONFIG_CPU_32v6K=y
 CONFIG_CPU_V7=y
+CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
 CONFIG_CPU_ABRT_EV7=y
 CONFIG_CPU_PABRT_V7=y
@@ -327,26 +343,31 @@ CONFIG_CPU_CP15_MMU=y
 #
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_THUMBEE=y
+CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_HAS_TLS_REG=y
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CACHE_PL310=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-# CONFIG_USER_L2_PLE is not set
-CONFIG_USER_PMON=y
 CONFIG_CPU_HAS_PMU=y
 # CONFIG_ARM_ERRATA_430973 is not set
 # CONFIG_ARM_ERRATA_458693 is not set
 # CONFIG_ARM_ERRATA_460075 is not set
-# CONFIG_PL310_ERRATA_588369 is not set
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
+CONFIG_PL310_ERRATA_588369=y
 CONFIG_ARM_ERRATA_720789=y
+CONFIG_PL310_ERRATA_727915=y
+# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_751472 is not set
+# CONFIG_ARM_ERRATA_753970 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
 CONFIG_ARM_GIC=y
-CONFIG_COMMON_CLKDEV=y
 #
 # Bus support
@@ -363,6 +384,10 @@ CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_SCHED_MC=y
+# CONFIG_SCHED_SMT is not set
 CONFIG_HAVE_ARM_SCU=y
 CONFIG_HAVE_ARM_TWD=y
 CONFIG_VMSPLIT_3G=y
@@ -382,44 +407,60 @@ CONFIG_AEABI=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_CLEANCACHE=y
+CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_LEDS is not set
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_SECCOMP is not set
 # CONFIG_CC_STACKPROTECTOR is not set
-CONFIG_CPU_V7_SYSFS=y
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
 #
 # Boot options
 #
+CONFIG_USE_OF=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CMDLINE=" debug"
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
+# CONFIG_CRASH_DUMP is not set
+CONFIG_AUTO_ZRELADDR=y
 #
 # CPU Power Management
 #
+#
+# CPU Frequency scaling
+#
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
-# CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
@@ -458,20 +499,20 @@ CONFIG_BINFMT_MISC=y
 #
 # Power management options
 #
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
-# CONFIG_PM_VERBOSE is not set
-CONFIG_CAN_PM_TRACE=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_NVS=y
-CONFIG_SUSPEND=y
 # CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_SUSPEND_FREEZER=y
+CONFIG_CAN_PM_TRACE=y
 # CONFIG_APM_EMULATION is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_ARCH_HAS_OPP=y
-CONFIG_PM_OPS=y
+CONFIG_PM_OPP=y
+CONFIG_PM_RUNTIME_CLK=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
@@ -490,19 +531,17 @@ CONFIG_XFRM_IPCOMP=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
 CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_DEMUX is not set
-# CONFIG_NET_IPGRE_BROADCAST is not set
 CONFIG_IP_MROUTE=y
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
 # CONFIG_IP_PIMSM_V1 is not set
@@ -533,13 +572,7 @@ CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
-# CONFIG_DEFAULT_BIC is not set
 CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_HYBLA is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_VENO is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
@@ -568,6 +601,7 @@ CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_PIMSM_V2=y
 # CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
@@ -580,9 +614,9 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -591,7 +625,9 @@ CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+# CONFIG_NF_CONNTRACK_SNMP is not set
 CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
@@ -609,11 +645,13 @@ CONFIG_NETFILTER_XT_CONNMARK=m
 #
 # Xtables targets
 #
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 # CONFIG_NETFILTER_XT_TARGET_CT is not set
 # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
 CONFIG_NETFILTER_XT_TARGET_HL=m
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
@@ -628,19 +666,23 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 #
 # Xtables matches
 #
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_HL=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+# CONFIG_NETFILTER_XT_MATCH_IPVS is not set
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -662,6 +704,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_VS=m
 CONFIG_IP_VS_IPV6=y
 CONFIG_IP_VS_DEBUG=y
@@ -695,6 +738,8 @@ CONFIG_IP_VS_NQ=m
 # IPVS application helper
 #
 CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+# CONFIG_IP_VS_PE_SIP is not set
 #
 # IP: Netfilter Configuration
@@ -704,7 +749,6 @@ CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
@@ -717,7 +761,6 @@ CONFIG_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_DCCP=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -741,6 +784,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 # IPv6: Netfilter Configuration
 #
+CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -794,6 +838,7 @@ CONFIG_NET_SCHED=y
 # CONFIG_NET_SCH_PRIO is not set
 # CONFIG_NET_SCH_MULTIQ is not set
 # CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
 # CONFIG_NET_SCH_SFQ is not set
 # CONFIG_NET_SCH_TEQL is not set
 # CONFIG_NET_SCH_TBF is not set
@@ -801,6 +846,9 @@ CONFIG_NET_SCHED=y
 # CONFIG_NET_SCH_DSMARK is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_QFQ is not set
 #
 # Classification
@@ -809,7 +857,6 @@ CONFIG_NET_CLS=y
 # CONFIG_NET_CLS_BASIC is not set
 # CONFIG_NET_CLS_TCINDEX is not set
 # CONFIG_NET_CLS_ROUTE4 is not set
-CONFIG_NET_CLS_ROUTE=y
 # CONFIG_NET_CLS_FW is not set
 # CONFIG_NET_CLS_U32 is not set
 # CONFIG_NET_CLS_RSVP is not set
@@ -820,7 +867,11 @@ CONFIG_NET_CLS_CGROUP=y
 # CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
 CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
 #
 # Network testing
@@ -870,7 +921,6 @@ CONFIG_USB_IRDA=m
 # CONFIG_MCS_FIR is not set
 CONFIG_BT=y
 CONFIG_BT_L2CAP=y
-CONFIG_BT_L2CAP_EXT_FEATURES=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
@@ -887,6 +937,7 @@ CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_ATH3K is not set
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
@@ -895,6 +946,7 @@ CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
 # CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
@@ -921,9 +973,10 @@ CONFIG_MAC80211=m
 CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
 # CONFIG_MAC80211_RC_DEFAULT_PID is not set
 CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel"
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
@@ -933,8 +986,12 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=y
+CONFIG_RFKILL_GPIO=y
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
 #
 # Device Drivers
@@ -954,9 +1011,24 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-CONFIG_SR_REPORT_TIME_LIMIT=100
 CONFIG_CONNECTOR=m
 # CONFIG_MTD is not set
+CONFIG_DTC=y
+CONFIG_OF=y
+#
+# Device Tree and Open Firmware support
+#
+CONFIG_PROC_DEVICETREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=y
+CONFIG_OF_NET=y
+CONFIG_OF_SPI=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -974,13 +1046,21 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD_WCACHE=y
 CONFIG_ATA_OVER_ETH=m
 # CONFIG_MG_DISK is not set
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_AD525X_DPOT is not set
+# CONFIG_INTEL_MID_PTI is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_APDS9802ALS is not set
 # CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 CONFIG_SENSORS_BH1780=y
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
 CONFIG_BMP085=y
@@ -997,6 +1077,13 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_IWMC3200TOP=m
 # CONFIG_IWMC3200TOP_DEBUG is not set
 # CONFIG_IWMC3200TOP_DEBUGFS is not set
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -1038,6 +1125,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
 # CONFIG_LIBFC is not set
 # CONFIG_LIBFCOE is not set
 # CONFIG_SCSI_DEBUG is not set
@@ -1067,6 +1155,7 @@ CONFIG_ATA_BMDMA=y
 #
 # PATA SFF controllers with BMDMA
 #
+# CONFIG_PATA_ARASAN_CF is not set
 #
 # PIO-only SFF controllers
@@ -1082,7 +1171,8 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
-# CONFIG_MD_RAID456 is not set
+CONFIG_MD_RAID456=m
+# CONFIG_MULTICORE_RAID456 is not set
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@@ -1090,6 +1180,7 @@ CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
@@ -1097,6 +1188,8 @@ CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
@@ -1105,9 +1198,9 @@ CONFIG_MACVTAP=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
 CONFIG_VETH=m
+CONFIG_MII=y
 # CONFIG_PHYLIB is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
 # CONFIG_AX88796 is not set
 # CONFIG_SMC91X is not set
 # CONFIG_DM9000 is not set
@@ -1124,9 +1217,9 @@ CONFIG_MII=y
 # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
 # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
 # CONFIG_B44 is not set
-# CONFIG_KS8842 is not set
 CONFIG_KS8851=y
 # CONFIG_KS8851_MLL is not set
+# CONFIG_FTMAC100 is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WLAN=y
@@ -1141,12 +1234,13 @@ CONFIG_RTL8187_LEDS=y
 # CONFIG_MAC80211_HWSIM is not set
 CONFIG_ATH_COMMON=m
 # CONFIG_ATH_DEBUG is not set
+# CONFIG_ATH9K is not set
 # CONFIG_ATH9K_HTC is not set
-CONFIG_AR9170_USB=m
+# CONFIG_CARL9170 is not set
-CONFIG_AR9170_LEDS=y
 CONFIG_B43=m
 # CONFIG_B43_SDIO is not set
 CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_LEDS=y
 CONFIG_B43_HWRNG=y
@@ -1170,27 +1264,34 @@ CONFIG_RT2X00=m
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT30XX=y
+CONFIG_RT2800USB_RT33XX=y
 CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT53XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL12XX=m
+# CONFIG_RTL8192SE is not set
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
-CONFIG_WL1271=m
+CONFIG_WL12XX_MENU=m
-CONFIG_WL1271_SPI=m
+CONFIG_WL12XX=m
-CONFIG_WL1271_SDIO=m
+CONFIG_WL12XX_HT=y
+CONFIG_WL12XX_SPI=m
+CONFIG_WL12XX_SDIO=m
+# CONFIG_WL12XX_SDIO_TEST is not set
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_MWIFIEX is not set
 #
 # WiMAX Wireless Broadband devices
@@ -1212,6 +1313,7 @@ CONFIG_USB_USBNET=y
 CONFIG_USB_NET_AX8817X=y
 CONFIG_USB_NET_CDCETHER=y
 CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SMSC75XX=m
 CONFIG_USB_NET_SMSC95XX=y
@@ -1228,15 +1330,22 @@ CONFIG_USB_ARMLINUX=y
 # CONFIG_USB_EPSON2888 is not set
 # CONFIG_USB_KC2190 is not set
 CONFIG_USB_NET_ZAURUS=y
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_KALMIA is not set
 CONFIG_USB_HSO=m
 # CONFIG_USB_NET_INT51X1 is not set
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
+# CONFIG_USB_VL600 is not set
 CONFIG_WAN=y
 # CONFIG_HDLC is not set
 # CONFIG_DLCI is not set
 CONFIG_IEEE802154_DRIVERS=m
 # CONFIG_IEEE802154_FAKEHARD is not set
+#
+# CAIF transport drivers
+#
 CONFIG_PPP=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPP_FILTER=y
@@ -1261,7 +1370,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 #
 CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
-# CONFIG_INPUT_POLLDEV is not set
+CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
 #
@@ -1277,7 +1386,9 @@ CONFIG_INPUT_EVDEV=y
 #
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_GPIO is not set
@@ -1285,6 +1396,8 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
@@ -1313,15 +1426,17 @@ CONFIG_INPUT_JOYSTICK=y
 # CONFIG_JOYSTICK_STINGER is not set
 # CONFIG_JOYSTICK_TWIDJOY is not set
 # CONFIG_JOYSTICK_ZHENHUA is not set
+# CONFIG_JOYSTICK_AS5011 is not set
 # CONFIG_JOYSTICK_JOYDUMP is not set
 # CONFIG_JOYSTICK_XPAD is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
@@ -1329,6 +1444,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
 # CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
@@ -1338,10 +1454,12 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+CONFIG_TOUCHSCREEN_TSC2005=m
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
-CONFIG_TOUCHSCREEN_SYNTM12XX=y
+# CONFIG_TOUCHSCREEN_ST1232 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
+CONFIG_TOUCHSCREEN_SYNTM12XX=y
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 CONFIG_INPUT_ATI_REMOTE=m
@@ -1355,9 +1473,10 @@ CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_TWL6040_VIBRA=m
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_SFH7741=y
+# CONFIG_INPUT_ADXL34X is not set
-CONFIG_INPUT_CMA3000_I2C=y
+# CONFIG_INPUT_CMA3000 is not set
 #
 # Hardware I/O ports
@@ -1367,6 +1486,7 @@ CONFIG_SERIO_SERPORT=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
 # CONFIG_GAMEPORT is not set
 #
@@ -1377,9 +1497,13 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_DEVKMEM=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
+# CONFIG_TRACE_SINK is not set
+CONFIG_DEVKMEM=y
 #
 # Serial drivers
@@ -1390,6 +1514,7 @@ CONFIG_DEVKMEM=y
 # Non-8250 serial port support
 #
 # CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX3107 is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_OMAP=y
@@ -1397,9 +1522,10 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
-CONFIG_UNIX98_PTYS=y
+# CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_LEGACY_PTYS is not set
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -1412,6 +1538,14 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=m
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_ALGOBIT=m
@@ -1427,12 +1561,14 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_OCORES is not set
 CONFIG_I2C_OMAP=y
 # CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_XILINX is not set
 #
 # External I2C/SMBus adapter drivers
 #
+# CONFIG_I2C_DIOLAN_U2C is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_TINY_USB is not set
@@ -1451,9 +1587,12 @@ CONFIG_SPI_MASTER=y
 #
 # SPI Master Controller Drivers
 #
+# CONFIG_SPI_ALTERA is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_OMAP24XX=y
+# CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_DESIGNWARE is not set
@@ -1467,14 +1606,27 @@ CONFIG_SPI_SPIDEV=m
 # PPS support
 #
 # CONFIG_PPS is not set
+#
+# PPS generators support
+#
+#
+# PTP clock support
+#
+#
+# Enable Device Drivers -> PPS to see the PTP clock options.
+#
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_GPIO_SYSFS is not set
 #
-# Memory mapped GPIO expanders:
+# Memory mapped GPIO drivers:
 #
+# CONFIG_GPIO_BASIC_MMIO is not set
 # CONFIG_GPIO_IT8761E is not set
 #
@@ -1482,8 +1634,8 @@ CONFIG_GPIOLIB=y
 #
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_TWL4030 is not set
 # CONFIG_GPIO_ADP5588 is not set
@@ -1497,6 +1649,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
 #
 # AC97 GPIO expanders:
@@ -1505,17 +1658,22 @@ CONFIG_GPIOLIB=y
 #
 # MODULbus GPIO expanders:
 #
+CONFIG_GPIO_TPS65910=y
 # CONFIG_W1 is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
-# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2782 is not set
-CONFIG_TWL6030_BCI_BATTERY=y
+# CONFIG_BATTERY_BQ20Z75 is not set
-CONFIG_CHARGER_BQ2415x=y
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_TWL4030 is not set
+CONFIG_CHARGER_GPIO=m
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1538,6 +1696,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ADT7475 is not set
 # CONFIG_SENSORS_ASC7621 is not set
 # CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS620 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_F71882FG is not set
@@ -1545,7 +1704,10 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_G760A is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
+CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM70 is not set
 # CONFIG_SENSORS_LM73 is not set
@@ -1559,21 +1721,33 @@ CONFIG_SENSORS_LM75=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
 # CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
 # CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SMM665 is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+CONFIG_SENSORS_ADS1015=m
 # CONFIG_SENSORS_ADS7828 is not set
 # CONFIG_SENSORS_ADS7871 is not set
 # CONFIG_SENSORS_AMC6821 is not set
@@ -1581,18 +1755,17 @@ CONFIG_SENSORS_LM75=y
 # CONFIG_SENSORS_TMP102 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TWL6030_HOTDIE is not set
+# CONFIG_SENSORS_TWL4030_MADC is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
 # CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83L786NG is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_THERMAL is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1621,6 +1794,12 @@ CONFIG_SSB_SDIOHOST_POSSIBLE=y
 # CONFIG_SSB_SDIOHOST is not set
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSB_DEBUG is not set
+CONFIG_BCMA_POSSIBLE=y
+#
+# Broadcom specific AMBA
+#
+# CONFIG_BCMA is not set
 CONFIG_MFD_SUPPORT=y
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_88PM860X is not set
@@ -1629,15 +1808,18 @@ CONFIG_MFD_CORE=y
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
+CONFIG_TPS6105X=m
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
+CONFIG_MFD_TPS6586X=y
 CONFIG_TWL4030_CORE=y
-# CONFIG_TWL4030_POWER is not set
+CONFIG_TWL4030_MADC=m
-CONFIG_TWL4030_CODEC=y
+CONFIG_TWL4030_POWER=y
-# CONFIG_MFD_TC35892 is not set
+CONFIG_MFD_TWL4030_AUDIO=y
 CONFIG_TWL6030_PWM=y
-CONFIG_TWL6030_GPADC=y
+CONFIG_TWL6040_CORE=y
-CONFIG_TWL6040_CODEC=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
@@ -1645,46 +1827,58 @@ CONFIG_TWL6040_CODEC=y
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_MC13XXX is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_EZX_PCAP is not set
-# CONFIG_AB8500_CORE is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_OMAP_USB_HOST=y
+CONFIG_MFD_TPS65910=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_DUMMY is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 # CONFIG_REGULATOR_BQ24022 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
 CONFIG_REGULATOR_TWL4030=y
 # CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+CONFIG_REGULATOR_TPS6105X=m
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_TPS6586X=y
+CONFIG_REGULATOR_TPS6524X=y
+CONFIG_REGULATOR_TPS65910=y
 CONFIG_MEDIA_SUPPORT=y
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_VIDEO_ALLOW_V4L1=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_DVB_CORE=m
 CONFIG_VIDEO_MEDIA=m
 #
 # Multimedia drivers
 #
-CONFIG_IR_CORE=y
+CONFIG_RC_CORE=y
-CONFIG_VIDEO_IR=y
 CONFIG_LIRC=y
 CONFIG_RC_MAP=y
 CONFIG_IR_NEC_DECODER=y
@@ -1696,7 +1890,9 @@ CONFIG_IR_RC5_SZ_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 # CONFIG_IR_IMON is not set
 CONFIG_IR_MCEUSB=m
+# CONFIG_IR_REDRAT3 is not set
 CONFIG_IR_STREAMZAP=m
+# CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
@@ -1717,11 +1913,11 @@ CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18212=m
 CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_GEN=y
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=y
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
@@ -1730,21 +1926,57 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_VIDEO_IR_I2C=y
+#
+# Audio decoders, processors and mixers
+#
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS53L32A=m
 CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_MT9V011=m
+#
+# RDS decoders
+#
+#
+# Video decoders
+#
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_TVP5150=m
+#
+# Video and audio decoders
+#
 CONFIG_VIDEO_CX25840=m
+#
+# MPEG video encoders
+#
 CONFIG_VIDEO_CX2341X=m
+#
+# Video encoders
+#
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_MT9V011=m
+#
+# Video improvement chips
+#
+#
+# Miscelaneous helper chips
+#
 # CONFIG_VIDEO_VIVI is not set
-CONFIG_VIDEO_OMAP2_VOUT=y
+# CONFIG_VIDEO_OMAP_GFX is not set
-# CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_VIDEO_AU0828 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
 # CONFIG_SOC_CAMERA is not set
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
@@ -1759,8 +1991,11 @@ CONFIG_USB_GSPCA=m
 # CONFIG_USB_GSPCA_ETOMS is not set
 # CONFIG_USB_GSPCA_FINEPIX is not set
 # CONFIG_USB_GSPCA_JEILINJ is not set
+CONFIG_USB_GSPCA_KINECT=m
+# CONFIG_USB_GSPCA_KONICA is not set
 # CONFIG_USB_GSPCA_MARS is not set
 # CONFIG_USB_GSPCA_MR97310A is not set
+CONFIG_USB_GSPCA_NW80X=m
 # CONFIG_USB_GSPCA_OV519 is not set
 # CONFIG_USB_GSPCA_OV534 is not set
 # CONFIG_USB_GSPCA_OV534_9 is not set
@@ -1777,14 +2012,18 @@ CONFIG_USB_GSPCA=m
 # CONFIG_USB_GSPCA_SPCA506 is not set
 # CONFIG_USB_GSPCA_SPCA508 is not set
 # CONFIG_USB_GSPCA_SPCA561 is not set
+CONFIG_USB_GSPCA_SPCA1528=m
 # CONFIG_USB_GSPCA_SQ905 is not set
 # CONFIG_USB_GSPCA_SQ905C is not set
+CONFIG_USB_GSPCA_SQ930X=m
 # CONFIG_USB_GSPCA_STK014 is not set
 # CONFIG_USB_GSPCA_STV0680 is not set
 # CONFIG_USB_GSPCA_SUNPLUS is not set
 # CONFIG_USB_GSPCA_T613 is not set
 # CONFIG_USB_GSPCA_TV8532 is not set
 # CONFIG_USB_GSPCA_VC032X is not set
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
 # CONFIG_USB_GSPCA_ZC3XX is not set
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
@@ -1796,22 +2035,12 @@ CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_QUICKCAM_MESSENGER=m
 CONFIG_USB_ET61X251=m
-CONFIG_VIDEO_OVCAMCHIP=m
-CONFIG_USB_W9968CF=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
 CONFIG_USB_SN9C102=m
-CONFIG_USB_STV680=m
-CONFIG_USB_ZC0301=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
@@ -1828,6 +2057,12 @@ CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_TEA5764 is not set
 # CONFIG_RADIO_SAA7706H is not set
 # CONFIG_RADIO_TEF6862 is not set
+CONFIG_RADIO_WL1273=m
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
 CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -1867,6 +2102,8 @@ CONFIG_DVB_USB_CE6230=m
 CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_AZ6027=m
+# CONFIG_DVB_USB_LME2510 is not set
+# CONFIG_DVB_USB_TECHNISAT_USB2 is not set
 CONFIG_SMS_SIANO_MDTV=m
 #
@@ -1886,8 +2123,16 @@ CONFIG_DVB_B2C2_FLEXCOP_USB=m
 # Supported DVB Frontends
 #
 # CONFIG_DVB_FE_CUSTOMISE is not set
+#
+# Multistandard (satellite) frontends
+#
 CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
+#
+# DVB-S (satellite) frontends
+#
 CONFIG_DVB_CX24123=m
 CONFIG_DVB_MT312=m
 CONFIG_DVB_ZL10039=m
@@ -1904,7 +2149,12 @@ CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
+#
+# DVB-T (terrestrial) frontends
+#
 CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
@@ -1916,48 +2166,91 @@ CONFIG_DVB_DIB7000P=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
+CONFIG_DVB_CXD2820R=m
+#
+# DVB-C (cable) frontends
+#
 CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
 CONFIG_DVB_NXT200X=m
 CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_LGDT3305=m
 CONFIG_DVB_S5H1409=m
 CONFIG_DVB_S5H1411=m
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
 CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+#
+# Digital terrestrial only tuners/PLL
+#
 CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
+#
+# SEC control devices for DVB-S
+#
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
-# CONFIG_DAB is not set
-CONFIG_DMM_OMAP=y
+#
-CONFIG_TILER_OMAP=y
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+CONFIG_HAVE_TI_TILER=y
+CONFIG_TI_TILER=y
+CONFIG_TILER_GRANULARITY=128
+CONFIG_TILER_ALIGNMENT=4096
+CONFIG_TILER_CACHE_LIMIT=40
+CONFIG_TILER_SECURITY=1
+CONFIG_TILER_SSPTR_ID=1
+# CONFIG_TILER_SECURE is not set
+CONFIG_TILER_EXPOSE_SSPTR=y
+CONFIG_TILER_ENABLE_NV12=y
+CONFIG_TILER_ENABLE_USERSPACE=y
 #
 # Graphics support
 #
 CONFIG_DRM=m
-# CONFIG_DRM_MGA is not set
+CONFIG_DRM_KMS_HELPER=m
-# CONFIG_DRM_VIA is not set
+CONFIG_SGX540=y
-# CONFIG_DRM_SAVAGE is not set
+CONFIG_VIRTUAL_DISPLAY_SUPPORT=m
+# CONFIG_SGX_REV110 is not set
+CONFIG_SGX_REV120=y
+CONFIG_SGX_540_BUILD_RELEASE=y
+# CONFIG_SGX_540_BUILD_DEBUG is not set
+# CONFIG_SGX_PDUMP is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 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_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -1971,9 +2264,9 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_UVESA is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_TMIO is not set
+CONFIG_FB_UDL=m
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
 CONFIG_OMAP2_VRAM=y
@@ -1984,26 +2277,27 @@ CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
 CONFIG_OMAP2_DSS_DPI=y
 # CONFIG_OMAP2_DSS_RFBI is not set
 # CONFIG_OMAP2_DSS_VENC is not set
-CONFIG_OMAP2_DSS_HDMI=y
+CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_DSI=y
-# CONFIG_OMAP2_DSS_USE_DSI_PLL is not set
 CONFIG_OMAP2_DSS_FAKE_VSYNC=y
 CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
-CONFIG_FB_OMAP2=y
+CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
+CONFIG_FB_OMAP2=m
 CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
 CONFIG_FB_OMAP2_NUM_FBS=2
 #
 # OMAP2/3 Display Device Drivers
 #
-CONFIG_PANEL_GENERIC=y
+CONFIG_PANEL_GENERIC_DPI=y
+# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
 CONFIG_PANEL_SHARP_LS037V7DW01=y
-# CONFIG_PANEL_SHARP_LQ043T1DG01 is not set
-CONFIG_PANEL_PICO_DLP=y
-CONFIG_PANEL_TAAL=y
 CONFIG_PANEL_NEC_NL8048HL11_01B=y
-# CONFIG_PANEL_TOPPOLY_TDO35S is not set
+CONFIG_PANEL_PICODLP=y
+CONFIG_PANEL_TAAL=y
 # CONFIG_PANEL_TPO_TD043MTEA1 is not set
+# CONFIG_PANEL_ACX565AKM is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_L4F00242T03 is not set
@@ -2013,10 +2307,12 @@ CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LCD_PLATFORM is not set
 # CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=y
 # CONFIG_BACKLIGHT_PWM is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
+CONFIG_BACKLIGHT_ADP8870=y
 #
 # Display device support
@@ -2026,10 +2322,9 @@ CONFIG_BACKLIGHT_GENERIC=y
 #
 # Console display driver support
 #
-# CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@@ -2073,6 +2368,7 @@ CONFIG_SND_RAWMIDI_SEQ=m
 # CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
 # CONFIG_SND_VIRMIDI is not set
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
@@ -2084,15 +2380,18 @@ CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
+# CONFIG_SND_USB_6FIRE is not set
 CONFIG_SND_SOC=y
+CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_OMAP_SOC=y
 CONFIG_SND_OMAP_SOC_ABE_DSP=y
 CONFIG_SND_OMAP_SOC_MCBSP=y
 CONFIG_SND_OMAP_SOC_MCPDM=y
+CONFIG_SND_OMAP_SOC_HDMI=y
 CONFIG_SND_OMAP_SOC_ABE=y
 CONFIG_SND_OMAP_SOC_DMIC=y
 CONFIG_SND_OMAP_SOC_SDP4430=y
-CONFIG_SND_OMAP_SOC_HDMI=y
+CONFIG_SND_OMAP_SOC_OMAP4_HDMI=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SOC_DMIC=y
@@ -2112,27 +2411,31 @@ CONFIG_USB_HID=y
 #
 # Special HID drivers
 #
-# CONFIG_HID_3M_PCT is not set
 # CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACRUX is not set
 # CONFIG_HID_APPLE is not set
 # CONFIG_HID_BELKIN is not set
-# CONFIG_HID_CANDO is not set
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
 # CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EGALAX is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_ELECOM is not set
 # CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
 # CONFIG_HID_GYRATION is not set
 # CONFIG_HID_TWINHAN is not set
 # CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LCPOWER 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_MULTITOUCH is not set
 # CONFIG_HID_NTRIG is not set
 # CONFIG_HID_ORTEK is not set
 # CONFIG_HID_PANTHERLORD is not set
@@ -2140,10 +2443,13 @@ CONFIG_USB_HID=y
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_QUANTA is not set
 # CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
 # CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
+# CONFIG_HID_ROCCAT_PYRA 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
@@ -2181,7 +2487,7 @@ CONFIG_USB_WUSB=m
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_HCD_OMAP3=y
+CONFIG_USB_EHCI_HCD_OMAP=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
@@ -2191,19 +2497,18 @@ CONFIG_USB_EHCI_HCD_OMAP3=y
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_MUSB_HDRC=y
-CONFIG_USB_MUSB_SOC=y
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_OMAP2PLUS=m
-#
+# CONFIG_USB_MUSB_AM35X is not set
-# OMAP 44xx high speed USB support
-#
 # CONFIG_USB_MUSB_HOST is not set
 CONFIG_USB_MUSB_PERIPHERAL=y
 # CONFIG_USB_MUSB_OTG is not set
 CONFIG_USB_GADGET_MUSB_HDRC=y
 # CONFIG_MUSB_PIO_ONLY is not set
+# CONFIG_USB_UX500_DMA is not set
 CONFIG_USB_INVENTRA_DMA=y
 # CONFIG_USB_TI_CPPI_DMA is not set
-CONFIG_USB_MUSB_DEBUG=y
+CONFIG_USB_TUSB_OMAP_DMA=y
 #
 # USB Device Class drivers
@@ -2222,6 +2527,7 @@ CONFIG_USB_TMC=m
 #
 CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
@@ -2233,6 +2539,8 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_ONETOUCH is not set
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_UAS is not set
 # CONFIG_USB_LIBUSUAL is not set
 #
@@ -2268,30 +2576,18 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_IOWARRIOR is not set
 CONFIG_USB_TEST=m
 # CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_YUREX is not set
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_PXA25X is not set
 # CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_S3C_HSOTG is not set
-# CONFIG_USB_GADGET_IMX is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
 # CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_FSL_QE is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_ZERO=m
@@ -2299,6 +2595,7 @@ CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_G_NCM=m
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_FUNCTIONFS is not set
 CONFIG_USB_FILE_STORAGE=m
@@ -2308,7 +2605,6 @@ CONFIG_USB_G_SERIAL=m
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
 CONFIG_USB_CDC_COMPOSITE=m
-# CONFIG_USB_G_NOKIA is not set
 CONFIG_USB_G_MULTI=m
 CONFIG_USB_G_MULTI_RNDIS=y
 CONFIG_USB_G_MULTI_CDC=y
@@ -2327,17 +2623,17 @@ CONFIG_TWL6030_USB=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
-CONFIG_UWB_WLP=m
 CONFIG_UWB_I1480U=m
-CONFIG_UWB_I1480U_WLP=m
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y
+CONFIG_MMC_CLKGATE=y
 #
 # MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
@@ -2348,6 +2644,9 @@ CONFIG_SDIO_UART=m
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_OMAP is not set
 CONFIG_MMC_OMAP_HS=y
+# CONFIG_MMC_DW is not set
+# CONFIG_MMC_VUB300 is not set
+# CONFIG_MMC_USHC is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -2355,10 +2654,14 @@ CONFIG_LEDS_CLASS=y
 #
 # LED drivers
 #
+# CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_GPIO_OF=y
 # CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_PWM=y
@@ -2379,6 +2682,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 #
 # iptables trigger is under Netfilter config (LED target)
 #
+# CONFIG_NFC_DEVICES is not set
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -2401,9 +2705,11 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_DS1307 is not set
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
@@ -2414,10 +2720,13 @@ CONFIG_RTC_DRV_TWL4030=y
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
 #
 # SPI RTC drivers
 #
+# CONFIG_RTC_DRV_M41T93 is not set
 # CONFIG_RTC_DRV_M41T94 is not set
 # CONFIG_RTC_DRV_DS1305 is not set
 # CONFIG_RTC_DRV_DS1390 is not set
@@ -2453,26 +2762,25 @@ CONFIG_UIO=m
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
 # CONFIG_VIDEO_TM6000 is not set
-# CONFIG_USB_IP_COMMON is not set
+# CONFIG_USBIP_CORE is not set
 # CONFIG_W35UND is not set
 CONFIG_PRISM2_USB=m
 # CONFIG_ECHO is not set
-# CONFIG_OTUS is not set
+# CONFIG_BRCMUTIL is not set
-# CONFIG_RT2870 is not set
-# CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
+CONFIG_R8712U=m
+CONFIG_R8712_AP=y
 # CONFIG_TRANZPORT is not set
 # CONFIG_POHMELFS is not set
 # CONFIG_LINE6_USB is not set
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_VT6656 is not set
-CONFIG_FB_UDL=m
 #
-# RAR Register Driver
+# I2C encoder or helper chips
 #
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_VT6656 is not set
 CONFIG_IIO=y
 # CONFIG_IIO_RING_BUFFER is not set
 # CONFIG_IIO_TRIGGER is not set
@@ -2480,6 +2788,9 @@ CONFIG_IIO=y
 #
 # Accelerometers
 #
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16204 is not set
 # CONFIG_ADIS16209 is not set
 # CONFIG_ADIS16220 is not set
 # CONFIG_ADIS16240 is not set
@@ -2489,47 +2800,100 @@ CONFIG_IIO=y
 #
 # Analog to digital convertors
 #
+# CONFIG_AD7150 is not set
+# CONFIG_AD7152 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7314 is not set
+# CONFIG_AD7606 is not set
+# CONFIG_AD799X is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7745 is not set
+# CONFIG_AD7816 is not set
+# CONFIG_ADT75 is not set
+# CONFIG_ADT7310 is not set
+# CONFIG_ADT7410 is not set
 # CONFIG_MAX1363 is not set
 #
+# Analog digital bi-direction convertors
+#
+# CONFIG_ADT7316 is not set
+#
+# Digital to analog convertors
+#
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_MAX517 is not set
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD5930 is not set
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# CONFIG_AD9850 is not set
+# CONFIG_AD9852 is not set
+# CONFIG_AD9910 is not set
+# CONFIG_AD9951 is not set
+#
 # Digital gyroscope sensors
 #
+# CONFIG_ADIS16060 is not set
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
 # CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS450 is not set
 #
 # Inertial measurement units
 #
-# CONFIG_ADIS16300 is not set
-# CONFIG_ADIS16350 is not set
 # CONFIG_ADIS16400 is not set
 #
 # Light sensors
 #
+# CONFIG_SENSORS_ISL29018 is not set
 # CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
 #
 # Magnetometer sensors
 #
+# CONFIG_SENSORS_AK8975 is not set
 CONFIG_SENSORS_HMC5843=y
 #
-# Triggers - standalone
+# Active energy metering IC
 #
-CONFIG_RAMZSWAP=m
+# CONFIG_ADE7753 is not set
-CONFIG_RAMZSWAP_STATS=y
+# CONFIG_ADE7754 is not set
-# CONFIG_BATMAN_ADV is not set
+# CONFIG_ADE7758 is not set
-# CONFIG_FB_SM7XX is not set
+# CONFIG_ADE7759 is not set
+# CONFIG_ADE7854 is not set
 #
-# Texas Instruments shared transport line discipline
+# Resolver to digital converters
 #
-CONFIG_TI_ST=m
+# CONFIG_AD2S90 is not set
-CONFIG_ST_BT=m
+# CONFIG_AD2S120X is not set
-CONFIG_ST_FM=m
+# CONFIG_AD2S1210 is not set
-# CONFIG_ADIS16255 is not set
+#
+# Triggers - standalone
+#
+CONFIG_XVMALLOC=y
+CONFIG_ZRAM=y
+# CONFIG_ZRAM_DEBUG is not set
+CONFIG_ZCACHE=y
+# CONFIG_FB_SM7XX is not set
 CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_I2C=m
 CONFIG_LIRC_IGORPLUGUSB=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC_SASEM=m
@@ -2538,6 +2902,32 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_TTUSBIR=m
 CONFIG_LIRC_ZILOG=m
+CONFIG_EASYCAP=m
+CONFIG_EASYCAP_SND=y
+# CONFIG_EASYCAP_OSS is not set
+# CONFIG_EASYCAP_DEBUG is not set
+CONFIG_MACH_NO_WESTBRIDGE=y
+# CONFIG_ATH6K_LEGACY is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+CONFIG_DRM_OMAP=m
+CONFIG_DRM_OMAP_NUM_CRTCS=2
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK_OMAP=m
 CONFIG_Sys_Link=y
 CONFIG_SYSLINK_PROC=y
 CONFIG_SYSLINK_PROC4430=y
@@ -2550,35 +2940,6 @@ CONFIG_SYSLINK_USE_SYSMGR=y
 CONFIG_SYSLINK_IOMMU_ENABLE=y
 CONFIG_SYSLINK_RECOVERY=y
 # CONFIG_DMM_DMA_API is not set
-# CONFIG_TILER_PID_KILL_NOTIFICATIONS is not set
-#
-# Ubuntu Supplied Third-Party Device Drivers
-#
-CONFIG_AUFS_FS=m
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-CONFIG_AUFS_HNOTIFY=y
-CONFIG_AUFS_HFSNOTIFY=y
-# CONFIG_AUFS_HINOTIFY is not set
-# CONFIG_AUFS_RDU is not set
-CONFIG_AUFS_SP_IATTR=y
-# CONFIG_AUFS_SHWH is not set
-# CONFIG_AUFS_BR_RAMFS is not set
-CONFIG_AUFS_BR_FUSE=y
-CONFIG_AUFS_POLL=y
-CONFIG_AUFS_BDEV_LOOP=y
-# CONFIG_AUFS_DEBUG is not set
-#
-# Compcache options
-#
-CONFIG_BLK_DEV_COMPCACHE=m
-# CONFIG_BLK_DEV_COMPCACHE_DEBUG is not set
-CONFIG_BLK_DEV_COMPCACHE_STATS=y
-CONFIG_SCSI_ISCSITARGET=m
 #
 # File systems
@@ -2594,17 +2955,18 @@ CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
-CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
 CONFIG_QUOTA=y
 # CONFIG_QUOTA_NETLINK_INTERFACE is not set
 CONFIG_PRINT_QUOTA_WARNING=y
@@ -2613,7 +2975,6 @@ CONFIG_QUOTA_TREE=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
-# CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
@@ -2649,11 +3010,13 @@ CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -2668,6 +3031,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -2677,6 +3041,9 @@ CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 # CONFIG_NFS_V4_1 is not set
 CONFIG_ROOT_NFS=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_USE_NEW_IDMAPPER=y
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
@@ -2684,9 +3051,6 @@ CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
 # CONFIG_CEPH_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
@@ -2760,6 +3124,7 @@ CONFIG_NLS_ISO8859_1=y
 # Kernel hacking
 #
 CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@@ -2768,10 +3133,13 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DETECT_SOFTLOCKUP is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
 CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_SCHED_DEBUG is not set
@@ -2788,60 +3156,75 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_CPU_STALL_VERBOSE=y
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_LKDTM is not set
 # CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
-# CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 # CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_STRICT_DEVMEM is not set
 # CONFIG_ARM_UNWIND is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_LL is not set
 # CONFIG_OC_ETM is not set
 #
 # Security options
 #
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-# CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
 CONFIG_CRYPTO=y
 #
@@ -2856,10 +3239,10 @@ CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER_TESTS=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCRYPT is not set
@@ -2941,14 +3324,16 @@ CONFIG_CRYPTO_DEFLATE=m
 # Random Number Generation
 #
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
 CONFIG_CRYPTO_HW=y
 # CONFIG_BINARY_PRINTF is not set
 #
 # Library routines
 #
+CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
@@ -2958,9 +3343,19 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=m
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_XZ=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
@@ -2969,4 +3364,6 @@ CONFIG_TEXTSEARCH_FSM=m
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
+CONFIG_AVERAGE=y
diff --git a/recipes-kernel/linux/linux-omap4/0001-UBUNTU-Config-Fix-FTBS-caused-by-new-binutils.patch b/recipes-kernel/linux/linux-omap4/0001-UBUNTU-Config-Fix-FTBS-caused-by-new-binutils.patch
deleted file mode 100644
index e83a3e25..00000000
--- a/recipes-kernel/linux/linux-omap4/0001-UBUNTU-Config-Fix-FTBS-caused-by-new-binutils.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7699704e011db864c56f333bce9936a36522fb79 Mon Sep 17 00:00:00 2001
-From: Tim Gardner <tim.gardner@canonical.com>
-Date: Thu, 9 Dec 2010 08:16:52 -0700
-Subject: [PATCH 1/2] UBUNTU: [Config] Fix FTBS caused by new binutils
-New assemblers need -march=armv7-a+sec on command line or
-.arch_extension sec inline to enable use of the smc instruction.
-This patch uses as-instr to check the latter to conditionally
-enable the former in AFLAGS for files that use smc.
-Checked on both old and new binutils to verify that it does
-not break old versions.
-Signed-off-by: John Rigby <john.rigby@linaro.org>
-Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
- arch/arm/mach-omap2/Makefile |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
-index 75251b4..0241b4d 100644
--- a/arch/arm/mach-omap2/Makefile
-+++ b/arch/arm/mach-omap2/Makefile
-@@ -29,7 +29,9 @@ obj-$(CONFIG_HOTPLUG_CPU)             += omap-hotplug.o
- obj-$(CONFIG_ARCH_OMAP4)               += omap44xx-smc.o omap4-common.o \
-                                           omap4-wakeupgen.o
- 
-AFLAGS_omap44xx-smc.o                  :=-Wa,-march=armv7-a
-+plus_sec := $(call as-instr,.arch_extension sec,+sec)
-+AFLAGS_omap-headsmp.o                  :=-Wa,-march=armv7-a$(plus_sec)
-+AFLAGS_omap44xx-smc.o                  :=-Wa,-march=armv7-a$(plus_sec)
- 
- # Functions loaded to SRAM
- obj-$(CONFIG_ARCH_OMAP2420)            += sram242x.o
-- 
-1.7.0.2
diff --git a/recipes-kernel/linux/linux-omap4/0001-tiler-avoid-lock-ups-due-to-unmapped-DMM-entries.patch b/recipes-kernel/linux/linux-omap4/0001-tiler-avoid-lock-ups-due-to-unmapped-DMM-entries.patch
deleted file mode 100644
index a8d15dce..00000000
--- a/recipes-kernel/linux/linux-omap4/0001-tiler-avoid-lock-ups-due-to-unmapped-DMM-entries.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 694125c6684f8bafbf5c4502659f1322fae33af2 Mon Sep 17 00:00:00 2001
-From: Rob Clark <rob@ti.com>
-Date: Sat, 10 Jul 2010 18:03:16 -0500
-Subject: [PATCH 1/8] tiler: avoid lock-ups due to unmapped DMM entries
-Due to the address remapping done for 2d buffers, when a 2d buffer is
-allocated by userspace, it is possible that only partial pages map to
-valid physical pages of memory.  But the MMU can only protect accesses
-to invalid addresses on the granualarity of full pages.  Which results
-in the inconvenient situation where access to a perfectly valid address
-(from the point of view of a userspace process's memory map) can lock
-up the processor.
-To protect against this, a single dummy page is allocated at boot time
-and mapped in to the entire DMM space.  When actual buffers are alloc'd,
-the mapping is replaced with the actual pages allocated for the buffer.
-And when the actual TILER buffer is freed, the mappings are set back to
-the dummy page.
-As a result, there is no longer the need for a clear() function in DMM.
-Instead the clear operation is simply remapping DMM entries back to the
-dummy page.
-As an added advantage, now pages are properly unmapped from DMM when
-TILER buffers are freed, avoiding the potential to corrupt pages that
-where previously allocated for TILER buffers.
---
- drivers/media/video/dmm/tmm.h     |   12 ------------
- drivers/media/video/dmm/tmm_pat.c |    1 -
- drivers/media/video/tiler/tiler.c |   27 ++++++++++++++++++++++++++-
- 3 files changed, 26 insertions(+), 14 deletions(-)
-diff --git a/drivers/media/video/dmm/tmm.h b/drivers/media/video/dmm/tmm.h
-index deaeca5..b86dbc3 100644
--- a/drivers/media/video/dmm/tmm.h
-+++ b/drivers/media/video/dmm/tmm.h
-@@ -27,7 +27,6 @@ struct tmm {
-        u32 *(*get)    (struct tmm *tmm, s32 num_pages);
-        void (*free)   (struct tmm *tmm, u32 *pages);
-        s32  (*map)    (struct tmm *tmm, struct pat_area area, u32 page_pa);
-       void (*clear)  (struct tmm *tmm, struct pat_area area);
-        void (*deinit) (struct tmm *tmm);
- };
- 
-@@ -68,17 +67,6 @@ s32 tmm_map(struct tmm *tmm, struct pat_area area, u32 page_pa)
- }
- 
- /**
- * Clears the physical address translator.
- * @param area PAT area
- */
-static inline
-void tmm_clear(struct tmm *tmm, struct pat_area area)
-{
-       if (tmm && tmm->clear && tmm->pvt)
-               tmm->clear(tmm, area);
-}
-
-/**
-  * Checks whether tiler memory manager supports mapping
-  */
- static inline
-diff --git a/drivers/media/video/dmm/tmm_pat.c b/drivers/media/video/dmm/tmm_pat.c
-index 4ee59bd..c9c9aa5 100644
--- a/drivers/media/video/dmm/tmm_pat.c
-+++ b/drivers/media/video/dmm/tmm_pat.c
-@@ -316,7 +316,6 @@ struct tmm *tmm_pat_init(u32 pat_id)
-                tmm->get = tmm_pat_get_pages;
-                tmm->free = tmm_pat_free_pages;
-                tmm->map = tmm_pat_map;
-               tmm->clear = NULL;   /* not yet supported */
- 
-                return tmm;
-        }
-diff --git a/drivers/media/video/tiler/tiler.c b/drivers/media/video/tiler/tiler.c
-index 1c117eb..9ce065c 100644
--- a/drivers/media/video/tiler/tiler.c
-+++ b/drivers/media/video/tiler/tiler.c
-@@ -125,6 +125,9 @@ static struct tmm *tmm[TILER_FORMATS];
- static u32 *dmac_va;
- static dma_addr_t dmac_pa;
- 
-+static u32 *dummy_mem;
-+static u32 dummy_pa;
-+
- #define TCM(fmt)        tcm[(fmt) - TILFMT_8BIT]
- #define TCM_SS(ssptr)   TCM(TILER_GET_ACC_MODE(ssptr))
- #define TCM_SET(fmt, i) tcm[(fmt) - TILFMT_8BIT] = i
-@@ -410,6 +413,7 @@ static void clear_pat(struct tmm *tmm, struct tcm_area *area)
- {
-        struct pat_area p_area = {0};
-        struct tcm_area slice, area_s;
-+       int i;
- 
-        tcm_for_each_slice(slice, *area, area_s) {
-                p_area.x0 = slice.p0.x;
-@@ -417,7 +421,11 @@ static void clear_pat(struct tmm *tmm, struct tcm_area *area)
-                p_area.x1 = slice.p1.x;
-                p_area.y1 = slice.p1.y;
- 
-               tmm_clear(tmm, p_area);
-+               for (i = 0; i<tcm_sizeof(slice); i++) {
-+                       dmac_va[i] = dummy_pa;
-+               }
-+
-+               tmm_map(tmm, p_area, dmac_pa);
-        }
- }
- 
-@@ -1467,6 +1475,8 @@ static void __exit tiler_exit(void)
-        kfree(tiler_device);
-        device_destroy(tilerdev_class, MKDEV(tiler_major, tiler_minor));
-        class_destroy(tilerdev_class);
-+
-+       free_pages_exact(dummy_mem, PAGE_SIZE);
- }
- 
- static s32 tiler_open(struct inode *ip, struct file *filp)
-@@ -1509,6 +1519,7 @@ static s32 __init tiler_init(void)
-        struct tcm_pt div_pt;
-        struct tcm *sita = NULL;
-        struct tmm *tmm_pat = NULL;
-+       struct tcm_area area = {0};
- 
-        if (!cpu_is_omap44xx())
-                return 0;
-@@ -1583,6 +1594,20 @@ static s32 __init tiler_init(void)
-        BLOCKING_INIT_NOTIFIER_HEAD(&tiler_device->notifier);
-        id = 0xda7a000;
- 
-+       /* Dummy page for filling unused entries in dmm (dmac_va):
-+        */
-+       dummy_mem = alloc_pages_exact(PAGE_SIZE, GFP_KERNEL);
-+       dummy_pa = virt_to_phys(dummy_mem);
-+
-+       /* clear the entire dmm space:
-+        */
-+       area.tcm = sita;
-+       area.p0.x = 0;
-+       area.p0.y = 0;
-+       area.p1.x = TILER_WIDTH - 1;
-+       area.p1.y = TILER_HEIGHT - 1;
-+       clear_pat(tmm_pat, &area);
-+
- error:
-        /* TODO: error handling for device registration */
-        if (r) {
-- 
-1.6.6.1
diff --git a/recipes-kernel/linux/linux-omap4/0002-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch b/recipes-kernel/linux/linux-omap4/0002-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch
deleted file mode 100644
index 1156b1f8..00000000
--- a/recipes-kernel/linux/linux-omap4/0002-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0752e20ce23c68183503ac1d7cc5efc66f8cda1d Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Mon, 13 Oct 2008 20:32:16 +0100
-Subject: [PATCH 2/8] ARM: Add prompt for CONFIG_ALIGNMENT_TRAP
-This adds a prompt text for CONFIG_ALIGNMENT_TRAP, thus making it
-visible in make *config.
-Signed-off-by: Mans Rullgard <mans@mansr.com>
---
- arch/arm/Kconfig |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 4432566..4940c98 100644
--- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -1361,7 +1361,7 @@ config LEDS_CPU
-          will overrule the CPU usage LED.
- 
- config ALIGNMENT_TRAP
-       bool
-+       bool "Enable alignment trap"
-        depends on CPU_CP15_MMU
-        default y if !ARCH_EBSA110
-        select HAVE_PROC_CPU if PROC_FS
-- 
-1.6.6.1
diff --git a/recipes-kernel/linux/linux-omap4/0002-Add-AFLAGS-for-sleep44xx-to-fix-FTBS.patch b/recipes-kernel/linux/linux-omap4/0002-Add-AFLAGS-for-sleep44xx-to-fix-FTBS.patch
deleted file mode 100644
index ea16ab11..00000000
--- a/recipes-kernel/linux/linux-omap4/0002-Add-AFLAGS-for-sleep44xx-to-fix-FTBS.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From da58d36fb6b13899249bf1efbf25f7385d048bb3 Mon Sep 17 00:00:00 2001
-From: Tim Gardner <tim.gardner@canonical.com>
-Date: Tue, 14 Dec 2010 06:56:34 -0700
-Subject: [PATCH 2/2] Add AFLAGS for sleep44xx to fix FTBS
-Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
- arch/arm/mach-omap2/Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
-index 0241b4d..865a3e2 100644
--- a/arch/arm/mach-omap2/Makefile
-+++ b/arch/arm/mach-omap2/Makefile
-@@ -59,6 +59,8 @@ obj-$(CONFIG_ARCH_OMAP4)              += pm44xx.o pm_bus.o cpuidle44xx.o \
-                                           omap4-mpuss-lowpower.o sleep44xx.o \
-                                           voltage.o opp44xx_data.o
- 
-+AFLAGS_sleep44xx.o                  :=-Wa,-march=armv7-a$(plus_sec)
-+
- obj-$(CONFIG_PM_DEBUG)                 += pm-debug.o
- obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o
- obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)  += smartreflex-class3.o
-- 
-1.7.0.2
diff --git a/recipes-kernel/linux/linux-omap4/0003-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch b/recipes-kernel/linux/linux-omap4/0003-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch
deleted file mode 100644
index d3dd8e63..00000000
--- a/recipes-kernel/linux/linux-omap4/0003-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8d8ae376807b2f104dcbcea19263ccecbd10feb8 Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Sat, 28 Mar 2009 13:21:55 +0000
-Subject: [PATCH 3/8] ARM: Print warning on alignment trap in kernel mode
-Signed-off-by: Mans Rullgard <mans@mansr.com>
---
- arch/arm/mm/alignment.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
-index 6f98c35..1cda537 100644
--- a/arch/arm/mm/alignment.c
-+++ b/arch/arm/mm/alignment.c
-@@ -760,6 +760,13 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
- 
-        ai_sys += 1;
- 
-+       printk("Alignment trap in kernel: %s (%d) PC=0x%08lx Instr=0x%0*lx "
-+              "Address=0x%08lx FSR 0x%03x\n", current->comm,
-+              task_pid_nr(current), instrptr,
-+              thumb_mode(regs) ? 4 : 8,
-+              thumb_mode(regs) ? tinstr : instr,
-+              addr, fsr);
-+
-  fixup:
- 
-        regs->ARM_pc += isize;
-- 
-1.6.6.1
diff --git a/recipes-kernel/linux/linux-omap4/0004-ARM-Expose-some-CPU-control-registers-via-sysfs.patch b/recipes-kernel/linux/linux-omap4/0004-ARM-Expose-some-CPU-control-registers-via-sysfs.patch
deleted file mode 100644
index e0c618e4..00000000
--- a/recipes-kernel/linux/linux-omap4/0004-ARM-Expose-some-CPU-control-registers-via-sysfs.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From e0a1a2019cac127f3cd86ea65f623c2c56970dcb Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Tue, 10 Nov 2009 00:39:21 +0000
-Subject: [PATCH 4/8] ARM: Expose some CPU control registers via sysfs
-This creates sysfs files under /sys/devices/system/cpu/cpuN
-exposing the values of the control register, auxiliary control
-register, L2 cache auxiliary control register, and PMON registers.
-Writing to the files allows setting the value of bits which are
-safe to change at any time.
-Signed-off-by: Mans Rullgard <mans@mansr.com>
---
- arch/arm/Kconfig           |    5 ++
- arch/arm/kernel/Makefile   |    1 +
- arch/arm/kernel/sysfs_v7.c |  163 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 169 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/kernel/sysfs_v7.c
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 4940c98..f7f8ddc 100644
--- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -1402,6 +1402,11 @@ config CC_STACKPROTECTOR
-          neutralized via a kernel panic.
-          This feature requires gcc version 4.2 or above.
- 
-+config CPU_V7_SYSFS
-+       bool
-+       depends on CPU_V7 && SYSFS
-+       default y
-+
- endmenu
- 
- menu "Boot options"
-diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
-index 26d302c..bbebeec 100644
--- a/arch/arm/kernel/Makefile
-+++ b/arch/arm/kernel/Makefile
-@@ -39,6 +39,7 @@ obj-$(CONFIG_ARM_THUMBEE)     += thumbee.o
- obj-$(CONFIG_KGDB)             += kgdb.o
- obj-$(CONFIG_ARM_UNWIND)       += unwind.o
- obj-$(CONFIG_HAVE_TCM)         += tcm.o
-+obj-$(CONFIG_CPU_V7_SYSFS)     += sysfs_v7.o
- 
- obj-$(CONFIG_CRUNCH)           += crunch.o crunch-bits.o
- AFLAGS_crunch-bits.o           := -Wa,-mcpu=ep9312
-diff --git a/arch/arm/kernel/sysfs_v7.c b/arch/arm/kernel/sysfs_v7.c
-new file mode 100644
-index 0000000..0e492db
--- /dev/null
-+++ b/arch/arm/kernel/sysfs_v7.c
-@@ -0,0 +1,163 @@
-+/*
-+ *  linux/arch/arm/kernel/sysfs.c
-+ *
-+ *  Copyright (C) 2008 Mans Rullgard
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/cpu.h>
-+#include <linux/sysdev.h>
-+#include <linux/fs.h>
-+
-+#define SETBITS(val, bits, new)                        \
-+       do {                                    \
-+               val &= ~bits;                   \
-+               val |= new & bits;              \
-+       } while (0)
-+
-+#define SHOW_REG(name, opc1, crn, crm, opc2)                           \
-+static ssize_t name##_show(struct sys_device *dev,                     \
-+                          struct sysdev_attribute *attr,               \
-+                          char *buf)                                   \
-+{                                                                      \
-+       unsigned val;                                                   \
-+       asm ("mrc p15,"#opc1", %0,"#crn","#crm","#opc2 : "=r"(val));    \
-+       return snprintf(buf, PAGE_SIZE, "%08x\n", val);                 \
-+}
-+
-+#define STORE_REG(name, opc1, crn, crm, opc2, bits)                    \
-+static ssize_t name##_store(struct sys_device *dev,                    \
-+                           struct sysdev_attribute *attr,              \
-+                           const char *buf, size_t size)               \
-+{                                                                      \
-+       char *end;                                                      \
-+       unsigned new = simple_strtoul(buf, &end, 0);                    \
-+       unsigned val;                                                   \
-+                                                                       \
-+       if (end == buf)                                                 \
-+               return -EINVAL;                                         \
-+                                                                       \
-+       asm ("mrc p15,"#opc1", %0,"#crn","#crm","#opc2 : "=r"(val));    \
-+       SETBITS(val, bits, new);                                        \
-+       asm ("mcr p15,"#opc1", %0,"#crn","#crm","#opc2 :: "r"(val));    \
-+                                                                       \
-+       if (*end == '\n')                                               \
-+               end++;                                                  \
-+       return end - buf;                                               \
-+}
-+
-+#define RD_REG(name, opc1, crn, crm, opc2)                             \
-+       SHOW_REG(name, opc1, crn, crm, opc2)                            \
-+       static SYSDEV_ATTR(name, S_IRUGO|S_IWUSR, name##_show, NULL)
-+
-+#define RDWR_REG(name, opc1, crn, crm, opc2, bits)                     \
-+       SHOW_REG(name, opc1, crn, crm, opc2)                            \
-+       STORE_REG(name, opc1, crn, crm, opc2, bits)                     \
-+       static SYSDEV_ATTR(name, S_IRUGO|S_IWUSR, name##_show, name##_store)
-+
-+RDWR_REG(control, 0, c1, c0, 0, 0x802);
-+
-+SHOW_REG(aux_ctl, 0, c1, c0, 1)
-+
-+#ifdef CONFIG_ARCH_OMAP34XX
-+static ssize_t aux_ctl_store(struct sys_device *dev,
-+                            struct sysdev_attribute *attr,
-+                            const char *buf, size_t size)
-+{
-+       char *end;
-+       unsigned new = simple_strtoul(buf, &end, 0);
-+       unsigned val;
-+
-+       if (end == buf)
-+               return -EINVAL;
-+
-+       asm ("mrc p15, 0, %0, c1, c0, 1" : "=r"(val));
-+       SETBITS(val, 0xff8, new);
-+       val &= ~2;
-+       asm ("mov r0,  %0       \n\t"
-+            "mov r12, #3       \n\t"
-+            "smc #0            \n\t"
-+            :: "r"(val) : "r0", "r12");
-+
-+       return end - buf;
-+}
-+#define AUX_WR S_IWUSR
-+#else
-+#define aux_ctl_store NULL
-+#define AUX_WR 0
-+#endif
-+
-+static SYSDEV_ATTR(aux_control, S_IRUGO|AUX_WR, aux_ctl_show, aux_ctl_store);
-+
-+SHOW_REG(l2_aux_ctl, 1, c9, c0, 2)
-+
-+#ifdef CONFIG_ARCH_OMAP34XX
-+static ssize_t l2_aux_ctl_store(struct sys_device *dev,
-+                               struct sysdev_attribute *attr,
-+                               const char *buf, size_t size)
-+{
-+       char *end;
-+       unsigned new = simple_strtoul(buf, &end, 0);
-+       unsigned val;
-+
-+       if (end == buf)
-+               return -EINVAL;
-+
-+       asm ("mrc p15, 1, %0, c9, c0, 2" : "=r"(val));
-+       SETBITS(val, 0xbc00000, new);
-+       asm ("mov r0,  %0       \n\t"
-+            "mov r12, #2       \n\t"
-+            "smc #0            \n\t"
-+            :: "r"(val) : "r0", "r12");
-+
-+       return end - buf;
-+}
-+#define L2AUX_WR S_IWUSR
-+#else
-+#define l2_aux_ctl_store NULL
-+#define L2AUX_WR 0
-+#endif
-+
-+static SYSDEV_ATTR(l2_aux_control, S_IRUGO|L2AUX_WR,
-+                  l2_aux_ctl_show, l2_aux_ctl_store);
-+
-+RDWR_REG(pmon_pmnc,   0, c9, c12, 0, 0x3f)
-+RDWR_REG(pmon_cntens, 0, c9, c12, 1, 0xffffffff)
-+RDWR_REG(pmon_cntenc, 0, c9, c12, 2, 0xffffffff)
-+RDWR_REG(pmon_ccnt,   0, c9, c13, 0, 0xffffffff)
-+RDWR_REG(pmon_useren, 0, c9, c14, 0, 1)
-+RDWR_REG(pmon_intens, 0, c9, c14, 1, 0xffffffff)
-+RDWR_REG(pmon_intenc, 0, c9, c14, 2, 0xffffffff)
-+
-+#define REG_ATTR(sysdev, name)                                         \
-+       do {                                                            \
-+               int err = sysfs_create_file(&sysdev->kobj, &name.attr); \
-+               WARN_ON(err != 0);                                      \
-+       } while (0)
-+
-+static int __init cpu_sysfs_init(void)
-+{
-+       struct sys_device *sysdev;
-+       int cpu;
-+
-+       for_each_possible_cpu(cpu) {
-+               sysdev = get_cpu_sysdev(cpu);
-+               REG_ATTR(sysdev, attr_control);
-+               REG_ATTR(sysdev, attr_aux_control);
-+               REG_ATTR(sysdev, attr_l2_aux_control);
-+               REG_ATTR(sysdev, attr_pmon_pmnc);
-+               REG_ATTR(sysdev, attr_pmon_cntens);
-+               REG_ATTR(sysdev, attr_pmon_cntenc);
-+               REG_ATTR(sysdev, attr_pmon_ccnt);
-+               REG_ATTR(sysdev, attr_pmon_useren);
-+               REG_ATTR(sysdev, attr_pmon_intens);
-+               REG_ATTR(sysdev, attr_pmon_intenc);
-+       }
-+
-+       return 0;
-+}
-+device_initcall(cpu_sysfs_init);
-- 
-1.6.6.1
diff --git a/recipes-kernel/linux/linux-omap4/0005-ARM-Add-option-to-allow-userspace-PLE-access.patch b/recipes-kernel/linux/linux-omap4/0005-ARM-Add-option-to-allow-userspace-PLE-access.patch
deleted file mode 100644
index 1129715c..00000000
--- a/recipes-kernel/linux/linux-omap4/0005-ARM-Add-option-to-allow-userspace-PLE-access.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 85abaca878cc8c0a70e636975e05650012ec4bb2 Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Tue, 10 Nov 2009 00:41:54 +0000
-Subject: [PATCH 5/8] ARM: Add option to allow userspace PLE access
-This adds a Kconfig option to allow userspace to access the L2 preload
-engine (PLE) found in Cortex-A8 and A9.
-Signed-off-by: Mans Rullgard <mans@mansr.com>
---
- arch/arm/kernel/head.S |    4 ++++
- arch/arm/mm/Kconfig    |    8 ++++++++
- 2 files changed, 12 insertions(+), 0 deletions(-)
-diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
-index eb62bf9..659ec9e 100644
--- a/arch/arm/kernel/head.S
-+++ b/arch/arm/kernel/head.S
-@@ -172,6 +172,10 @@ __enable_mmu:
- #ifdef CONFIG_CPU_ICACHE_DISABLE
-        bic     r0, r0, #CR_I
- #endif
-+#ifdef CONFIG_USER_L2_PLE
-+       mov     r5, #3
-+       mcr     p15, 0, r5, c11, c1, 0
-+#endif
-        mov     r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
-                      domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
-                      domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
-diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
-index bad0d73..4a337ab 100644
--- a/arch/arm/mm/Kconfig
-+++ b/arch/arm/mm/Kconfig
-@@ -853,3 +853,11 @@ config ARCH_HAS_BARRIERS
-        help
-          This option allows the use of custom mandatory barriers
-          included via the mach/barriers.h file.
-+
-+config USER_L2_PLE
-+       bool "Enable userspace access to the L2 PLE"
-+       depends on CPU_V7
-+       default n
-+       help
-+         Enable userspace access to the L2 preload engine (PLE) available
-+         in Cortex-A series ARM processors.
-- 
-1.6.6.1
diff --git a/recipes-kernel/linux/linux-omap4/0006-ARM-Add-option-to-allow-userspace-access-to-performa.patch b/recipes-kernel/linux/linux-omap4/0006-ARM-Add-option-to-allow-userspace-access-to-performa.patch
deleted file mode 100644
index bd8d13a1..00000000
--- a/recipes-kernel/linux/linux-omap4/0006-ARM-Add-option-to-allow-userspace-access-to-performa.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 47cb7627876fdc6a6b90eb86dc77705a6df0072a Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Tue, 10 Nov 2009 00:52:56 +0000
-Subject: [PATCH 6/8] ARM: Add option to allow userspace access to performance counters
-This adds an option to allow userspace access to the performance monitor
-registers of the Cortex-A8.
-Signed-off-by: Mans Rullgard <mans@mansr.com>
---
- arch/arm/mm/Kconfig   |    7 +++++++
- arch/arm/mm/proc-v7.S |    6 ++++++
- 2 files changed, 13 insertions(+), 0 deletions(-)
-diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
-index 4a337ab..a49ff8b 100644
--- a/arch/arm/mm/Kconfig
-+++ b/arch/arm/mm/Kconfig
-@@ -861,3 +861,10 @@ config USER_L2_PLE
-        help
-          Enable userspace access to the L2 preload engine (PLE) available
-          in Cortex-A series ARM processors.
-+
-+config USER_PMON
-+       bool "Enable userspace access to performance counters"
-+       depends on CPU_V7
-+       default n
-+       help
-+         Enable userpsace access to the performance monitor registers.
-diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
-index c1c3fe0..bd10c28 100644
--- a/arch/arm/mm/proc-v7.S
-+++ b/arch/arm/mm/proc-v7.S
-@@ -276,6 +276,12 @@ __v7_setup:
-        mcr     p15, 0, r5, c10, c2, 0          @ write PRRR
-        mcr     p15, 0, r6, c10, c2, 1          @ write NMRR
- #endif
-+
-+#ifdef CONFIG_USER_PMON
-+       mov     r0, #1
-+       mcr     p15, 0, r0, c9, c14, 0
-+#endif
-+
-        adr     r5, v7_crval
-        ldmia   r5, {r5, r6}
- #ifdef CONFIG_CPU_ENDIAN_BE8
-- 
-1.6.6.1
diff --git a/recipes-kernel/linux/linux-omap4/0007-OMAP4-do-not-force-select-options-which-are-not-requ.patch b/recipes-kernel/linux/linux-omap4/0007-OMAP4-do-not-force-select-options-which-are-not-requ.patch
deleted file mode 100644
index d004df0d..00000000
--- a/recipes-kernel/linux/linux-omap4/0007-OMAP4-do-not-force-select-options-which-are-not-requ.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4223359216dc16d70ac0aced7078e66602500d66 Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Sat, 30 Oct 2010 15:36:06 +0100
-Subject: [PATCH 7/8] OMAP4: do not force-select options which are not required
---
- arch/arm/plat-omap/Kconfig |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
-index 7bfaeb8..934fe64 100644
--- a/arch/arm/plat-omap/Kconfig
-+++ b/arch/arm/plat-omap/Kconfig
-@@ -39,9 +39,6 @@ config ARCH_OMAP4
-        select CPU_V7
-        select ARM_GIC
-        select ARM_ERRATA_720789
-       select ARM_THUMB
-       select ARM_THUMBEE
-       select DEVTMPFS
-        select UNIX
-        select USB_ARCH_HAS_EHCI
- endchoice
-- 
-1.6.6.1
diff --git a/recipes-kernel/linux/linux-omap4/0008-omap4-pandaboard-add-support-for-DVI-output.patch b/recipes-kernel/linux/linux-omap4/0008-omap4-pandaboard-add-support-for-DVI-output.patch
deleted file mode 100644
index 2d274ef2..00000000
--- a/recipes-kernel/linux/linux-omap4/0008-omap4-pandaboard-add-support-for-DVI-output.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From b3f993f02eb4cf2018c78fb5b9cd5f220fda9589 Mon Sep 17 00:00:00 2001
-From: Shravan Suryanarayana <shravan.s@ti.com>
-Date: Wed, 22 Dec 2010 09:42:43 +0100
-Subject: [PATCH 8/8] omap4: pandaboard: add support for DVI output
---
- arch/arm/mach-omap2/board-omap4panda.c |   45 +++++++++++++++++++++++++++++++-
- drivers/video/omap2/dss/dispc.c        |    6 ++++
- drivers/video/omap2/dss/dpi.c          |    3 --
- drivers/video/omap2/dss/dss.c          |   37 ++++++++++++++++++++++++-
- 4 files changed, 85 insertions(+), 6 deletions(-)
-diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
-index 1f6d59e..323daa6 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
-+++ b/arch/arm/mach-omap2/board-omap4panda.c
-@@ -47,6 +47,7 @@
- #include <plat/hwspinlock.h>
- #include <plat/opp_twl_tps.h>
- #include "hsmmc.h"
-+#include "mux.h"                                               
- 
- #define GPIO_HUB_POWER 1
- #define GPIO_HUB_NRESET_39 39
-@@ -55,6 +56,8 @@
- #define GPIO_BOARD_ID1 101
- #define GPIO_BOARD_ID2 171
- 
-+#define PANDA_DVI_CHIP_ENABLE_GPIO 0                           
-+
- static int board_revision;
- 
- /* wl127x BT, FM, GPS connectivity chip */
-@@ -134,16 +137,45 @@ static struct omap_dss_device panda_hdmi_device = {
-        .channel = OMAP_DSS_CHANNEL_DIGIT,
- };
- 
-+static int panda_enable_dvi(struct omap_dss_device *dssdev)            
-+{
-+       if (gpio_is_valid(dssdev->reset_gpio))          
-+               gpio_set_value(dssdev->reset_gpio, 1);
-+       gpio_direction_output(dssdev->reset_gpio, 1);
-+
-+       return 0;
-+}
-+
-+static void panda_disable_dvi(struct omap_dss_device *dssdev)          
-+{
-+       if (gpio_is_valid(dssdev->reset_gpio))          
-+               gpio_set_value(dssdev->reset_gpio, 0);
-+       gpio_direction_output(dssdev->reset_gpio, 0);
-+}
-+
-+static struct omap_dss_device panda_dvi_device = {
-+       .name                           = "dvi",                        
-+       .driver_name                    = "generic_panel",
-+       .type                           = OMAP_DISPLAY_TYPE_DPI,
-+       .phy.dpi.data_lines             = 24,
-+       .platform_enable                = panda_enable_dvi,
-+       .platform_disable               = panda_disable_dvi,
-+       .channel                        = OMAP_DSS_CHANNEL_LCD2,
-+       .reset_gpio                     = PANDA_DVI_CHIP_ENABLE_GPIO,   
-+};
-+
- static struct omap_dss_device *panda_dss_devices[] = {
-        &panda_hdmi_device,
-+       &panda_dvi_device,                                              
- };
- 
- static struct omap_dss_board_info panda_dss_data = {
-        .num_devices    =       ARRAY_SIZE(panda_dss_devices),
-        .devices        =       panda_dss_devices,
-       .default_device =       &panda_hdmi_device,
-+       .default_device =       &panda_hdmi_device,                     
- };
- 
-+
- static struct platform_device *panda_devices[] __initdata = {
-        &leds_gpio,
-        &sdp4430_hdmi_audio_device,
-@@ -158,6 +190,16 @@ static void __init omap4_display_init(void)
-        /* Turning on DSI PHY Mux*/
-        __raw_writel(dsimux, phymux_base+0x618);
-        dsimux = __raw_readl(phymux_base+0x618);
-+
-+       int r = 0;                                                      
-+       omap_mux_init_gpio(panda_dvi_device.reset_gpio, OMAP_PULL_UP | OMAP_PULL_ENA | OMAP_MUX_MODE3);
-+       r = gpio_request(panda_dvi_device.reset_gpio, "DVI reset");
-+       if (r) {
-+               printk(KERN_ERR "failed to get DVI reset GPIO\n");
-+               return;
-+       }
-+       gpio_direction_output(panda_dvi_device.reset_gpio, 0);
-+
- }
- #else
- 
-@@ -207,6 +249,7 @@ static struct omap2_hsmmc_info mmc[] = {
-                .mmc            = 1,
-                .wires          = 8,
-                .gpio_wp        = -EINVAL,
-+               .gpio_cd        = -EINVAL,
-        },
-        {
-                .mmc            = 5,
-diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
-index 42dfb1f..06f1989 100644
--- a/drivers/video/omap2/dss/dispc.c
-+++ b/drivers/video/omap2/dss/dispc.c
-@@ -3818,6 +3818,12 @@ static void dispc_set_lcd_divisor(enum omap_channel channel, u16 lck_div,
-        else
-                dispc_write_reg(DISPC_DIVISOR,
-                        FLD_VAL(lck_div, 23, 16) | FLD_VAL(pck_div, 7, 0));
-+
-+       // DISPC_DIVISOR1 is actually mapped to DISPC_DIVISOR memory block (see #define at the beginning of this file);
-+       // We need to write the value 1 (as opposed to default value 4); otherwise, we can't hit the pixel clock needed for
-+       // higher resolutions and will have a stairstep / tearing display
-+       dispc_write_reg(DISPC_DIVISOR1, FLD_VAL(1, 23, 16) | FLD_VAL(1, 7, 0));
-+
-        enable_clocks(0);
- }
- 
-diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
-index 33e046e..29bffef 100644
--- a/drivers/video/omap2/dss/dpi.c
-+++ b/drivers/video/omap2/dss/dpi.c
-@@ -97,9 +97,6 @@ static int dpi_set_dispc_clk(enum omap_channel channel, bool is_tft,
-        struct dispc_clock_info dispc_cinfo;
-        int r;
- 
-       if (cpu_is_omap44xx()) /*TODO Check this */
-               return 0;
-
-        r = dss_calc_clock_div(is_tft, pck_req, &dss_cinfo, &dispc_cinfo);
-        if (r)
-                return r;
-diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
-index a69b754..2eff8f8 100644
--- a/drivers/video/omap2/dss/dss.c
-+++ b/drivers/video/omap2/dss/dss.c
-@@ -136,7 +136,7 @@ void dss_restore_context(void)
- 
- bool dss_get_mainclk_state()
- {
-       return dss.mainclk_state;
-+       return true;
- }
- 
- /*
-@@ -501,9 +501,24 @@ int dss_calc_clock_div(bool is_tft, unsigned long req_pck,
-        int match = 0;
-        int min_fck_per_pck;
- 
-       prate = dss_get_dpll4_rate();
-+//     prate = dss_get_dpll4_rate();           
- 
-        fck = dss_clk_get_rate(DSS_CLK_FCK1);
-+
-+       if (!cpu_is_omap44xx()) {               
-+       prate = dss_get_dpll4_rate();
-+       } else {
-+       /* Linux ARM clk framework issue currently all DPLL lock frequency
-+       * multipliers are not configured properly. Hence multiplying by
-+       * 2 to get the right pixel clock dividers.
-+       *
-+       * TODO: Need to change this once appropriate patches are added
-+       * to clock framework.
-+       */
-+       fck *= 2;
-+       }
-+
-+
-        if (req_pck == dss.cache_req_pck &&
-                        ((cpu_is_omap34xx() && prate == dss.cache_prate) ||
-                         dss.cache_dss_cinfo.fck == fck)) {
-@@ -575,6 +590,24 @@ retry:
-                                        goto found;
-                        }
-                }
-+       } else if (cpu_is_omap44xx()) {
-+               struct dispc_clock_info cur_dispc;
-+               /* we can not change fclk on OMAP4 */
-+
-+               dispc_find_clk_divs(is_tft, req_pck, fck, &cur_dispc);          
-+               match = 1;
-+
-+               if (abs(cur_dispc.pck - req_pck) < abs(best_dispc.pck - req_pck)) {
-+               best_dss.fck = fck;
-+               best_dss.fck_div = 1;
-+
-+               best_dispc = cur_dispc;
-+
-+               if (cur_dispc.pck == req_pck)
-+               goto found;
-+               }
-+
-+
-        } else {
-                BUG();
-        }
-- 
-1.6.6.1
diff --git a/recipes-kernel/linux/linux-omap4_3.0.0.bb b/recipes-kernel/linux/linux-omap4_3.0.0.bb
new file mode 100644
index 00000000..091c5673
--- /dev/null
+++ b/recipes-kernel/linux/linux-omap4_3.0.0.bb
@@ -0,0 +1,19 @@
+COMPATIBLE_MACHINE = "omap4430-panda"
+DEFAULT_PREFERENCE = "-1"
+require linux.inc
+# The main PR is now using MACHINE_KERNEL_PR, for omap4 see conf/machine/include/omap4.inc
+#MACHINE_KERNEL_PR_append = "a"
+CORTEXA8FIXUP = "no"
+#glp 1.5.4
+SRCREV = "3adddccb1e296027873df5999b5917cafd62b3db"
+SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-ubuntu.git;protocol=git;branch=ti-ubuntu-glp1.5.2 \
+           file://defconfig \
+           "
+S = "${WORKDIR}/git"
author	Koen Kooi <koen@dominion.thruhere.net>	2011-11-09 15:33:44 +0100
committer	Koen Kooi <koen@dominion.thruhere.net>	2011-11-09 15:33:44 +0100
commit	f1c2dd0ae57938899840342de33764685b6a5288 (patch)
tree	6830d9aef4ef168e619b1b57b9891d11ff1c9ede /recipes-kernel
parent	31c407823dbed73f9f33c333c7d955140d0aef70 (diff)
download	meta-ti-f1c2dd0ae57938899840342de33764685b6a5288.tar.gz