diff --git a/device/device-xiaomi-santoni/APKBUILD b/device/device-xiaomi-santoni/APKBUILD
index 0c0cf099e..9acb935a8 100644
--- a/device/device-xiaomi-santoni/APKBUILD
+++ b/device/device-xiaomi-santoni/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-xiaomi-santoni"
 pkgdesc="Xiaomi Redmi 4X"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-xiaomi-santoni mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-xiaomi-santoni mkbootimg mesa-dri-swrast mdss-fb-init-hack"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
@@ -19,4 +19,4 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-sha512sums="eefcaf34229346068244d511e6a4006c04ebc45849468d3f955fa9f71bac78681817f43a526d4cd6716a608e00c84c484d37726ab7940f652e336ada1289b98e  deviceinfo"
+sha512sums="827454ba88387de7b3493c087533b0a560a636e52f7cc00e05309e1de7eaf3ce39c869f52535245b47492e63ba38e8c30a793c5220a1e70b54f3a54e92f73c5a  deviceinfo"
diff --git a/device/device-xiaomi-santoni/deviceinfo b/device/device-xiaomi-santoni/deviceinfo
index 1a2ddf467..9376d110e 100644
--- a/device/device-xiaomi-santoni/deviceinfo
+++ b/device/device-xiaomi-santoni/deviceinfo
@@ -1,11 +1,11 @@
 # Reference: <https://postmarketos.org/deviceinfo>
 # Please use double quotes only. You can source this file in shell scripts.
 
-deviceinfo_format_version="0"
+deviceinfo_format_version="1"
 deviceinfo_name="Xiaomi Redmi 4X"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-santoni"
-deviceinfo_date=""
+deviceinfo_date="04/29/2017 (Malaysia)"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_arch="aarch64"
@@ -15,14 +15,14 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1280"
 deviceinfo_screen_height="720"
-deviceinfo_dev_touchscreen=""
-deviceinfo_dev_touchscreen_calibration=""
 deviceinfo_dev_touchscreen="/dev/input/event1"
+deviceinfo_dev_touchscreen_calibration=""
 deviceinfo_dev_keyboard=""
