diff --git a/device/testing/linux-samsung-chagallwifi/APKBUILD b/device/testing/linux-samsung-chagallwifi/APKBUILD
index 5bbf158d7..aea5e4f07 100644
--- a/device/testing/linux-samsung-chagallwifi/APKBUILD
+++ b/device/testing/linux-samsung-chagallwifi/APKBUILD
@@ -3,7 +3,7 @@
 # Kernel config based on: arch/arm/configs/lineageos_chagallwifi_defconfig
 
 pkgname=linux-samsung-chagallwifi
-pkgver=3.4.39
+pkgver=3.4.113
 pkgrel=1
 pkgdesc="Samsung Galaxy Tab S 10.5 kernel fork"
 arch="armv7"
@@ -16,10 +16,10 @@ makedepends="bash bc bison devicepkg-dev flex openssl-dev perl xz"
 
 # Source
 _repository="android_kernel_samsung_exynos5420"
-_commit="61dd0870a1982be7567f9cb288f3f76f03f017f4"
+_commit="e434b9d0170c86d1ee063b1915921c4af73effad"
 _config="config-$_flavor.$arch"
 source="
-	$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
+	$pkgname-$_commit.tar.gz::https://github.com/exynos5420/$_repository/archive/$_commit.tar.gz
 	$_config
 	gcc7-give-up-on-ilog2-const-optimizations.patch
 	gcc8-fix-put-user.patch
@@ -42,7 +42,7 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
 }
 
-sha512sums="b10abf35473b5ac8109d35c86485c1a83e7874feb9fa15bd69f0d5a3f063ecaa94914cb86e6ed0cb3f8c8cb2d89f93ba51b651f095d364ddb00688a887532081  linux-samsung-chagallwifi-61dd0870a1982be7567f9cb288f3f76f03f017f4.tar.gz
-6bce0a8d0e108d8102d29de3425ae6863a6ba3fdd16c3e618ce5a1fa9be853cad84837e81571c8a864b82bd61e2df4f9208ec34a19eaa52fe15bb2b075b80ee9  config-samsung-chagallwifi.armv7
+sha512sums="058d72726920b7d670ab32156168546be39975164a867dbeb38b236988a3014f302fc094d9fb3ecff2379aac7d31014cc25ac1d1e0d390ce282e6aa799857391  linux-samsung-chagallwifi-e434b9d0170c86d1ee063b1915921c4af73effad.tar.gz
+437f7450b07ff6098531649242317ce767b9f51bfd1a1184a5e094b6d674ad7b2de175e36b45bd1cf5ab069c073f6eae2ad77505938e4fe3e052c3f96cd5204b  config-samsung-chagallwifi.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch"
diff --git a/device/testing/linux-samsung-chagallwifi/config-samsung-chagallwifi.armv7 b/device/testing/linux-samsung-chagallwifi/config-samsung-chagallwifi.armv7
index c857a4e10..1f884cdac 100644
--- a/device/testing/linux-samsung-chagallwifi/config-samsung-chagallwifi.armv7
+++ b/device/testing/linux-samsung-chagallwifi/config-samsung-chagallwifi.armv7
@@ -211,11 +211,26 @@ CONFIG_BLOCK_SUPPORT_STLOG=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_SIOPLUS=y
+CONFIG_IOSCHED_TRIPNDROID=y
 CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_FIOPS=y
+CONFIG_IOSCHED_VR=y
+CONFIG_IOSCHED_FIFO=y
+CONFIG_IOSCHED_ZEN=y
 CONFIG_IOSCHED_CFQ=y
+# CONFIG_IOSCHED_BFQ is not set
+CONFIG_IOSCHED_SIO=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_SIO is not set
 # CONFIG_DEFAULT_NOOP is not set
+# CONFIG_DEFAULT_FIOPS is not set
+# CONFIG_DEFAULT_ZEN is not set
+# CONFIG_DEFAULT_TRIPNDROID is not set
+# CONFIG_DEFAULT_FIFO is not set
+# CONFIG_DEFAULT_SIOPLUS is not set
+# CONFIG_DEFAULT_VR is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_TRYLOCK is not set
 # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
