diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0007c8c..ffb6fc5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -79,7 +79,10 @@ TARGET_KERNEL_EXT_MODULES := \
   motorola/drivers/misc/sx937x_multi \
   motorola/drivers/input/touchscreen/touchscreen_mmi \
   motorola/drivers/input/touchscreen/goodix_berlin_mmi \
-  motorola/drivers/input/misc/goodix_fod_mmi
+  motorola/drivers/input/misc/goodix_fod_mmi \
+  motorola/drivers/moto_mm \
+  motorola/drivers/moto_mmap_fault \
+  motorola/drivers/moto_swap
 
 # Partitions
 ifneq ($(WITH_GMS),true)
diff --git a/modules.load b/modules.load
index 948b9a3..24aae20 100644
--- a/modules.load
+++ b/modules.load
@@ -9,10 +9,16 @@ mhi_dev_satellite.ko
 phy-qcom-ufs-qmp-v4-waipio.ko
 phy-qcom-ufs-qmp-v4.ko
 phy-qcom-ufs-qmp-v4-khaje.ko
+phy-qcom-ufs-qmp-v4-lahaina.ko
+phy-qcom-ufs-qmp-v4-kona.ko
 pinctrl-spmi-gpio.ko
 pinctrl-spmi-mpp.ko
 pwm-qti-lpg.ko
 pci-msm-drv.ko
+gpucc-crow.ko
+videocc-crow.ko
+camcc-crow.ko
+debugcc-crow.ko
 debugcc-kalama.ko
 gpucc-kalama.ko
 bam_dma.ko
@@ -46,10 +52,12 @@ core_hang_detect.ko
 usb_bam.ko
 memlat.ko
 memlat_scmi.ko
+cpufreq_stats_scmi.ko
 qcom_ramdump.ko
 panel_event_notifier.ko
 dmesg_dumper.ko
 sys_pm_vx.ko
+plh_scmi.ko
 qdss_bridge.ko
 fsa4480-i2c.ko
 msm_show_epoch.ko
@@ -61,7 +69,10 @@ msm_performance.ko
 qcom_va_minidump.ko
 qbt_handler.ko
 hung_task_enh.ko
+qfprom-sys.ko
+wcd_usbss_i2c.ko
 qti-fixed-regulator.ko
+qpnp-amoled-regulator.ko
 qti-ocp-notifier.ko
 hvc_gunyah.ko
 msm_geni_serial.ko
@@ -70,6 +81,7 @@ rdbg.ko
 qcom_iommu_debug.ko
 lt9611uxc.ko
 qseecom_proxy.ko
+qcom-i2c-pmic.ko
 sg.ko
 spi-msm-geni.ko
 msm_sharedmem.ko
@@ -120,8 +132,13 @@ qcom_edac.ko
 qcom_lpm.ko
 leds-qti-flash.ko
 leds-qti-tri-led.ko
+leds-qpnp-vibrator-ldo.ko
 memlat_vendor.ko
+cpufreq_stats_vendor.ko
+plh_vendor.ko
 ipa_fmwk.ko
+ep_pcie_drv.ko
+mhi_dev_drv.ko
 qcom_pil_info.ko
 rproc_qcom_common.ko
 qcom_q6v5.ko
@@ -137,6 +154,8 @@ gh_irq_lend.ko
 gh_mem_notifier.ko
 qcom-spmi-adc5-gen3.ko
 qcom-vadc-common.ko
+qti-glink-adc.ko
+industrialio-buffer-cb.ko
 nvmem_qfprom.ko
 slimbus.ko
 slim-qcom-ngd-ctrl.ko
@@ -152,13 +171,6 @@ mac80211.ko
 qrtr-smd.ko
 qrtr-mhi.ko
 qrtr-gunyah.ko
-qca_cld3_kiwi_v2.ko
-cnss2.ko
-cnss_plat_ipc_qmi_svc.ko
-wlan_firmware_service.ko
-cnss_nl.ko
-cnss_prealloc.ko
-cnss_utils.ko
 q6_notifier_dlkm.ko
 spf_core_dlkm.ko
 audpkt_ion_dlkm.ko