+deviceinfo_swap_size_recommended="1024"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_hsl_uart,0x78B0000 androidboot.selinux=permissive buildvariant=eng"
+deviceinfo_kernel_cmdline="androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_hsl_uart,0x78B0000 androidboot.selinux=permissive buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x80000000"
diff --git a/device/linux-xiaomi-santoni/02_fix_msm_dba.patch b/device/linux-xiaomi-santoni/02_fix_msm_dba.patch
deleted file mode 100644
index 2061842c0..000000000
--- a/device/linux-xiaomi-santoni/02_fix_msm_dba.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/video/msm/msm_dba/msm_dba.c b/drivers/video/msm/msm_dba/msm_dba.c
-index cc6512a..eb073a7 100644
---- a/drivers/video/msm/msm_dba/msm_dba.c
-+++ b/drivers/video/msm/msm_dba/msm_dba.c
-@@ -22,7 +22,7 @@
- #include <linux/err.h>
- 
- #include <video/msm_dba.h>
--#include <msm_dba_internal.h>
-+#include "msm_dba_internal.h"
- 
- static DEFINE_MUTEX(register_mutex);
- 
diff --git a/device/linux-xiaomi-santoni/03_fix_rndis_ipa_trace_header_not_found.patch b/device/linux-xiaomi-santoni/03_fix_rndis_ipa_trace_header_not_found.patch
deleted file mode 100644
index ea29699f5..000000000
--- a/device/linux-xiaomi-santoni/03_fix_rndis_ipa_trace_header_not_found.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/drivers/net/ethernet/msm/rndis_ipa_trace.h b/drivers/net/ethernet/msm/rndis_ipa_trace.h
-index c0fc573..c18046b 100644
---- a/drivers/net/ethernet/msm/rndis_ipa_trace.h
-+++ b/drivers/net/ethernet/msm/rndis_ipa_trace.h
-@@ -77,5 +77,5 @@ TRACE_EVENT(
-
- /* This part must be outside protection */
- #undef TRACE_INCLUDE_PATH
--#define TRACE_INCLUDE_PATH .
-+#define TRACE_INCLUDE_PATH ../../drivers/net/ethernet/msm/
- #include <trace/define_trace.h>
-diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
-index d70abdf..7f7e452 100644
---- a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
-+++ b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
-@@ -131,5 +131,5 @@ TRACE_EVENT(
-
- /* This part must be outside protection */
- #undef TRACE_INCLUDE_PATH
--#define TRACE_INCLUDE_PATH .
-+#define TRACE_INCLUDE_PATH ../../drivers/platform/msm/ipa/ipa_v2/
- #include <trace/define_trace.h>
diff --git a/device/linux-xiaomi-santoni/APKBUILD b/device/linux-xiaomi-santoni/APKBUILD
index d459fb1b4..0430dd0a4 100644
--- a/device/linux-xiaomi-santoni/APKBUILD
+++ b/device/linux-xiaomi-santoni/APKBUILD
@@ -1,9 +1,9 @@
 # Kernel config based on: arch/arm64/configs/S88536AA2-perf_defconfig
 
 pkgname="linux-xiaomi-santoni"
-pkgver=3.18.31
-pkgrel=2
-pkgdesc="Xiaomi Redmi 4X kernel fork"
+pkgver=3.18.136
+pkgrel=0
+pkgdesc="Xiaomi Redmi 4X kernel fork - msm-3.18 rebased"
 arch="aarch64"
 _carch="arm64"
 _flavor="xiaomi-santoni"
@@ -12,9 +12,8 @@ license="GPL2"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev gcc6"
 
-# Compiler: this kernel was only tested with GCC6. Feel free to make a merge
-# request if you find out that it is booting working with newer GCCs as
-# well. See <https://postmarketos.org/vendorkernel> for instructions.
+# Tested with GCC-8, won't boot, PSTORE doesn't work so no logs are provided.
+# Looks like we're stuck with GCC-6. For a while, through.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
 	HOSTCC="gcc6-gcc"
@@ -22,15 +21,13 @@ if [ "${CC:0:5}" != "gcc6-" ]; then
 fi
 
 # Source
-_repository="Xiaomi_Kernel_OpenSource"
-_commit="09baf1a3dd0e13a81e484035f0be71dcb2ecc723"
+_repository="msm-3.18"
+_commit="adc4e69112d26b6b74c1b3f7e890109faf7c6a7e"
 _config="config-${_flavor}.${arch}"
 source="
-	$pkgname-$_commit.tar.gz::https://github.com/MiCode/${_repository}/archive/${_commit}.tar.gz
+	$pkgname-$_commit.tar.gz::https://github.com/Danct12/${_repository}/archive/${_commit}.tar.gz
 	$_config
 	compiler-gcc6.h
-	02_fix_msm_dba.patch
-	03_fix_rndis_ipa_trace_header_not_found.patch
 "
 builddir="$srcdir/${_repository}-${_commit}"
 
@@ -80,8 +77,6 @@ package() {
 	fi
 }
 
-sha512sums="f776fe0fbb5e155da8af9cbcb29bd7f712a74d3ae6f4617e5d31b119b5ff160e66196e8be107a7216d670cad7be89c108426fef5b2cd3f2baedbf8496db9f4f6  linux-xiaomi-santoni-09baf1a3dd0e13a81e484035f0be71dcb2ecc723.tar.gz
-e5e84c9eb1dcd14a81c00000d35b0af506869aaaa5845cb6213e9a2eaee0150f342b9e6c6f80723923b32165f7750ee05483c1f03ce763e358514b2970ec0d7f  config-xiaomi-santoni.aarch64
-d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-7e765cb696fa8c3dfbc305b05cbf1fad85fb9572613d5391e945341dae5974a745f4906c795dc841e5562b19ab77d5257f9741e514af2c2573aa4bb8b262ce51  02_fix_msm_dba.patch
-9c549714f03c7a7666e8aa7508a48cfdccab7cf3e97fb59c4df8fa97f75492365926f82c4a677c50780d68d4905504dcccbdd6de6344bd8d4b88b2331933ed46  03_fix_rndis_ipa_trace_header_not_found.patch"
+sha512sums="66d3fe05d7cfaae719608f349a557ca331de86d74023a26e97710e1ac756892e9f690cdfc353058e12a41ae0927aaaf7506739a009433465fe372a52964af6aa  linux-xiaomi-santoni-adc4e69112d26b6b74c1b3f7e890109faf7c6a7e.tar.gz
+4bf0b6ac007aa32c3739b6a4aeae589612995a2a333445619a4e50e3551a2ee80b6f42e31252ac5a55537bf7ce0d9a1e43a748a46bd74ead4a6e36ad34b63539  config-xiaomi-santoni.aarch64
+d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h"
diff --git a/device/linux-xiaomi-santoni/config-xiaomi-santoni.aarch64 b/device/linux-xiaomi-santoni/config-xiaomi-santoni.aarch64
index 5130d77ec..d881fff78 100644
--- a/device/linux-xiaomi-santoni/config-xiaomi-santoni.aarch64
+++ b/device/linux-xiaomi-santoni/config-xiaomi-santoni.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 3.18.31 Kernel Configuration
+# Linux/arm64 3.18.136 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -26,11 +26,13 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_ARM64_DMA_USE_IOMMU=y
 CONFIG_ARM64_DMA_IOMMU_ALIGNMENT=8
+CONFIG_SMP=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_PGTABLE_LEVELS=3
+# CONFIG_MSM_GVM_QUIN is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -41,21 +43,19 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-perf"
-CONFIG_LOCALVERSION_AUTO=y
+CONFIG_LOCALVERSION="-danct-dreemurr"
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_FHANDLE is not set
-CONFIG_USELIB=y
-CONFIG_AUDIT=y
+CONFIG_FHANDLE=y
+# CONFIG_USELIB is not set
+# CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -93,6 +93,7 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_SCHED_WALT is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 
@@ -118,37 +119,42 @@ CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_NOCB_CPU_ALL=y
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
-# CONFIG_IKCONFIG_PROC is not set
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=17
-# CONFIG_CONSOLE_FLUSH_ON_HOTPLUG is not set
+CONFIG_CONSOLE_FLUSH_ON_HOTPLUG=y
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_FREEZER=y
 # CONFIG_CGROUP_DEVICE is not set
-# CONFIG_CPUSETS is not set
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
+# CONFIG_MEMCG_KMEM is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
-CONFIG_RT_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+# CONFIG_RT_GROUP_SCHED is not set
 # CONFIG_BLK_CGROUP is not set
 CONFIG_SCHED_HMP=y
 # CONFIG_SCHED_HMP_CSTATE_AWARE is not set
 CONFIG_SCHED_CORE_CTL=y
 CONFIG_SCHED_QHMP=y
-# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
+CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 # CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SCHED_TUNE is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -158,7 +164,7 @@ CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 # CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
-# CONFIG_RD_LZ4 is not set
+CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -238,6 +244,7 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
@@ -250,21 +257,15 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_FORCE=y
-CONFIG_MODULE_SIG_ALL=y
-# CONFIG_MODULE_SIG_SHA1 is not set
-# CONFIG_MODULE_SIG_SHA224 is not set
-# CONFIG_MODULE_SIG_SHA256 is not set
-# CONFIG_MODULE_SIG_SHA384 is not set
-CONFIG_MODULE_SIG_SHA512=y
-CONFIG_MODULE_SIG_HASH="sha512"
-# CONFIG_MODULE_COMPRESS is not set
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_COMPRESS=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+# CONFIG_MODULE_COMPRESS_XZ is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
@@ -326,7 +327,9 @@ CONFIG_ARCH_MSM8916=y
 CONFIG_ARCH_MSM8917=y
 CONFIG_ARCH_MSM8920=y
 CONFIG_ARCH_MSM8940=y
+CONFIG_TREBLE=y
 CONFIG_ARCH_MSM8953=y
+# CONFIG_ARCH_SDM450 is not set
 CONFIG_ARCH_MSM8937=y
 # CONFIG_ARCH_MSM8996 is not set
 CONFIG_ARCH_MSMCOBALT=y
@@ -377,10 +380,8 @@ CONFIG_ARM64_4K_PAGES=y
 CONFIG_ARCH_MSM8953_SOC_SETTINGS=y
 CONFIG_ARM64_VA_BITS_39=y
 CONFIG_ARM64_VA_BITS=39
-CONFIG_ARM64_PGTABLE_LEVELS=3
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_ARM64_SEV_IN_LOCK_UNLOCK is not set
-CONFIG_SMP=y
 CONFIG_SCHED_MC=y
 # CONFIG_SCHED_SMT is not set
 CONFIG_NR_CPUS=8
@@ -435,7 +436,7 @@ CONFIG_CMA_AREAS=7
 CONFIG_ZBUD=y
 CONFIG_ZSMALLOC=y
 # CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_ZSMALLOC_STAT=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_ZCACHE=y
 # CONFIG_BALANCE_ANON_FILE_RECLAIM is not set
@@ -445,11 +446,19 @@ CONFIG_PROCESS_RECLAIM=y
 CONFIG_SECCOMP=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_ARM64_PAN=y
+CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_ARMV8_DEPRECATED=y
 CONFIG_SWP_EMULATION=y
 CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
+# CONFIG_ARM64_SW_TTBR0_PAN is not set
+
+#
+# ARMv8.1 architectural features
+#
+CONFIG_ARM64_PAN=y
+CONFIG_ARM64_UAO=y
 
 #
 # Boot options
@@ -458,7 +467,9 @@ CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
-CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES="qcom/msm8953-cdp qcom/msm8940-pmi8940-mtp qcom/msm8920-pmi8950-rcm qcom/msm8940-pmi8950-cdp qcom/msm8952-qrd-skum qcom/msm8953-iot-mtp qcom/msm8917-pmi8950-cdp qcom/msm8937-pmi8950-ext-codec-cdp qcom/msm8920-pmi8950-cdp qcom/apq8037-pmi8950-mtp qcom/msm8937-pmi8950-qrd-sku1 qcom/msm8952-cdp qcom/apq8017-pmi8950-mtp qcom/msm8953-ext-codec-rcm qcom/msmcobalt-sim qcom/apq8037-pmi8937-cdp qcom/msm8917-rumi qcom/msm8917-pmi8950-rcm qcom/msm8917-pmi8937-qrd-sku5 qcom/msmcobalt-v2-mtp qcom/msm8940-pmi8937-mtp qcom/msm8917-qgp-tmo qcom/msm8940-pmi8950-rcm qcom/apq8053-cdp qcom/msmcobalt-v2-rumi qcom/apq8053-ext-audio-mtp qcom/msm8920-pmi8937-cdp qcom/msm8937-pmi8950-mtp qcom/msm8917-pmi8937-rcm qcom/msm8940-pmi8937-cdp qcom/apq8037-pmi8937-mtp qcom/msm8920-pmi8937-rcm qcom/msm8917-pmi8937-cdp qcom/apq8053-iot-mtp qcom/msm8953-mtp qcom/msm8937-pmi8937-cdp qcom/msm8952-mtp qcom/msmcobalt-v2-sim qcom/msm8953-sim qcom/msm8937-pmi8950-rcm qcom/msm8920-pmi8940-qrd-sku7 qcom/msm8940-pmi8940-rcm qcom/msmcobalt-rumi qcom/msm8917-pmi8937-qrd-sku5 qcom/msm8937-pmi8937-rcm qcom/msm8937-pmi8937-mtp qcom/msm8940-pmi8950-qrd-sku7 qcom/msm8940-pmi8940-cdp qcom/msmcobalt-v2-cdp qcom/msm8940-pmi8950-mtp qcom/msm8953-qrd-sku3 qcom/msm8920-pmi8950-mtp qcom/msm8937-pmi8950-cdp qcom/msm8940-pmi8950-qrd-sku7_S88536AA2 qcom/msm8940-pmi8950-qrd-sku7 qcom/apq8017-pmi8950-cdp qcom/apq8017-pmi8937-cdp qcom/msm8937-pmi8950-qrd-sku1-dvt1 qcom/msm8937-pmi8937-qrd-sku2-dvt1 qcom/msm8940-pmi8950-qrd-sku6 qcom/msm8920-pmi8937-mtp qcom/msm8917-pmi8937-mtp qcom/msmcobalt-mtp qcom/msm8917-pmi8950-ext-codec-cdp qcom/msm8953-cdp-1200p qcom/msm8937-rumi qcom/msm8953-ext-codec-mtp qcom/msm8917-pmi8937-qrd-sku5 qcom/msm8940-pmi8940-qrd-sku7 qcom/msm8952-ext-codec-cdp qcom/msm8953-rcm qcom/msm8940-pmi8950-ext-codec-cdp qcom/apq8017-pmi8937-mtp qcom/apq8037-pmi8950-cdp qcom/msm8940-pmi8937-rcm qcom/msm8917-pmi8950-mtp qcom/msm8953-rumi qcom/apq8053-mtp qcom/msm8937-pmi8937-qrd-sku2"
+CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES=""
+CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP=y
+# CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL is not set
 CONFIG_DMI=y
 
 #
@@ -469,7 +480,7 @@ CONFIG_COMPAT_BINFMT_ELF=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
 CONFIG_COMPAT=y
 CONFIG_SYSVIPC_COMPAT=y
@@ -480,7 +491,7 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND_SKIP_SYNC=y
-CONFIG_WAKELOCK=y
+# CONFIG_WAKELOCK is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_AUTOSLEEP=y
@@ -493,11 +504,13 @@ CONFIG_PM_DEBUG=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
 CONFIG_PM_OPP=y
 CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_CPU_PM=y
 CONFIG_SUSPEND_TIME=y
+# CONFIG_DEDUCE_WAKEUP_REASONS is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM64_CPU_SUSPEND=y
 
@@ -533,12 +546,18 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 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_SCHED is not set
+
+#
+# CPU frequency scaling drivers
+#
 # CONFIG_CPUFREQ_DT is not set
 # CONFIG_CPU_BOOST is not set
 
@@ -695,7 +714,6 @@ CONFIG_NETFILTER_XT_CONNMARK=y
 #
 # Xtables targets
 #
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
 # CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
@@ -762,6 +780,7 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
+# CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG is not set
 # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
 # CONFIG_NETFILTER_XT_MATCH_REALM is not set
 # CONFIG_NETFILTER_XT_MATCH_RECENT is not set
@@ -955,7 +974,6 @@ CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_OPENVSWITCH is not set
 # CONFIG_VSOCKETS is not set
-# CONFIG_NETLINK_MMAP is not set
 # CONFIG_NETLINK_DIAG is not set
 # CONFIG_NET_MPLS_GSO is not set
 # CONFIG_HSR is not set
@@ -1032,7 +1050,7 @@ CONFIG_RFKILL_LEDS=y
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
-CONFIG_NFC_NQ=y
+# CONFIG_NFC_NQ is not set
 CONFIG_IPC_ROUTER=y
 CONFIG_IPC_ROUTER_SECURITY=y
 CONFIG_HAVE_BPF_JIT=y
@@ -1047,7 +1065,7 @@ CONFIG_HAVE_BPF_JIT=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -1062,7 +1080,6 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_HAVE_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
@@ -1117,7 +1134,7 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=y
-# CONFIG_ZRAM_LZ4_COMPRESS is not set
+CONFIG_ZRAM_LZ4_COMPRESS=y
 # CONFIG_ZRAM_DEBUG is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -1159,6 +1176,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 # CONFIG_SENSORS_BH1780 is not set
 # CONFIG_SENSORS_BH1770 is not set
 # CONFIG_SENSORS_APDS990X is not set
+# CONFIG_APDS9930 is not set
 # CONFIG_HMC6352 is not set
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
@@ -1170,11 +1188,15 @@ CONFIG_UID_STAT=y
 # CONFIG_SRAM is not set
 CONFIG_QSEECOM=y
 CONFIG_HDCP_QSEECOM=y
-CONFIG_UID_CPUTIME=y
+# CONFIG_PROFILER is not set
+CONFIG_UID_SYS_STATS=y
 CONFIG_USB_EXT_TYPE_C_PERICOM=y
 # CONFIG_USB_EXT_TYPE_C_TI is not set
 # CONFIG_TI_DRV2667 is not set
 # CONFIG_QPNP_MISC is not set
+# CONFIG_UID_SYS_STATS_DEBUG is not set
+# CONFIG_MEMORY_STATE_TIME is not set
+CONFIG_AW87319=y
 # CONFIG_C2PORT is not set
 
 #
@@ -1201,6 +1223,7 @@ CONFIG_USB_EXT_TYPE_C_PERICOM=y
 # CONFIG_ALTERA_STAPL is not set
 CONFIG_MSM_QDSP6V2_CODECS=y
 CONFIG_MSM_ULTRASOUND=y
+# CONFIG_MSM_MCU_TIME_SYNC is not set
 
 #
 # Intel MIC Bus Driver
@@ -1302,7 +1325,15 @@ CONFIG_SCSI_UFS_TEST=m
 CONFIG_HAVE_PATA_PLATFORM=y
 # CONFIG_ATA is not set
 CONFIG_MD=y
-# CONFIG_BLK_DEV_MD is not set
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+# CONFIG_MD_RAID0 is not set
+# CONFIG_MD_RAID1 is not set
+# CONFIG_MD_RAID10 is not set
+# CONFIG_MD_RAID456 is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
 # CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
@@ -1322,7 +1353,9 @@ CONFIG_DM_REQ_CRYPT=y
 # CONFIG_DM_UEVENT is not set
 # CONFIG_DM_FLAKEY is not set
 CONFIG_DM_VERITY=y
-# CONFIG_DM_ANDROID_VERITY is not set
+CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE_128=y
+CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1
+CONFIG_DM_ANDROID_VERITY=y
 CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
@@ -1547,6 +1580,8 @@ CONFIG_PHYLIB=y
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_QCA8337_SWITCH is not set
+# CONFIG_NXP_TJA110X_PHY is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_PPP=y
 CONFIG_PPP_BSDCOMP=y
@@ -1631,6 +1666,9 @@ CONFIG_WIL6210_PLATFORM_MSM=y
 # CONFIG_WL_TI is not set
 # CONFIG_MWIFIEX is not set
 CONFIG_CNSS=y
+# CONFIG_CNSS_SDIO is not set
+CONFIG_CNSS_PCI=y
+CONFIG_CNSS_ASYNC=y
 # CONFIG_CNSS_MAC_BUG is not set
 # CONFIG_CLD_DEBUG is not set
 # CONFIG_CLD_HL_SDIO_CORE is not set
@@ -1639,6 +1677,7 @@ CONFIG_CLD_LL_CORE=y
 CONFIG_BUS_AUTO_SUSPEND=y
 # CONFIG_CNSS_LOGGER is not set
 # CONFIG_WLAN_FEATURE_RX_WAKELOCK is not set
+CONFIG_CNSS_UTILS=y
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1668,6 +1707,7 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_EVBUG=m
 CONFIG_INPUT_KEYRESET=y
 CONFIG_INPUT_KEYCOMBO=y
+# CONFIG_SENSORS_HALL is not set
 
 #
 # Input Device Drivers
@@ -1735,9 +1775,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_v21=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C_v21=y
 # CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_SPI_v21 is not set
 CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v21=y
-CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v21=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v21=y
-# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_PROXIMITY_v21 is not set
 CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_v26=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C_v26=y
 # CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_SPI_v26 is not set
@@ -1793,24 +1831,28 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=y
 # CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
+# CONFIG_TOUCHSCREEN_FT5X06_GESTURE is not set
 # CONFIG_SECURE_TOUCH is not set
 # CONFIG_TOUCHSCREEN_IT7260_I2C is not set
 CONFIG_TOUCHSCREEN_GEN_VKEYS=y
-# CONFIG_TOUCHSCREEN_FT5X06 is not set
+CONFIG_TOUCHSCREEN_FT5X06=y
+CONFIG_FOCALTECH_5336=y
+CONFIG_FT_SECURE_TOUCH=y
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
 # CONFIG_TOUCHSCREEN_GT9XX is not set
 CONFIG_TOUCHSCREEN_MAXIM_STI=y
-CONFIG_TOUCHSCREEN_FT5336=y
-# CONFIG_TOUCHSCREEN_FT5346 is not set
-# CONFIG_TOUCHSCREEN_GT915L is not set
-# CONFIG_TOUCHSCREEN_GT917D is not set
-# CONFIG_TOUCHSCREEN_LOCKDOWN_INFO is not set
+# CONFIG_TOUCHSCREEN_HIMAX_CHIPSET is not set
+CONFIG_FINGERPRINT=y
+CONFIG_FINGERPRINT_FPC1020=y
+CONFIG_FINGERPRINT_GOODIX_GF3208=y
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_HBTP_INPUT is not set
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_MPU3050 is not set
+# CONFIG_SENSORS_MPU6050 is not set
+# CONFIG_SENSORS_AKM8963 is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_BEEPER is not set
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
@@ -1832,6 +1874,9 @@ CONFIG_INPUT_GPIO=y
 # CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
+# CONFIG_INPUT_PIXART_OTS_PAT9125_SWITCH is not set
+# CONFIG_SENSORS_LTR553 is not set
+# CONFIG_SENSORS_BMA2X2 is not set
 
 #
 # Hardware I/O ports
@@ -1859,13 +1904,13 @@ CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_NOZOMI is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
-# CONFIG_DEVMEM is not set
+CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
 
 #
@@ -1900,6 +1945,7 @@ CONFIG_SERIAL_MSM_SMD=y
 #
 # Diag Support
 #
+CONFIG_DIAG_CHAR=y
 
 #
 # DIAG traffic over USB
@@ -2070,7 +2116,8 @@ CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_MDM9607 is not set
 # CONFIG_PINCTRL_MDM9640 is not set
-# CONFIG_PINCTRL_MDMCALIFORNIUM is not set
+# CONFIG_PINCTRL_MDM9650 is not set
+# CONFIG_PINCTRL_SDX20 is not set
 # CONFIG_PINCTRL_APQ8084 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_MSM8960 is not set
@@ -2184,8 +2231,10 @@ CONFIG_A13N_PMI8952=y
 # CONFIG_BATTERY_BQ28400 is not set
 # CONFIG_QPNP_CHARGER is not set
 CONFIG_QPNP_SMBCHARGER=y
+# CONFIG_QPNP_SMB2 is not set
 # CONFIG_FUELGAUGE_STC3117 is not set
 CONFIG_QPNP_FG=y
+# CONFIG_QPNP_FG_GEN3 is not set
 CONFIG_BATTERY_BCL=y
 # CONFIG_QPNP_VM_BMS is not set
 # CONFIG_QPNP_BMS is not set
@@ -2200,6 +2249,7 @@ CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_LTC2952 is not set
 CONFIG_POWER_RESET_MSM=y
 # CONFIG_MSM_DLOAD_MODE is not set
+# CONFIG_MSM_PRESERVE_MEM is not set
 # CONFIG_POWER_RESET_XGENE is not set
 # CONFIG_POWER_RESET_SYSCON is not set
 # CONFIG_POWER_AVS is not set
@@ -2489,6 +2539,7 @@ CONFIG_REGULATOR_MEM_ACC=y
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_ONSEMI_NCP6335D is not set
 # CONFIG_REGULATOR_PFUZE100 is not set
 # CONFIG_REGULATOR_PWM is not set
 # CONFIG_REGULATOR_TPS51632 is not set
@@ -2519,7 +2570,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
 # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
 CONFIG_MEDIA_RADIO_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
+CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
@@ -2528,11 +2579,42 @@ CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEOBUF_GEN=y
 CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_VMALLOC=y
 # CONFIG_TTPCI_EEPROM is not set
 
 #
 # Media drivers
 #
+CONFIG_RC_CORE=y
+CONFIG_RC_MAP=y
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=y
+CONFIG_IR_LIRC_CODEC=y
+# CONFIG_IR_NEC_DECODER is not set
+# CONFIG_IR_RC5_DECODER is not set
+# CONFIG_IR_RC6_DECODER is not set
+# CONFIG_IR_JVC_DECODER is not set
+# CONFIG_IR_SONY_DECODER is not set
+# CONFIG_IR_SANYO_DECODER is not set
+# CONFIG_IR_SHARP_DECODER is not set
+# CONFIG_IR_MCE_KBD_DECODER is not set
+# CONFIG_IR_XMP_DECODER is not set
+# CONFIG_IR_DUMP_DECODER is not set
+CONFIG_RC_DEVICES=y
+# CONFIG_RC_ATI_REMOTE is not set
+# CONFIG_IR_HIX5HD2 is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_REDRAT3 is not set
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_IR_IGUANA is not set
+# CONFIG_IR_TTUSBIR is not set
+# CONFIG_IR_IMG is not set
+# CONFIG_RC_LOOPBACK is not set
+# CONFIG_IR_GPIO_CIR is not set
+CONFIG_IR_GPIO=y
+# CONFIG_IR_PWM is not set
 # CONFIG_MEDIA_USB_SUPPORT is not set
 # CONFIG_MEDIA_PCI_SUPPORT is not set
 CONFIG_V4L_PLATFORM_DRIVERS=y
@@ -2546,13 +2628,13 @@ CONFIG_MSM_VIDC_VMEM=y
 CONFIG_MSM_VIDC_GOVERNORS=y
 
 #
-# Qualcomm MSM Camera And Video
+# QTI MSM Camera And Video & AIS
 #
 CONFIG_MSM_CAMERA=y
-# CONFIG_MSM_CAMERA_DEBUG is not set
+CONFIG_MSM_CAMERA_DEBUG=y
 # CONFIG_MSM_CAMERA_AUTOMOTIVE is not set
 CONFIG_MSMB_CAMERA=y
-# CONFIG_MSMB_CAMERA_DEBUG is not set
+CONFIG_MSMB_CAMERA_DEBUG=y
 CONFIG_MSM_CAMERA_SENSOR=y
 CONFIG_MSM_CPP=y
 CONFIG_MSM_CCI=y
@@ -2564,7 +2646,7 @@ CONFIG_MSM_CSIPHY=y
 CONFIG_MSM_CSID=y
 CONFIG_MSM_EEPROM=y
 CONFIG_MSM_ISPIF=y
-# CONFIG_MSM_ISPIF_V1 is not set
+CONFIG_MSM_ISPIF_V1=y
 CONFIG_MSM_ISPIF_V2=y
 CONFIG_IMX134=y
 CONFIG_IMX132=y
@@ -2579,6 +2661,7 @@ CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y
 CONFIG_MSMB_JPEG=y
 CONFIG_MSM_FD=y
 # CONFIG_MSM_JPEGDMA is not set
+# CONFIG_MSM_AIS is not set
 # CONFIG_TSPP is not set
 # CONFIG_MSM_SDE_ROTATOR is not set
 
@@ -2615,6 +2698,7 @@ CONFIG_RADIO_SILABS=y
 #
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=y
 
 #
 # Audio decoders, processors and mixers
@@ -2701,7 +2785,10 @@ CONFIG_MEDIA_TUNER_MC44S803=y
 #
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
-# CONFIG_MSM_KGSL is not set
+CONFIG_MSM_KGSL=y
+# CONFIG_MSM_KGSL_CFF_DUMP is not set
+CONFIG_MSM_ADRENO_DEFAULT_GOVERNOR="msm-adreno-tz"
+CONFIG_MSM_KGSL_IOMMU=y
 
 #
 # Direct Rendering Manager
@@ -2779,12 +2866,13 @@ CONFIG_FB_MSM_MDSS=y
 # CONFIG_FB_MSM_MDP_NONE is not set
 # CONFIG_FB_MSM_QPIC_ILI_QVGA_PANEL is not set
 # CONFIG_FB_MSM_QPIC_PANEL_DETECT is not set
-CONFIG_FB_MSM_MDSS_WRITEBACK=y
+# CONFIG_FB_MSM_MDSS_WRITEBACK is not set
 # CONFIG_FB_MSM_MDSS_HDMI_PANEL is not set
 # CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS is not set
 # CONFIG_FB_MSM_MDSS_EDP_PANEL is not set
 # CONFIG_FB_MSM_MDSS_MDP3 is not set
 CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y
+# CONFIG_FB_MSM_MDSS_FRC_DEBUG is not set
 # CONFIG_FB_SSD1307 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -2814,6 +2902,7 @@ CONFIG_BACKLIGHT_GENERIC=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_ADF is not set
 # CONFIG_VGASTATE is not set
+# CONFIG_LT8912 is not set
 
 #
 # Console display driver support
@@ -2821,11 +2910,8 @@ CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
 CONFIG_SND=y
@@ -2844,7 +2930,9 @@ CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
+CONFIG_SND_DEBUG_VERBOSE=y
+# CONFIG_SND_PCM_XRUN_DEBUG is not set
 # CONFIG_SND_RAWMIDI_SEQ is not set
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
@@ -2932,7 +3020,6 @@ CONFIG_SND_USB_AUDIO=y
 # CONFIG_SND_USB_6FIRE is not set
 # CONFIG_SND_USB_HIFACE is not set
 # CONFIG_SND_BCD2000 is not set
-# CONFIG_SND_USB_AUDIO_QMI is not set
 CONFIG_SND_SOC=y
 # CONFIG_SND_ATMEL_SOC is not set
 # CONFIG_SND_DESIGNWARE_I2S is not set
@@ -2965,7 +3052,6 @@ CONFIG_DTS_SRS_TM=y
 CONFIG_QTI_PP=y
 CONFIG_SND_SOC_CPE=y
 CONFIG_SND_SOC_MSM8X16=y
-CONFIG_SND_SOC_AW87319=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 
 #
@@ -3171,7 +3257,7 @@ CONFIG_USB_EHCI_MSM_HSIC=y
 #
 CONFIG_USB_ACM=y
 # CONFIG_USB_PRINTER is not set
-CONFIG_USB_WDM=y
+# CONFIG_USB_WDM is not set
 # CONFIG_USB_TMC is not set
 
 #
@@ -3183,8 +3269,7 @@ CONFIG_USB_WDM=y
 #
 CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=y
-CONFIG_REALTEK_AUTOPM=y
+# CONFIG_USB_STORAGE_REALTEK is not set
 CONFIG_USB_STORAGE_DATAFAB=y
 CONFIG_USB_STORAGE_FREECOM=y
 CONFIG_USB_STORAGE_ISD200=y
@@ -3204,10 +3289,7 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=y
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-CONFIG_USBIP_CORE=y
-# CONFIG_USBIP_VHCI_HCD is not set
-# CONFIG_USBIP_HOST is not set
-# CONFIG_USBIP_DEBUG is not set
+# CONFIG_USBIP_CORE is not set
 # CONFIG_USB_MUSB_HDRC is not set
 CONFIG_USB_DWC3=y
 # CONFIG_USB_DWC3_HOST is not set
@@ -3232,9 +3314,9 @@ CONFIG_USB_DWC3_MSM=y
 # USB port drivers
 #
 CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_CONSOLE=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=y
+# CONFIG_USB_SERIAL_CONSOLE is not set
+# CONFIG_USB_SERIAL_GENERIC is not set
+# CONFIG_USB_SERIAL_SIMPLE is not set
 # CONFIG_USB_SERIAL_AIRCABLE is not set
 # CONFIG_USB_SERIAL_ARK3116 is not set
 # CONFIG_USB_SERIAL_BELKIN is not set
@@ -3310,13 +3392,14 @@ CONFIG_USB_EHSET_TEST_FIXTURE=y
 # CONFIG_USB_YUREX is not set
 # CONFIG_USB_EZUSB_FX2 is not set
 # CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_MICROCHIP_USB2533 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
+# CONFIG_USB_QTI_KS_BRIDGE is not set
 
 #
 # USB Physical Layer drivers
 #
 CONFIG_USB_PHY=y
-# CONFIG_USB_OTG_WAKELOCK is not set
 CONFIG_NOP_USB_XCEIV=y
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
@@ -3353,12 +3436,24 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_CI13XXX_MSM=y
 # CONFIG_USB_CI13XXX_MSM_HSIC is not set
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_F_UAC2=m
+CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_F_ACM=y
+CONFIG_USB_U_SERIAL=y
+CONFIG_USB_F_SERIAL=y
+CONFIG_USB_F_NCM=y
+CONFIG_USB_F_ECM=y
+CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_F_FS=y
+CONFIG_USB_F_UAC1=y
+CONFIG_USB_F_UAC2=y
+CONFIG_USB_F_UVC=y
+CONFIG_USB_F_AUDIO_SRC=y
+CONFIG_USB_F_IPC=y
 # CONFIG_USB_CONFIGFS is not set
+CONFIG_USB_G_ANDROID=y
+# CONFIG_USB_ANDROID_RNDIS_DWORD_ALIGNED is not set
 # CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-# CONFIG_GADGET_UAC1 is not set
+# CONFIG_USB_AUDIO is not set
 # CONFIG_USB_ETH is not set
 # CONFIG_USB_G_NCM is not set
 # CONFIG_USB_GADGETFS is not set
@@ -3440,6 +3535,7 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_INTEL_SS4200 is not set
 # CONFIG_LEDS_LT3593 is not set
 # CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
 
 #
@@ -3449,6 +3545,7 @@ CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH=y
 CONFIG_LEDS_QPNP_WLED=y
+# CONFIG_LEDS_MSM_GPIO_FLASH is not set
 CONFIG_LEDS_AW2013=y
 
 #
@@ -3468,7 +3565,6 @@ CONFIG_LEDS_TRIGGERS=y
 #
 # CONFIG_LEDS_TRIGGER_TRANSIENT is not set
 # CONFIG_LEDS_TRIGGER_CAMERA is not set
-# CONFIG_VIB_GPIO is not set
 CONFIG_SWITCH=y
 # CONFIG_SWITCH_GPIO is not set
 # CONFIG_ACCESSIBILITY is not set
@@ -3631,7 +3727,6 @@ CONFIG_STAGING=y
 # CONFIG_LINE6_USB is not set
 # CONFIG_VT6655 is not set
 # CONFIG_FB_XGI is not set
-# CONFIG_BCM_WIMAX is not set
 # CONFIG_FT1000 is not set
 
 #
@@ -3646,12 +3741,12 @@ CONFIG_STAGING=y
 #
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 CONFIG_ASHMEM=y
 # CONFIG_ANDROID_LOGGER is not set
 CONFIG_ANDROID_TIMED_OUTPUT=y
 CONFIG_ANDROID_TIMED_GPIO=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 CONFIG_SYNC=y
 CONFIG_SW_SYNC=y
 CONFIG_SW_SYNC_USER=y
@@ -3671,6 +3766,21 @@ CONFIG_ION_MSM=y
 # CONFIG_DGNC is not set
 # CONFIG_DGAP is not set
 # CONFIG_GS_FPGABOOT is not set
+
+#
+# Qualcomm Atheros Prima WLAN module
+#
+# CONFIG_PRIMA_WLAN is not set
+CONFIG_PRONTO_WLAN=y
+# CONFIG_PRIMA_WLAN_BTAMP is not set
+CONFIG_PRIMA_WLAN_LFR=y
+CONFIG_PRIMA_WLAN_OKC=y
+CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y
+CONFIG_WLAN_FEATURE_11W=y
+CONFIG_QCOM_VOWIFI_11R=y
+CONFIG_ENABLE_LINUX_REG=y
+CONFIG_WLAN_OFFLOAD_PACKETS=y
+CONFIG_QCOM_TDLS=y
 # CONFIG_GOLDFISH is not set
 
 #
@@ -3693,7 +3803,6 @@ CONFIG_IPA=y
 # CONFIG_IPA3 is not set
 # CONFIG_GSI is not set
 CONFIG_RMNET_IPA=y
-# CONFIG_SSM is not set
 # CONFIG_MSM_MHI is not set
 # CONFIG_PFT is not set
 # CONFIG_I2C_MSM_PROF_DBG is not set
@@ -3706,93 +3815,6 @@ CONFIG_MSM_SPMI=y
 CONFIG_MSM_SPMI_PMIC_ARB=y
 CONFIG_MSM_QPNP_INT=y
 # CONFIG_MSM_SPMI_DEBUGFS_RO is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-CONFIG_CP_ACCESS64=y
-CONFIG_MSM_INRUSH_CURRENT_MITIGATION=y
-CONFIG_MSM_QDSP6_APRV2=y
-# CONFIG_MSM_GLADIATOR_ERP is not set
-# CONFIG_MSM_GLADIATOR_ERP_V2 is not set
-# CONFIG_MSM_QDSP6_APRV3 is not set
-# CONFIG_MSM_QDSP6_APRV2_GLINK is not set
-# CONFIG_MSM_QDSP6_APRV3_GLINK is not set
-CONFIG_MSM_ADSP_LOADER=y
-# CONFIG_MSM_MEMORY_DUMP is not set
-CONFIG_MSM_MEMORY_DUMP_V2=y
-# CONFIG_MSM_DEBUG_LAR_UNLOCK is not set
-# CONFIG_MSM_JTAG is not set
-# CONFIG_MSM_JTAG_MM is not set
-# CONFIG_MSM_JTAGV8 is not set
-CONFIG_MSM_BOOT_STATS=y
-# CONFIG_MSM_BOOT_TIME_MARKER is not set
-CONFIG_MSM_CPUSS_DUMP=y
-CONFIG_MSM_COMMON_LOG=y
-CONFIG_MSM_DDR_HEALTH=y
-# CONFIG_MSM_HYP_DEBUG is not set
-CONFIG_MSM_WATCHDOG_V2=y
-CONFIG_MSM_FORCE_WDOG_BITE_ON_PANIC=y
-# CONFIG_MSM_CORE_HANG_DETECT is not set
-# CONFIG_MSM_GLADIATOR_HANG_DETECT is not set
-CONFIG_MSM_CPU_PWR_CTL=y
-# CONFIG_MSM_L2_IA_DEBUG is not set
-CONFIG_MSM_RPM_SMD=y
-CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG=y
-CONFIG_MSM_RPM_LOG=y
-CONFIG_MSM_RPM_STATS_LOG=y
-CONFIG_MSM_RUN_QUEUE_STATS=y
-CONFIG_MSM_SCM=y
-CONFIG_MSM_SCM_XPU=y
-CONFIG_MSM_XPU_ERR_FATAL=y
-# CONFIG_MSM_XPU_ERR_NONFATAL is not set
-# CONFIG_MSM_SCM_ERRATA is not set
-# CONFIG_MSM_PFE_WA is not set
-CONFIG_MSM_MPM_OF=y
-CONFIG_MSM_SMEM=y
-CONFIG_MSM_SMD=y
-# CONFIG_MSM_SMD_DEBUG is not set
-CONFIG_MSM_GLINK=y
-CONFIG_MSM_GLINK_LOOPBACK_SERVER=y
-CONFIG_MSM_GLINK_SMD_XPRT=y
-CONFIG_MSM_GLINK_SMEM_NATIVE_XPRT=y
-# CONFIG_MSM_SPCOM is not set
-CONFIG_MSM_SMEM_LOGGING=y
-CONFIG_MSM_SMP2P=y
-CONFIG_MSM_SMP2P_TEST=y
-CONFIG_MSM_SPM=y
-CONFIG_MSM_L2_SPM=y
-CONFIG_MSM_QMI_INTERFACE=y
-# CONFIG_MSM_DCC is not set
-# CONFIG_MSM_HVC is not set
-CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
-CONFIG_MSM_EVENT_TIMER=y
-# CONFIG_MSM_IPC_ROUTER_GLINK_XPRT is not set
-# CONFIG_MSM_GLINK_PKT is not set
-# CONFIG_MSM_TZ_SMMU is not set
-# CONFIG_MSM_SUBSYSTEM_RESTART is not set
-CONFIG_MSM_PIL=y
-# CONFIG_MSM_SHARED_HEAP_ACCESS is not set
-# CONFIG_TRACER_PKT is not set
-CONFIG_MSM_SECURE_BUFFER=y
-# CONFIG_ICNSS is not set
-CONFIG_MSM_BAM_DMUX=y
-CONFIG_MSM_PERFORMANCE=y
-# CONFIG_MSM_PERFORMANCE_HOTPLUG_ON is not set
-# CONFIG_MSM_POWER is not set
-# CONFIG_MSM_SERVICE_LOCATOR is not set
-# CONFIG_MSM_QBT1000 is not set
-# CONFIG_MSM_PACMAN is not set
-CONFIG_MSM_KERNEL_PROTECT=y
-CONFIG_MSM_KERNEL_PROTECT_MPU=y
-# CONFIG_MSM_KERNEL_PROTECT_TEST is not set
-# CONFIG_MSM_REMOTEQDSS is not set
-CONFIG_SERIAL_NUM=y
-CONFIG_SECBOOT_FUSE=y
-CONFIG_CPUMAXFREQ=y
-# CONFIG_QCOM_SMCINVOKE is not set
-CONFIG_MEM_SHARE_QMI_SERVICE=y
-# CONFIG_SOC_TI is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_MSM_CLK_CONTROLLER_V2=y
@@ -3810,6 +3832,7 @@ CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_CLKSRC_OF=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+# CONFIG_ARM_ARCH_TIMER_VCT_ACCESS is not set
 # CONFIG_ATMEL_PIT is not set
 # CONFIG_SH_TIMER_CMT is not set
 # CONFIG_SH_TIMER_MTU2 is not set
@@ -3852,6 +3875,99 @@ CONFIG_IOMMU_TESTS=y
 #
 # SOC (System On Chip) specific Drivers
 #
+# CONFIG_MSM_HAB is not set
+CONFIG_CP_ACCESS64=y
+CONFIG_MSM_INRUSH_CURRENT_MITIGATION=y
+CONFIG_MSM_QDSP6_APRV2=y
+# CONFIG_MSM_GLADIATOR_ERP is not set
+# CONFIG_MSM_GLADIATOR_ERP_V2 is not set
+# CONFIG_MSM_QDSP6_APRV3 is not set
+# CONFIG_MSM_QDSP6_APRV2_GLINK is not set
+# CONFIG_MSM_QDSP6_APRV3_GLINK is not set
+CONFIG_MSM_ADSP_LOADER=y
+# CONFIG_MSM_MEMORY_DUMP is not set
+CONFIG_MSM_MEMORY_DUMP_V2=y
+# CONFIG_MSM_DEBUG_LAR_UNLOCK is not set
+# CONFIG_MSM_JTAG is not set
+# CONFIG_MSM_JTAG_MM is not set
+# CONFIG_MSM_JTAGV8 is not set
+CONFIG_MSM_BOOT_STATS=y
+# CONFIG_MSM_BOOT_TIME_MARKER is not set
+CONFIG_MSM_CPUSS_DUMP=y
+CONFIG_MSM_COMMON_LOG=y
+CONFIG_MSM_DDR_HEALTH=y
+# CONFIG_MSM_HYP_DEBUG is not set
+# CONFIG_MSM_WATCHDOG_V2 is not set
+# CONFIG_MSM_CORE_HANG_DETECT is not set
+# CONFIG_MSM_GLADIATOR_HANG_DETECT is not set
+CONFIG_MSM_CPU_PWR_CTL=y
+# CONFIG_MSM_L2_IA_DEBUG is not set
+CONFIG_MSM_RPM_SMD=y
+CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG=y
+CONFIG_MSM_RPM_LOG=y
+CONFIG_MSM_RPM_STATS_LOG=y
+CONFIG_MSM_RUN_QUEUE_STATS=y
+CONFIG_MSM_SCM=y
+CONFIG_MSM_SCM_XPU=y
+CONFIG_MSM_XPU_ERR_FATAL=y
+# CONFIG_MSM_XPU_ERR_NONFATAL is not set
+# CONFIG_MSM_SCM_ERRATA is not set
+# CONFIG_MSM_PFE_WA is not set
+CONFIG_MSM_MPM_OF=y
+CONFIG_MSM_SMEM=y
+# CONFIG_QPNP_PBS is not set
+CONFIG_MSM_SMD=y
+# CONFIG_MSM_SMD_DEBUG is not set
+CONFIG_MSM_GLINK=y
+CONFIG_MSM_GLINK_LOOPBACK_SERVER=y
+CONFIG_MSM_GLINK_SMD_XPRT=y
+CONFIG_MSM_GLINK_SMEM_NATIVE_XPRT=y
+# CONFIG_MSM_SPCOM is not set
+CONFIG_MSM_SMEM_LOGGING=y
+CONFIG_MSM_SMP2P=y
+CONFIG_MSM_SMP2P_TEST=y
+CONFIG_MSM_SPM=y
+CONFIG_MSM_L2_SPM=y
+CONFIG_MSM_QMI_INTERFACE=y
+# CONFIG_MSM_DCC is not set
+# CONFIG_MSM_HVC is not set
+CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
+CONFIG_MSM_EVENT_TIMER=y
+# CONFIG_MSM_IPC_ROUTER_USB_XPRT is not set
+# CONFIG_MSM_SYSMON_GLINK_COMM is not set
+# CONFIG_MSM_IPC_ROUTER_GLINK_XPRT is not set
+# CONFIG_MSM_SYSTEM_HEALTH_MONITOR is not set
+# CONFIG_MSM_GLINK_PKT is not set
+# CONFIG_MSM_TZ_SMMU is not set
+CONFIG_MSM_SUBSYSTEM_RESTART=y
+CONFIG_MSM_SYSMON_COMM=y
+CONFIG_MSM_PIL=y
+CONFIG_MSM_PIL_SSR_GENERIC=y
+# CONFIG_MSM_PIL_SSR_BG is not set
+CONFIG_MSM_PIL_MSS_QDSP6V5=y
+# CONFIG_MSM_SHARED_HEAP_ACCESS is not set
+# CONFIG_TRACER_PKT is not set
+CONFIG_MSM_SECURE_BUFFER=y
+# CONFIG_ICNSS is not set
+CONFIG_MSM_BAM_DMUX=y
+CONFIG_MSM_PERFORMANCE=y
+# CONFIG_MSM_PERFORMANCE_HOTPLUG_ON is not set
+# CONFIG_MSM_POWER is not set
+# CONFIG_MSM_SERVICE_LOCATOR is not set
+# CONFIG_MSM_QBT1000 is not set
+CONFIG_MSM_KERNEL_PROTECT=y
+CONFIG_MSM_KERNEL_PROTECT_MPU=y
+# CONFIG_MSM_KERNEL_PROTECT_TEST is not set
+# CONFIG_MSM_BGCOM is not set
+# CONFIG_MSM_REMOTEQDSS is not set
+CONFIG_SERIAL_NUM=y
+CONFIG_SECBOOT_FUSE=y
+CONFIG_CPUMAXFREQ=y
+# CONFIG_QCOM_SMCINVOKE is not set
+# CONFIG_QCOM_EARLY_RANDOM is not set
+# CONFIG_WCD_DSP_GLINK is not set
+CONFIG_MEM_SHARE_QMI_SERVICE=y
+# CONFIG_SOC_TI is not set
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -3862,7 +3978,9 @@ CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
 CONFIG_DEVFREQ_GOV_CPUFREQ=y
+CONFIG_DEVFREQ_GOV_MSM_ADRENO_TZ=y
 CONFIG_MSM_BIMC_BWMON=y
+CONFIG_DEVFREQ_GOV_MSM_GPUBW_MON=y
 # CONFIG_ARMBW_HWMON is not set
 CONFIG_ARM_MEMLAT_MON=y
 CONFIG_MSMCCI_HWMON=y
@@ -3914,6 +4032,7 @@ CONFIG_PHY_QCOM_UFS=y
 # CONFIG_MCB is not set
 CONFIG_RAS=y
 # CONFIG_THUNDERBOLT is not set
+# CONFIG_SENSORS is not set
 CONFIG_SENSORS_SSC=y
 
 #
@@ -3932,9 +4051,6 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_ARMSTUB=y
 CONFIG_MSM_TZ_LOG=y
 # CONFIG_BIF is not set
-CONFIG_FINGERPRINT=y
-CONFIG_FINGERPRINT_GOODIX_GF3208=y
-CONFIG_FINGERPRINT_FPC1020=y
 
 #
 # Firmware Drivers
@@ -3950,17 +4066,19 @@ CONFIG_FINGERPRINT_FPC1020=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
-# CONFIG_EXT2_FS_POSIX_ACL is not set
+CONFIG_EXT2_FS_POSIX_ACL=y
 # CONFIG_EXT2_FS_SECURITY is not set
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
+CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_EXT4_FS=y
-# CONFIG_EXT4_FS_POSIX_ACL is not set
+CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_ENCRYPTION=y
+CONFIG_EXT4_FS_ENCRYPTION=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
@@ -3975,7 +4093,9 @@ CONFIG_FS_MBCACHE=y
 # 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_FS_ENCRYPTION=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -3984,10 +4104,11 @@ CONFIG_QUOTA=y
 # CONFIG_QUOTA_NETLINK_INTERFACE is not set
 # CONFIG_PRINT_QUOTA_WARNING is not set
 # CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
 # CONFIG_QFMT_V1 is not set
-# CONFIG_QFMT_V2 is not set
+CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
-# CONFIG_AUTOFS4_FS is not set
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 # CONFIG_OVERLAY_FS is not set
@@ -4033,7 +4154,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_AFFS_FS is not set
 CONFIG_ECRYPT_FS=y
 # CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_SDCARD_FS is not set
+CONFIG_SDCARD_FS=y
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -4049,10 +4170,21 @@ CONFIG_ECRYPT_FS=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
 # CONFIG_ROMFS_FS is not set
-# CONFIG_PSTORE is not set
+CONFIG_PSTORE=y
+CONFIG_PSTORE_CONSOLE=y
+CONFIG_PSTORE_PMSG=y
+CONFIG_PSTORE_RAM=y
+CONFIG_PSTORE_LAST_KMSG=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-# CONFIG_F2FS_FS is not set
+CONFIG_F2FS_FS=y
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+CONFIG_F2FS_FS_ENCRYPTION=y
+# CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_EFIVAR_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NFS_FS is not set
@@ -4063,7 +4195,6 @@ CONFIG_CIFS=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
@@ -4306,6 +4437,7 @@ CONFIG_DEBUG_SET_MODULE_RONX=y
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_ENCRYPTED_KEYS=y
@@ -4314,34 +4446,27 @@ CONFIG_ENCRYPTED_KEYS=y
 #
 # Qualcomm Technologies, Inc Per File Encryption security device drivers
 #
-# CONFIG_PFK is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY_PERF_EVENTS_RESTRICT is not set
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY=y
 # CONFIG_SECURITYFS is not set
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 # CONFIG_SECURITY_PATH is not set
-CONFIG_LSM_MMAP_MIN_ADDR=4096
-CONFIG_SECURITY_SELINUX=y
-# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY="selinux"
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_CRYPTO=y
 
 #
@@ -4360,7 +4485,7 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
-# CONFIG_CRYPTO_USER is not set
+CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
@@ -4384,7 +4509,7 @@ CONFIG_CRYPTO_SEQIV=y
 #
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTR=y
-# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_PCBC is not set
@@ -4402,7 +4527,7 @@ CONFIG_CRYPTO_XCBC=y
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32 is not set
+CONFIG_CRYPTO_CRC32=y
 # CONFIG_CRYPTO_CRCT10DIF is not set
 # CONFIG_CRYPTO_GHASH is not set
 CONFIG_CRYPTO_MD4=y
@@ -4444,15 +4569,16 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y
 CONFIG_CRYPTO_DEFLATE=y
 # CONFIG_CRYPTO_ZLIB is not set
 CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_LZ4 is not set
-# CONFIG_CRYPTO_LZ4HC is not set
+CONFIG_CRYPTO_LZ4=y
+CONFIG_CRYPTO_LZ4HC=y
 
 #
 # Random Number Generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_DRBG_MENU is not set
-# CONFIG_CRYPTO_USER_API_HASH is not set
+CONFIG_CRYPTO_USER_API=y
+CONFIG_CRYPTO_USER_API_HASH=y
 # CONFIG_CRYPTO_USER_API_SKCIPHER is not set
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
@@ -4503,21 +4629,24 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
 # CONFIG_CRC8 is not set
-CONFIG_AUDIT_GENERIC=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
-CONFIG_AUDIT_COMPAT_GENERIC=y
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4HC_COMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
 # CONFIG_XZ_DEC is not set
 # CONFIG_XZ_DEC_BCJ is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=y
+CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=y
@@ -4540,9 +4669,19 @@ CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
 CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_QMI_ENCDEC=y
 # CONFIG_QMI_ENCDEC_DEBUG is not set