Meson-s4t7: update required modules to match fenix

packages/bsp/meson-s4t7/khadas-vim1s/etc/initramfs-tools/modules

@@ -12,12 +12,12 @@
 
 amlogic-gkitool
 amlogic-debug-iotrace
-amlogic-uart
 amlogic-hwspinlock
-page_trace
 amlogic-debug
-amlogic-memory-debug
 amlogic-secmon
+amlogic-cpuinfo
+user_fault
+amlogic-memory-debug
 amlogic-clk
 amlogic-clk-soc-s4
 amlogic-aoclk-g12a
@@ -26,9 +26,9 @@ amlogic-pinctrl-soc-s4
 amlogic-mailbox
 amlogic-pwm
 pwm-regulator
+gpio-regulator
 amlogic-reset
 amlogic-power
-amlogic-cpuinfo
 amlogic-cpufreq
 amlogic-efuse-unifykey
 cqhci
@@ -43,12 +43,12 @@ aml_smmu
 videobuf-core
 dvb-core
 amlogic-pm
+amlogic-adc
 amlogic-input
 amlogic-watchdog
 amlogic-dvb
 aml_media
 amlogic-camera
-amlogic-adc
 amlogic-thermal
 amlogic-usb
 amlogic-irblaster

packages/bsp/meson-s4t7/khadas-vim1s/etc/modprobe.d/initramfs-modules-load-order.conf

@@ -1,12 +1,12 @@
 # Initramfs modules load order
 softdep amlogic-debug-iotrace pre: amlogic-gkitool
-softdep amlogic-uart pre: amlogic-debug-iotrace
+softdep amlogic-hwspinlock pre: amlogic-debug-iotrace
-softdep amlogic-hwspinlock pre: amlogic-uart
+softdep amlogic-debug pre: amlogic-hwspinlock
-softdep page_trace pre: amlogic-hwspinlock
+softdep amlogic-secmon pre: amlogic-debug
-softdep amlogic-debug pre: page_trace
+softdep amlogic-cpuinfo pre: amlogic-secmon
-softdep amlogic-memory-debug pre: amlogic-debug
+softdep user_fault pre: amlogic-cpuinfo
-softdep amlogic-secmon pre: amlogic-memory-debug
+softdep amlogic-memory-debug pre: user_fault
-softdep amlogic-clk pre: amlogic-secmon
+softdep amlogic-clk pre: amlogic-memory-debug
 softdep amlogic-clk-soc-s4 pre: amlogic-clk
 softdep amlogic-aoclk-g12a pre: amlogic-clk-soc-s4
 softdep amlogic-gpio pre: amlogic-aoclk-g12a
@@ -14,10 +14,10 @@ softdep amlogic-pinctrl-soc-s4 pre: amlogic-gpio
 softdep amlogic-mailbox pre: amlogic-pinctrl-soc-s4
 softdep amlogic-pwm pre: amlogic-mailbox
 softdep pwm-regulator pre: amlogic-pwm
-softdep amlogic-reset pre: pwm-regulator
+softdep gpio-regulator pre: pwm-regulator
+softdep amlogic-reset pre: gpio-regulator
 softdep amlogic-power pre: amlogic-reset
-softdep amlogic-cpuinfo pre: amlogic-power
+softdep amlogic-cpufreq pre: amlogic-power
-softdep amlogic-cpufreq pre: amlogic-cpuinfo
 softdep amlogic-efuse-unifykey pre: amlogic-cpufreq
 softdep cqhci pre: amlogic-efuse-unifykey
 softdep amlogic-mmc pre: cqhci
@@ -31,13 +31,13 @@ softdep aml_smmu pre: optee
 softdep videobuf-core pre: aml_smmu
 softdep dvb-core pre: videobuf-core
 softdep amlogic-pm pre: dvb-core
-softdep amlogic-input pre: amlogic-pm
+softdep amlogic-adc pre: amlogic-pm
+softdep amlogic-input pre: amlogic-adc
 softdep amlogic-watchdog pre: amlogic-input
 softdep amlogic-dvb pre: amlogic-watchdog
 softdep aml_media pre: amlogic-dvb
 softdep amlogic-camera pre: aml_media