@@ -190,11 +202,17 @@ wsa884x_dlkm.ko
 wsa883x_dlkm.ko
 wcd938x_dlkm.ko
 wcd938x_slave_dlkm.ko
+wcd939x_dlkm.ko
+wcd939x_slave_dlkm.ko
+wcd937x_dlkm.ko
+wcd937x_slave_dlkm.ko
+aw882xx_dlkm.ko
 tz_log_dlkm.ko
 qcedev-mod_dlkm.ko
 qcrypto-msm_dlkm.ko
 qce50_dlkm.ko
 hdcp_qseecom_dlkm.ko
+qrng_dlkm.ko
 smcinvoke_dlkm.ko
 qca_cld3_kiwi_v2.ko
 cnss2.ko
@@ -205,7 +223,6 @@ cnss_prealloc.ko
 cnss_utils.ko
 btpower.ko
 bt_fm_slim.ko
-radio-i2c-rtc6226-qca.ko
 camera.ko
 gsim.ko
 ipam.ko
@@ -248,4 +265,7 @@ wl2868c.ko
 goodix_fod_mmi.ko
 qpnp_adaptive_charge.ko
 mmi_sys_temp.ko
+moto_mm.ko
+moto_swap.ko
+moto_mmap_fault.ko
 msm_kgsl.ko
diff --git a/modules.load.recovery b/modules.load.recovery
index 376cf03..ec0734e 100644
--- a/modules.load.recovery
+++ b/modules.load.recovery
@@ -2,6 +2,7 @@ qcom_wdt_core.ko
 gh_virt_wdt.ko
 qcom_cpu_vendor_hooks.ko
 clk-rpmh.ko
+gcc-crow.ko
 gcc-kalama.ko
 icc-rpmh.ko
 camcc-kalama.ko
@@ -25,6 +26,7 @@ crypto-qti-hwkm.ko
 dcc_v2.ko
 dcvs_fp.ko
 debug-regulator.ko
+dispcc-crow.ko
 dispcc-kalama.ko
 tcsrcc-kalama.ko
 videocc-kalama.ko
@@ -47,11 +49,14 @@ mem_buf.ko
 memory_dump_v2.ko
 minidump.ko
 msm_dma_iommu_mapping.ko
+pinctrl-crow.ko
 pinctrl-kalama.ko
 qnoc-kalama.ko
+qnoc-crow.ko
 nvmem_qcom-spmi-sdam.ko
 phy-qcom-ufs.ko
 phy-qcom-ufs-qmp-v4-kalama.ko
+phy-qcom-ufs-qmp-v4-crow.ko
 phy-qcom-ufs-qrbtc-sdm845.ko
 pinctrl-msm.ko
 proxy-consumer.ko
@@ -59,6 +64,7 @@ qcom-dcvs.ko
 qcom-dload-mode.ko
 qcom_dma_heaps.ko
 qcom_hwspinlock.ko
+debug_symbol.ko
 qcom_logbuf_vh.ko
 qcom_iommu_util.ko
 qcom_llcc_pmu.ko
@@ -103,10 +109,16 @@ mhi_dev_satellite.ko
 phy-qcom-ufs-qmp-v4-waipio.ko
 phy-qcom-ufs-qmp-v4.ko
 phy-qcom-ufs-qmp-v4-khaje.ko
+phy-qcom-ufs-qmp-v4-lahaina.ko
+phy-qcom-ufs-qmp-v4-kona.ko
 pinctrl-spmi-gpio.ko
 pinctrl-spmi-mpp.ko
 pwm-qti-lpg.ko
 pci-msm-drv.ko
+gpucc-crow.ko
+videocc-crow.ko
+camcc-crow.ko
+debugcc-crow.ko
 debugcc-kalama.ko
 gpucc-kalama.ko
 bam_dma.ko
@@ -138,10 +150,12 @@ core_hang_detect.ko
 usb_bam.ko
 memlat.ko
 memlat_scmi.ko
