From ca78a9a01e857eb3a1cd74ac3a9acc1c4d95d118 Mon Sep 17 00:00:00 2001
From: Zheng Pan <zhengpan@google.com>
Date: Mon, 6 Mar 2023 17:15:25 -0800
Subject: [PATCH] Akita: Move init.insmod.cfg from vendor to vendor_dlkm

To decouple init.insmod.${device}.cfg from HLOS,
it is moved to kernel repo and built in vendor_dlkm.img.
Also make init.rc to load it from vendor_dlkm/

Bug: 270603150
Test: Build image and check vendor_dlkm.img
Change-Id: I466117c1701f017f4486aa0a10c42bec887c350b
---
 conf/init.akita.rc    |  2 +-
 device-akita.mk       |  4 ----
 init.insmod.akita.cfg | 19 -------------------
 3 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 init.insmod.akita.cfg

diff --git a/conf/init.akita.rc b/conf/init.akita.rc
index 919eb63..30f94a5 100644
--- a/conf/init.akita.rc
+++ b/conf/init.akita.rc
@@ -14,7 +14,7 @@ on early-boot
     wait_for_prop vendor.common.modules.ready 1
     start insmod_sh_akita
 
-service insmod_sh_akita /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
+service insmod_sh_akita /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg
     class main
     user root
     group root system
diff --git a/device-akita.mk b/device-akita.mk
index 8e71f32..0814e55 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -43,10 +43,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
         device/google/akita/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.akita.rc
 
-# insmod files
-PRODUCT_COPY_FILES += \
-	device/google/akita/init.insmod.akita.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.akita.cfg
-
 # Camera
 PRODUCT_COPY_FILES += \
 	device/google/akita/media_profiles_akita.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
diff --git a/init.insmod.akita.cfg b/init.insmod.akita.cfg
deleted file mode 100644
index dad354e..0000000
--- a/init.insmod.akita.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-##########################################################
-#           init.insmod.akita.cfg                        #
-# This file contains akita specific kernel modules       #
-# to load at init time by init.insmod.sh script          #
-##########################################################
-
-# Load device specific kernel modules
-# Modules here will be loaded *after* all common modules
-modprobe|bcmdhd4383.ko
-modprobe|snd-soc-cs35l41-i2c.ko
-modprobe|goodix_brl_touch.ko
-modprobe|cl_dsp.ko
-modprobe|input-cs40l26-i2c.ko
-modprobe|snd-soc-cs40l26.ko
-
-# All device specific modules loaded
-setprop|vendor.device.modules.ready
-setprop|vendor.all.modules.ready
-setprop|vendor.all.devices.ready