@@ -717,18 +732,62 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ABYSSPLUG is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ABYSSPLUGV2 is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ADAPTIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_BADASS is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVEX is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_DANCEDANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_DARKNESS is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_HYPER is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTELLIACTIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTELLIDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTELLIMM is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVEX is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_LAZY is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_LIONHEART is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_LULZACTIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_NIGHTMARE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMANDPLUS is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_OPTIMAX is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PEGASUSQ is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SMARTMAX is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_UBERDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_WHEATLEY is not set
+# CONFIG_CPU_FREQ_GOV_ABYSSPLUG is not set
+# CONFIG_CPU_FREQ_GOV_ABYSSPLUGV2 is not set
+# CONFIG_CPU_FREQ_GOV_ADAPTIVE is not set
+# CONFIG_CPU_FREQ_GOV_BADASS is not set
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVEX is not set
+# CONFIG_CPU_FREQ_GOV_DANCEDANCE is not set
+# CONFIG_CPU_FREQ_GOV_DARKNESS is not set
+# CONFIG_CPU_FREQ_GOV_HYPER is not set
+# CONFIG_CPU_FREQ_GOV_INTELLIACTIVE is not set
+# CONFIG_CPU_FREQ_GOV_INTELLIDEMAND is not set
+# CONFIG_CPU_FREQ_GOV_INTELLIMM is not set
+CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
+# CONFIG_CPU_FREQ_GOV_INTERACTIVEX is not set
+# CONFIG_CPU_FREQ_GOV_LAZY is not set
+# CONFIG_CPU_FREQ_GOV_LIONHEART is not set
+# CONFIG_CPU_FREQ_GOV_LULZACTIVE is not set
+# CONFIG_CPU_FREQ_GOV_NIGHTMARE is not set
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_GOV_ONDEMANDPLUS is not set
+# CONFIG_CPU_FREQ_GOV_OPTIMAX is not set
+# CONFIG_CPU_FREQ_GOV_PEGASUSQ is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+# CONFIG_CPU_FREQ_GOV_SMARTMAX is not set
+# CONFIG_CPU_FREQ_GOV_UBERDEMAND is not set
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+# CONFIG_CPU_FREQ_GOV_WHEATLEY is not set
 
 #
 # ARM CPU frequency scaling drivers
@@ -793,6 +852,7 @@ CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y
 CONFIG_CPU_PM=y
 CONFIG_SUSPEND_TIME=y
@@ -1637,6 +1697,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_CHAGALLLTE_CAN is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT1664T is not set
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_DSX=y
+CONFIG_TOUCHSCREEN_SYNAPTICS_WAKE_GESTURES=y
 # CONFIG_INPUT_WACOM is not set
 # CONFIG_EPEN_WACOM_G5SP is not set
 # CONFIG_EPEN_WACOM_G9PM is not set
@@ -1695,6 +1756,7 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_TRACE_SINK is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVKMEM=y
+CONFIG_FRANDOM=y
 
 #
 # Serial drivers
@@ -3280,11 +3342,11 @@ CONFIG_GENERIC_ACL=y
 #
 # CONFIG_MSDOS_FS is not set
 # CONFIG_VFAT_FS is not set
-CONFIG_EXFAT_FS=y
 CONFIG_NTFS_FS=y
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NTFS_RW=y
 CONFIG_SDFAT_FS=y
+CONFIG_SDFAT_USE_FOR_EXFAT=y
 CONFIG_SDFAT_USE_FOR_VFAT=y
 CONFIG_SDFAT_DELAYED_META_DIRTY=y
 CONFIG_SDFAT_SUPPORT_DIR_SYNC=y
@@ -3322,10 +3384,6 @@ CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ECRYPT_FS=y
 CONFIG_WTL_ENCRYPTION_FILTER=y
 # CONFIG_ECRYPT_FS_VIRTUAL_FAT_XATTR is not set
-# CONFIG_SCFS is not set
-# CONFIG_SYSTEM_COMPRESSED is not set
-# CONFIG_SCFS_LOWER_PAGECACHE_INVALIDATION is not set
-# CONFIG_SCFS_USE_CRYPTO is not set
 CONFIG_SDCARD_FS=y
 # CONFIG_SDCARD_FS_FADV_NOACTIVE is not set
 # CONFIG_HFS_FS is not set