+cpufreq_stats_scmi.ko
 qcom_ramdump.ko
 panel_event_notifier.ko
 dmesg_dumper.ko
 sys_pm_vx.ko
+plh_scmi.ko
 qdss_bridge.ko
 fsa4480-i2c.ko
 msm_show_epoch.ko
@@ -152,7 +166,10 @@ spcom.ko
 msm_performance.ko
 qcom_va_minidump.ko
 qbt_handler.ko
+qfprom-sys.ko
+wcd_usbss_i2c.ko
 qti-fixed-regulator.ko
+qpnp-amoled-regulator.ko
 qti-ocp-notifier.ko
 hvc_gunyah.ko
 msm_geni_serial.ko
@@ -160,6 +177,7 @@ frpc-adsprpc.ko
 rdbg.ko
 lt9611uxc.ko
 qseecom_proxy.ko
+qcom-i2c-pmic.ko
 sg.ko
 spi-msm-geni.ko
 msm_sharedmem.ko
@@ -209,8 +227,14 @@ qcom_edac.ko
 qcom_lpm.ko
 leds-qti-flash.ko
 leds-qti-tri-led.ko
+leds-qpnp-vibrator-ldo.ko
 memlat_vendor.ko
+cpufreq_stats_vendor.ko
+plh_vendor.ko
 ipa_fmwk.ko
+ep_pcie_drv.ko
+mhi_dev_drv.ko
+mhi_dev_net.ko
 qcom_pil_info.ko
 rproc_qcom_common.ko
 qcom_q6v5.ko
@@ -226,6 +250,8 @@ gh_irq_lend.ko
 gh_mem_notifier.ko
 qcom-spmi-adc5-gen3.ko
 qcom-vadc-common.ko
+qti-glink-adc.ko
+industrialio-buffer-cb.ko
 nvmem_qfprom.ko
 slimbus.ko
 slim-qcom-ngd-ctrl.ko
@@ -254,4 +280,3 @@ mmi_info.ko
 mmi_relay.ko
 sensors_class.ko
 touchscreen_mmi.ko
-debug_symbol.ko
diff --git a/modules.load.vendor_boot b/modules.load.vendor_boot
index 762344c..22b6249 100644
--- a/modules.load.vendor_boot
+++ b/modules.load.vendor_boot
@@ -2,6 +2,7 @@ qcom_wdt_core.ko
 gh_virt_wdt.ko
 qcom_cpu_vendor_hooks.ko
 clk-rpmh.ko
+gcc-crow.ko
 gcc-kalama.ko
 icc-rpmh.ko
 camcc-kalama.ko
@@ -25,6 +26,7 @@ crypto-qti-hwkm.ko
 dcc_v2.ko
 dcvs_fp.ko
 debug-regulator.ko
+dispcc-crow.ko
 dispcc-kalama.ko
 tcsrcc-kalama.ko
 videocc-kalama.ko
@@ -47,11 +49,14 @@ mem_buf.ko
 memory_dump_v2.ko
 minidump.ko
 msm_dma_iommu_mapping.ko
+pinctrl-crow.ko
 pinctrl-kalama.ko
 qnoc-kalama.ko
+qnoc-crow.ko
 nvmem_qcom-spmi-sdam.ko
 phy-qcom-ufs.ko
 phy-qcom-ufs-qmp-v4-kalama.ko
+phy-qcom-ufs-qmp-v4-crow.ko
 phy-qcom-ufs-qrbtc-sdm845.ko
 pinctrl-msm.ko
 proxy-consumer.ko
@@ -59,6 +64,7 @@ qcom-dcvs.ko
 qcom-dload-mode.ko
 qcom_dma_heaps.ko
 qcom_hwspinlock.ko
+debug_symbol.ko
 qcom_logbuf_vh.ko
 qcom_iommu_util.ko
 qcom_llcc_pmu.ko
@@ -92,5 +98,4 @@ c1dcvs_scmi.ko
 bcl_pmic5.ko
 nvme-core.ko
 nvme.ko
-debug_symbol.ko
 qrng_dlkm.ko