-softdep amlogic-adc pre: amlogic-camera
+softdep amlogic-thermal pre: amlogic-camera
-softdep amlogic-thermal pre: amlogic-adc
 softdep amlogic-usb pre: amlogic-thermal
 softdep amlogic-irblaster pre: amlogic-usb
 softdep amlogic-phy-debug pre: amlogic-irblaster

packages/bsp/meson-s4t7/khadas-vim1s/etc/modules

@@ -1,11 +1,10 @@
 amlogic-crypto-dma
-amlogic-usb
 amlogic-wireless
 amlogic_pcie_v2_host
+amlogic-pcie-v3_host
 sha1-ce
 zsmalloc
 ntfs3
-gpio-regulator
 system_heap
 mdio-mux
 pcs_xpcs
@@ -16,33 +15,37 @@ amlogic-mdio-g12a
 dwmac-meson8b
 dwmac-dwc-qos-eth
 i2c-dev
+v4l2-async
+v4l2-fwnode
+videobuf-vmalloc
+btqca
+btbcm
+hci_uart
+leds-gpio
 amlogic-audio-utils
 amlogic-dvb-demux
 amlogic-dvb-ci
 dwc_otg
 amlogic-rtc
-aml_fixed_area_cma
+bl40_module
-tee
-optee
 amlogic-socinfo
-amlogic-hifidsp
+amlogic-host
 amlogic-led
 amlogic-jtag
-amlogic-hwspinlock
+amlogic-seckey
-amlogic-algorithm
+amlogic-usb-cam
 amlogic-snd-codec-dummy
 amlogic-snd-soc
 amlogic-snd-codec-t9015
 amlogic-snd-codec-tl1
+amlogic-snd-codec-ad82584f
 amlogic-snd-codec-tas5707
 amlogic-snd-codec-tas5805
+amlogic-snd-codec-pa1
 amlogic-snd-codec-ad82128
-amlogic-spi
+amlogic-snd-codec-sy6026l
-amlogic-input
 cfg80211
 mac80211
-v4l2-fwnode
-v4l2-async
 
 # Media modules
 media_clock
@@ -86,4 +89,5 @@ xt_addrtype
 veth
 
 dhd
-zram
+
+snd-seq

packages/bsp/meson-s4t7/khadas-vim4/etc/initramfs-tools/modules

@@ -12,12 +12,12 @@
 
 amlogic-gkitool
 amlogic-debug-iotrace
-amlogic-uart
 amlogic-hwspinlock
-page_trace
 amlogic-debug
-amlogic-memory-debug
 amlogic-secmon
+amlogic-cpuinfo
+user_fault
+amlogic-memory-debug
 amlogic-clk
 amlogic-clk-soc-t7
 amlogic-aoclk-g12a
@@ -26,9 +26,9 @@ amlogic-pinctrl-soc-t7
 amlogic-mailbox
 amlogic-pwm
 pwm-regulator
+gpio-regulator
 amlogic-reset
 amlogic-power
-amlogic-cpuinfo
 amlogic-cpufreq
 amlogic-efuse-unifykey
 cqhci
@@ -43,12 +43,12 @@ aml_smmu
 videobuf-core
 dvb-core
 amlogic-pm
+amlogic-adc
 amlogic-input
 amlogic-watchdog
 amlogic-dvb
 aml_media
 amlogic-camera
-amlogic-adc
 amlogic-thermal
 amlogic-usb
 amlogic-irblaster

packages/bsp/meson-s4t7/khadas-vim4/etc/modprobe.d/initramfs-modules-load-order.conf

@@ -1,12 +1,12 @@
 # Initramfs modules load order
 softdep amlogic-debug-iotrace pre: amlogic-gkitool
-softdep amlogic-uart pre: amlogic-debug-iotrace
+softdep amlogic-hwspinlock pre: amlogic-debug-iotrace
-softdep amlogic-hwspinlock pre: amlogic-uart
+softdep amlogic-debug pre: amlogic-hwspinlock
-softdep page_trace pre: amlogic-hwspinlock
+softdep amlogic-secmon pre: amlogic-debug
-softdep amlogic-debug pre: page_trace
+softdep amlogic-cpuinfo pre: amlogic-secmon
-softdep amlogic-memory-debug pre: amlogic-debug
+softdep user_fault pre: amlogic-cpuinfo
-softdep amlogic-secmon pre: amlogic-memory-debug
+softdep amlogic-memory-debug pre: user_fault
-softdep amlogic-clk pre: amlogic-secmon
+softdep amlogic-clk pre: amlogic-memory-debug
 softdep amlogic-clk-soc-t7 pre: amlogic-clk
 softdep amlogic-aoclk-g12a pre: amlogic-clk-soc-t7
 softdep amlogic-gpio pre: amlogic-aoclk-g12a
@@ -14,10 +14,10 @@ softdep amlogic-pinctrl-soc-t7 pre: amlogic-gpio
 softdep amlogic-mailbox pre: amlogic-pinctrl-soc-t7
 softdep amlogic-pwm pre: amlogic-mailbox
 softdep pwm-regulator pre: amlogic-pwm
-softdep amlogic-reset pre: pwm-regulator
+softdep gpio-regulator pre: pwm-regulator
+softdep amlogic-reset pre: gpio-regulator
 softdep amlogic-power pre: amlogic-reset
-softdep amlogic-cpuinfo pre: amlogic-power
+softdep amlogic-cpufreq pre: amlogic-power
-softdep amlogic-cpufreq pre: amlogic-cpuinfo
 softdep amlogic-efuse-unifykey pre: amlogic-cpufreq
 softdep cqhci pre: amlogic-efuse-unifykey
 softdep amlogic-mmc pre: cqhci
@@ -31,13 +31,13 @@ softdep aml_smmu pre: optee
 softdep videobuf-core pre: aml_smmu
 softdep dvb-core pre: videobuf-core
 softdep amlogic-pm pre: dvb-core
-softdep amlogic-input pre: amlogic-pm
+softdep amlogic-adc pre: amlogic-pm
+softdep amlogic-input pre: amlogic-adc
 softdep amlogic-watchdog pre: amlogic-input
 softdep amlogic-dvb pre: amlogic-watchdog
 softdep aml_media pre: amlogic-dvb
 softdep amlogic-camera pre: aml_media
-softdep amlogic-adc pre: amlogic-camera
+softdep amlogic-thermal pre: amlogic-camera
-softdep amlogic-thermal pre: amlogic-adc
 softdep amlogic-usb pre: amlogic-thermal
 softdep amlogic-irblaster pre: amlogic-usb
 softdep amlogic-phy-debug pre: amlogic-irblaster

packages/bsp/meson-s4t7/khadas-vim4/etc/modules

@@ -1,11 +1,10 @@
 amlogic-crypto-dma
-amlogic-usb
 amlogic-wireless
 amlogic_pcie_v2_host
+amlogic-pcie-v3_host
 sha1-ce
 zsmalloc
 ntfs3
-gpio-regulator
 system_heap
 mdio-mux
 pcs_xpcs
@@ -16,33 +15,34 @@ amlogic-mdio-g12a
 dwmac-meson8b
 dwmac-dwc-qos-eth
 i2c-dev
+v4l2-async
+v4l2-fwnode
+videobuf-vmalloc
+leds-gpio
 amlogic-audio-utils
 amlogic-dvb-demux
 amlogic-dvb-ci
 dwc_otg
 amlogic-rtc
-aml_fixed_area_cma
+bl40_module
-tee
-optee
 amlogic-socinfo
-amlogic-input
+amlogic-host
-amlogic-hifidsp
 amlogic-led
 amlogic-jtag
-amlogic-hwspinlock
+amlogic-seckey
-amlogic-algorithm
+amlogic-usb-cam
 amlogic-snd-codec-dummy
 amlogic-snd-soc
 amlogic-snd-codec-t9015
 amlogic-snd-codec-tl1
+amlogic-snd-codec-ad82584f
 amlogic-snd-codec-tas5707
 amlogic-snd-codec-tas5805
+amlogic-snd-codec-pa1
 amlogic-snd-codec-ad82128
-amlogic-spi
+amlogic-snd-codec-sy6026l
 cfg80211
 mac80211
-v4l2-fwnode
-v4l2-async
 
 # Media modules
 media_clock
@@ -75,8 +75,9 @@ amvdec_avs2_v4l
 amvdec_mavs_v4l
 amvdec_avs2_fb_v4l
 media_sync
-amlogic-jpegenc
+encoder_common
-amlogic-multienc
+jpegenc
+amvenc_multi
 
 nft_chain_nat
 nft_counter
@@ -88,4 +89,5 @@ xt_addrtype
 veth
 
 dhd
-zram
+
+snd-seq