From af105937a28ab4d301e59840da0cff3c9a1b4e49 Mon Sep 17 00:00:00 2001
From: Anton Bambura <jenneron@protonmail.com>
Date: Wed, 17 May 2023 02:13:37 +0300
Subject: [PATCH] mt8183 devices: remove audio module load configs (MR 4090)

Sound drivers not probing is solved with a patch in 6.1.28-r0 version
of linux-postmarketos-mediatek-mt8183 package.

[ci:ignore-count]
---
 device/testing/device-google-burnet/APKBUILD  | 13 ++---
 .../modules-load.d/sound.conf                 |  1 -
 device/testing/device-google-cozmo/APKBUILD   | 13 ++---
 .../modules-load.d/sound.conf                 |  1 -
 device/testing/device-google-damu/APKBUILD    | 13 ++---
 .../modules-load.d/sound.conf                 |  1 -
 device/testing/device-google-fennel/APKBUILD  | 47 ++-----------------
 .../testing/device-google-fennel/deviceinfo   |  4 +-
 .../modules-load.d/sound.conf.sku1.sku6       |  1 -
 .../modules-load.d/sound.conf.sku7            |  1 -
 .../testing/device-google-fennel14/APKBUILD   | 37 ++-------------
 .../testing/device-google-fennel14/deviceinfo |  3 +-
 .../modules-load.d/sound.conf.sku0            |  1 -
 .../modules-load.d/sound.conf.sku2            |  1 -
 device/testing/device-google-juniper/APKBUILD | 13 ++---
 .../modules-load.d/sound.conf                 |  1 -
 device/testing/device-google-kakadu/APKBUILD  | 37 ++-------------
 .../testing/device-google-kakadu/deviceinfo   |  3 +-
 .../modules-load.d/sound.conf                 |  1 -
 .../modules-load.d/sound.conf.sku22           |  1 -
 device/testing/device-google-kappa/APKBUILD   | 13 ++---
 .../modules-load.d/sound.conf                 |  1 -
 device/testing/device-google-katsu/APKBUILD   | 13 ++---
 .../modules-load.d/sound.conf                 |  2 -
 device/testing/device-google-kenzo/APKBUILD   | 13 ++---
 .../modules-load.d/sound.conf                 |  1 -
 device/testing/device-google-kodama/APKBUILD  | 13 ++---
 .../modules-load.d/sound.conf                 |  1 -
 device/testing/device-google-krane/APKBUILD   | 13 ++---
 .../modules-load.d/sound.conf                 |  1 -
 device/testing/device-google-makomo/APKBUILD  | 13 ++---
 .../modules-load.d/sound.conf                 |  2 -
 device/testing/device-google-willow/APKBUILD  | 37 ++-------------
 .../testing/device-google-willow/deviceinfo   |  3 +-
 .../modules-load.d/sound.conf.sku0            |  1 -
 .../modules-load.d/sound.conf.sku1            |  1 -
 36 files changed, 54 insertions(+), 267 deletions(-)
 delete mode 100644 device/testing/device-google-burnet/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-cozmo/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-damu/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-fennel/modules-load.d/sound.conf.sku1.sku6
 delete mode 100644 device/testing/device-google-fennel/modules-load.d/sound.conf.sku7
 delete mode 100644 device/testing/device-google-fennel14/modules-load.d/sound.conf.sku0
 delete mode 100644 device/testing/device-google-fennel14/modules-load.d/sound.conf.sku2
 delete mode 100644 device/testing/device-google-juniper/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-kakadu/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-kakadu/modules-load.d/sound.conf.sku22
 delete mode 100644 device/testing/device-google-kappa/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-katsu/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-kenzo/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-kodama/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-krane/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-makomo/modules-load.d/sound.conf
 delete mode 100644 device/testing/device-google-willow/modules-load.d/sound.conf.sku0
 delete mode 100644 device/testing/device-google-willow/modules-load.d/sound.conf.sku1

diff --git a/device/testing/device-google-burnet/APKBUILD b/device/testing/device-google-burnet/APKBUILD
index f7bb3d60d..dbba28c8d 100644
--- a/device/testing/device-google-burnet/APKBUILD
+++ b/device/testing/device-google-burnet/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-burnet
 pkgdesc="HP Chromebook x360 11MK G3 EE"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,16 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -29,9 +26,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
 }
 
 nonfree_firmware() {
@@ -42,5 +36,4 @@ nonfree_firmware() {
 
 sha512sums="
 7a39024e1f4b697b2bde13794cdc51e269b9883322e17a608349489ffed0a10db9e785ec3d3291abe0860c7e6bed31e7cb9508f4532f9d05866077a9e012992c  deviceinfo
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "
diff --git a/device/testing/device-google-burnet/modules-load.d/sound.conf b/device/testing/device-google-burnet/modules-load.d/sound.conf
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-burnet/modules-load.d/sound.conf
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-cozmo/APKBUILD b/device/testing/device-google-cozmo/APKBUILD
index 0aecf2e03..993b3e2cf 100644
--- a/device/testing/device-google-cozmo/APKBUILD
+++ b/device/testing/device-google-cozmo/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-cozmo
 pkgdesc="Acer Chromebook 314 (CB314-2H / CB314-2HT)"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,16 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -29,9 +26,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
 }
 
 nonfree_firmware() {
@@ -42,5 +36,4 @@ nonfree_firmware() {
 
 sha512sums="
 41a90f9abe98eb1442f6d1e68acfda7d50f5d025df9de2bf8b2658fdd5e79de4804bc9e4c3c890d81ec6bc0c2715f0e73155a0288dd5635476a6915b9dcccd75  deviceinfo
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "
diff --git a/device/testing/device-google-cozmo/modules-load.d/sound.conf b/device/testing/device-google-cozmo/modules-load.d/sound.conf
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-cozmo/modules-load.d/sound.conf
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-damu/APKBUILD b/device/testing/device-google-damu/APKBUILD
index 01f8b0b3b..da60e2719 100644
--- a/device/testing/device-google-damu/APKBUILD
+++ b/device/testing/device-google-damu/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-damu
 pkgdesc="ASUS Chromebook Flip CM3 (CM3200, MT8183)"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,16 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -29,9 +26,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
 }
 
 nonfree_firmware() {
@@ -42,5 +36,4 @@ nonfree_firmware() {
 
 sha512sums="
 06fb84b1c7c144fe3511dda65530441d42073b62a95e36c50e53eb1d1dafcee58974cd74287c407c0839f9ecc6065f5cc3fd6bf518d8faf98698b63def540959  deviceinfo
-37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2  sound.conf
 "
diff --git a/device/testing/device-google-damu/modules-load.d/sound.conf b/device/testing/device-google-damu/modules-load.d/sound.conf
deleted file mode 100644
index 6fdf5a188..000000000
--- a/device/testing/device-google-damu/modules-load.d/sound.conf
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-da7219-max98357
diff --git a/device/testing/device-google-fennel/APKBUILD b/device/testing/device-google-fennel/APKBUILD
index e640f973d..50d0a9b5b 100644
--- a/device/testing/device-google-fennel/APKBUILD
+++ b/device/testing/device-google-fennel/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-fennel
 pkgdesc="Lenovo IdeaPad Flex 3 Chromebook (MT8183)"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,22 +11,14 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf.sku1.sku6
-	modules-load.d/sound.conf.sku7
-"
-subpackages="
-	$pkgname-kernel-sku1:kernel_sku1
-	$pkgname-kernel-sku6:kernel_sku6
-	$pkgname-kernel-sku7:kernel_sku7
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
+source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -42,35 +34,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-kernel_sku1() {
-	pkgdesc="Google Fennel Sku 1"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	install -Dm644 "$srcdir"/sound.conf.sku1.sku6 \
-		"$pkgdir"/etc/modules-load.d/sound.conf
-}
-
-kernel_sku6() {
-	pkgdesc="Google Fennel Sku 6"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	install -Dm644 "$srcdir"/sound.conf.sku1.sku6 \
-		"$pkgdir"/etc/modules-load.d/sound.conf
-}
-
-kernel_sku7() {
-	pkgdesc="Google Fennel Sku 7"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	install -Dm644 "$srcdir"/sound.conf.sku7 \
-		"$pkgdir"/etc/modules-load.d/sound.conf
-}
-
 sha512sums="
-4baf53df10fd495caa6bbc89018518377217f06d0b05dc0a08428e569ce8cccf7f01d7b236885355d4ed7c38079824435a0d02af220ad642c0370c5aa987e47c  deviceinfo
-37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2  sound.conf.sku1.sku6
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf.sku7
+c95bc929775ca2969cfc64d24a5b8adc0259279e3578420cc68f5f92b372c4e1bb22ddf17715ffb9a4ccf0dee28612e2de000a2e8ebd015e16828f7b611899f3  deviceinfo
 "
diff --git a/device/testing/device-google-fennel/deviceinfo b/device/testing/device-google-fennel/deviceinfo
index f3df8175c..2c32152ab 100644
--- a/device/testing/device-google-fennel/deviceinfo
+++ b/device/testing/device-google-fennel/deviceinfo
@@ -7,9 +7,7 @@ deviceinfo_name="Lenovo IdeaPad Flex 3 Chromebook (MT8183)"
 deviceinfo_manufacturer="Lenovo"
 deviceinfo_codename="google-fennel"
 deviceinfo_year="2020"
-deviceinfo_dtb_sku1="mediatek/mt8183-kukui-jacuzzi-fennel-sku1"
-deviceinfo_dtb_sku6="mediatek/mt8183-kukui-jacuzzi-fennel-sku6"
-deviceinfo_dtb_sku7="mediatek/mt8183-kukui-jacuzzi-fennel-sku7"
+deviceinfo_dtb="mediatek/mt8183-kukui-jacuzzi-fennel-sku1 mediatek/mt8183-kukui-jacuzzi-fennel-sku6 mediatek/mt8183-kukui-jacuzzi-fennel-sku7"
 deviceinfo_modules_initfs="gpu-sched elan-i2c-core i2c-hid-of hid-multitouch cros-ec-keyb sbs-battery"
 deviceinfo_arch="aarch64"
 
diff --git a/device/testing/device-google-fennel/modules-load.d/sound.conf.sku1.sku6 b/device/testing/device-google-fennel/modules-load.d/sound.conf.sku1.sku6
deleted file mode 100644
index 6fdf5a188..000000000
--- a/device/testing/device-google-fennel/modules-load.d/sound.conf.sku1.sku6
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-da7219-max98357
diff --git a/device/testing/device-google-fennel/modules-load.d/sound.conf.sku7 b/device/testing/device-google-fennel/modules-load.d/sound.conf.sku7
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-fennel/modules-load.d/sound.conf.sku7
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-fennel14/APKBUILD b/device/testing/device-google-fennel14/APKBUILD
index e3ce2bcdf..faac74e9b 100644
--- a/device/testing/device-google-fennel14/APKBUILD
+++ b/device/testing/device-google-fennel14/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-fennel14
 pkgdesc="Lenovo IdeaPad 3 Chromebook (MT8183)"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,21 +11,14 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf.sku0
-	modules-load.d/sound.conf.sku2
-"
-subpackages="
-	$pkgname-kernel-sku0:kernel_sku0
-	$pkgname-kernel-sku2:kernel_sku2
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
+source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -41,26 +34,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-kernel_sku0() {
-	pkgdesc="Google Fennel14 Sku 0"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	install -Dm644 "$srcdir"/sound.conf.sku0 \
-		"$pkgdir"/etc/modules-load.d/sound.conf
-}
-
-kernel_sku2() {
-	pkgdesc="Google Fennel14 Sku 2"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	install -Dm644 "$srcdir"/sound.conf.sku2 \
-		"$pkgdir"/etc/modules-load.d/sound.conf
-}
-
 sha512sums="
-e88e0e58e3d3529c3dbb3ef28345aead4d3250400f80b0f664b43c4185996ee46aebc02218555ba9ca1d493432b572366f0eb6957f6176b1821f6faa767696d9  deviceinfo
-37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2  sound.conf.sku0
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf.sku2
+95cb84756794a84e3a5f6806b57054b0210685397c8f6a8be2b71e234d1d847a5734ac3c4b81478ccd2fab9a7ee1f331409cdd3c811ff5755da734e70ffb6041  deviceinfo
 "
diff --git a/device/testing/device-google-fennel14/deviceinfo b/device/testing/device-google-fennel14/deviceinfo
index a738fbcbb..5f7285497 100644
--- a/device/testing/device-google-fennel14/deviceinfo
+++ b/device/testing/device-google-fennel14/deviceinfo
@@ -7,8 +7,7 @@ deviceinfo_name="Lenovo IdeaPad 3 Chromebook (MT8183)"
 deviceinfo_manufacturer="Lenovo"
 deviceinfo_codename="google-fennel14"
 deviceinfo_year="2020"
-deviceinfo_dtb_sku0="mediatek/mt8183-kukui-jacuzzi-fennel14"
-deviceinfo_dtb_sku2="mediatek/mt8183-kukui-jacuzzi-fennel14-sku2"
+deviceinfo_dtb="mediatek/mt8183-kukui-jacuzzi-fennel14 mediatek/mt8183-kukui-jacuzzi-fennel14-sku2"
 deviceinfo_modules_initfs="gpu-sched elan-i2c-core cros-ec-keyb sbs-battery"
 deviceinfo_arch="aarch64"
 
diff --git a/device/testing/device-google-fennel14/modules-load.d/sound.conf.sku0 b/device/testing/device-google-fennel14/modules-load.d/sound.conf.sku0
deleted file mode 100644
index 6fdf5a188..000000000
--- a/device/testing/device-google-fennel14/modules-load.d/sound.conf.sku0
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-da7219-max98357
diff --git a/device/testing/device-google-fennel14/modules-load.d/sound.conf.sku2 b/device/testing/device-google-fennel14/modules-load.d/sound.conf.sku2
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-fennel14/modules-load.d/sound.conf.sku2
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-juniper/APKBUILD b/device/testing/device-google-juniper/APKBUILD
index b74dc1b85..a9d92f8bc 100644
--- a/device/testing/device-google-juniper/APKBUILD
+++ b/device/testing/device-google-juniper/APKBUILD
@@ -3,7 +3,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-juniper
 pkgdesc="Acer Chromebook Spin 311"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -12,16 +12,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -30,9 +27,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
 }
 
 nonfree_firmware() {
@@ -43,5 +37,4 @@ nonfree_firmware() {
 
 sha512sums="
 c8909d33923fe7c3248aed6f7d4bfa3aae29fd269a9155f5379803213a6d4d8f3f4a3427a6ea5336ba4907bcbed80b8a85819eaca525b7bca6262a1a8cbb78aa  deviceinfo
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "
diff --git a/device/testing/device-google-juniper/modules-load.d/sound.conf b/device/testing/device-google-juniper/modules-load.d/sound.conf
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-juniper/modules-load.d/sound.conf
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-kakadu/APKBUILD b/device/testing/device-google-kakadu/APKBUILD
index cbfcc4142..9e360ab9a 100644
--- a/device/testing/device-google-kakadu/APKBUILD
+++ b/device/testing/device-google-kakadu/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kakadu
 pkgdesc="ASUS Chromebook Detachable CM3 (CM3000)"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,21 +11,14 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-	modules-load.d/sound.conf.sku22
-"
-subpackages="
-	$pkgname-kernel-kakadu:kernel_kakadu
-	$pkgname-kernel-kakadu-sku22:kernel_kakadu_sku22
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
+source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -41,26 +34,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-kernel_kakadu() {
-	pkgdesc="Google Kakadu"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
-}
-
-kernel_kakadu_sku22() {
-	pkgdesc="Google Kakadu Sku 22"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	install -Dm644 "$srcdir"/sound.conf.sku22 \
-		"$pkgdir"/etc/modules-load.d/sound.conf
-}
-
 sha512sums="
-973065514b393e318b782e920ce6469ce9e28afe30db205a8108adbd32fb5c5386a641da3c7568edc55c06bfc3e1fe95f5a60c07f6b53a97234de78d646d19cf  deviceinfo
-37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2  sound.conf
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf.sku22
+610a6c7203fff83395fd02ad1e07b173e856f63b86835702d88d2bd39bf46a3fed46df472bf58466c94f02292b241f10c5385c7d27a3d0d83e1fdd7ebc73ddeb  deviceinfo
 "
diff --git a/device/testing/device-google-kakadu/deviceinfo b/device/testing/device-google-kakadu/deviceinfo
index 682ce59fd..5b1daff93 100644
--- a/device/testing/device-google-kakadu/deviceinfo
+++ b/device/testing/device-google-kakadu/deviceinfo
@@ -7,8 +7,7 @@ deviceinfo_name="ASUS Chromebook Detachable CM3 (CM3000)"
 deviceinfo_manufacturer="ASUS"
 deviceinfo_codename="google-kakadu"
 deviceinfo_year="2020"
-deviceinfo_dtb_kakadu="mediatek/mt8183-kukui-kakadu"
-deviceinfo_dtb_kakadu_sku22="mediatek/mt8183-kukui-kakadu-sku22"
+deviceinfo_dtb="mediatek/mt8183-kukui-kakadu mediatek/mt8183-kukui-kakadu-sku22"
 deviceinfo_modules_initfs="gpu-sched i2c-hid-of hid-multitouch cros-ec-keyb sbs-battery"
 deviceinfo_arch="aarch64"
 
diff --git a/device/testing/device-google-kakadu/modules-load.d/sound.conf b/device/testing/device-google-kakadu/modules-load.d/sound.conf
deleted file mode 100644
index 6fdf5a188..000000000
--- a/device/testing/device-google-kakadu/modules-load.d/sound.conf
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-da7219-max98357
diff --git a/device/testing/device-google-kakadu/modules-load.d/sound.conf.sku22 b/device/testing/device-google-kakadu/modules-load.d/sound.conf.sku22
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-kakadu/modules-load.d/sound.conf.sku22
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-kappa/APKBUILD b/device/testing/device-google-kappa/APKBUILD
index e16620511..878970bc4 100644
--- a/device/testing/device-google-kappa/APKBUILD
+++ b/device/testing/device-google-kappa/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kappa
 pkgdesc="HP Chromebook 11a"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,16 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -29,9 +26,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
 }
 
 nonfree_firmware() {
@@ -42,5 +36,4 @@ nonfree_firmware() {
 
 sha512sums="
 caf3c6f16a4fb085c6261842b91eb27b20afb01bbb2999de0daf56d973a323d07fe0713cecf152a6616e60232174ccd7d9f27ae988ff5e6398faa7396e00b2b2  deviceinfo
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "
diff --git a/device/testing/device-google-kappa/modules-load.d/sound.conf b/device/testing/device-google-kappa/modules-load.d/sound.conf
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-kappa/modules-load.d/sound.conf
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-katsu/APKBUILD b/device/testing/device-google-katsu/APKBUILD
index b850e6630..e5b6f1a1d 100644
--- a/device/testing/device-google-katsu/APKBUILD
+++ b/device/testing/device-google-katsu/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-katsu
 pkgdesc="ASUS Chromebook Detachable CZ1"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,16 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -29,9 +26,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
 }
 
 nonfree_firmware() {
@@ -42,5 +36,4 @@ nonfree_firmware() {
 
 sha512sums="
 0371627464f99c4bd90464683cbcccc4768ce3b95042c5c13d724f8743ca6e3475938de192a0148fde8158fa10858494d6d8e96f575503ed45780916aad27efd  deviceinfo
-2abf68f27d19a6d30d7070f4b9b506b585668e85423f4127bbdf72247dc6da2204bbf064310dd2dc0fa43b44e02758a21f5fbd21870187d45149a56d534c8cfe  sound.conf
 "
diff --git a/device/testing/device-google-katsu/modules-load.d/sound.conf b/device/testing/device-google-katsu/modules-load.d/sound.conf
deleted file mode 100644
index da87cca71..000000000
--- a/device/testing/device-google-katsu/modules-load.d/sound.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-mt8183-da7219-max98357
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-kenzo/APKBUILD b/device/testing/device-google-kenzo/APKBUILD
index 1a79f8bd9..2af273580 100644
--- a/device/testing/device-google-kenzo/APKBUILD
+++ b/device/testing/device-google-kenzo/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kenzo
 pkgdesc="Acer Chromebook 311 (CB311-11H / CB311-11HT)"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,16 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -29,9 +26,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
 }
 
 nonfree_firmware() {
@@ -42,5 +36,4 @@ nonfree_firmware() {
 
 sha512sums="
 9254f78c303b25480f619b9530b4ea7f3a8107049c25fad4a560c05cbe886af499eb0f695045265c653ff5bdc57d681b7291283716dd806c3386e3550987231b  deviceinfo
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "
diff --git a/device/testing/device-google-kenzo/modules-load.d/sound.conf b/device/testing/device-google-kenzo/modules-load.d/sound.conf
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-kenzo/modules-load.d/sound.conf
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-kodama/APKBUILD b/device/testing/device-google-kodama/APKBUILD
index bbd2309d7..878f8fcec 100644
--- a/device/testing/device-google-kodama/APKBUILD
+++ b/device/testing/device-google-kodama/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kodama
 pkgdesc="Lenovo 10e Chromebook Tablet"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,16 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -29,9 +26,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
 }
 
 nonfree_firmware() {
@@ -42,5 +36,4 @@ nonfree_firmware() {
 
 sha512sums="
 78a2288faf43dc60c6c236bb91ef479cff42d7441dadccc67bc35a83dded4c21f082e49851ad7d68dc8b2c8a3002d4a0e1acfb39a506da5ee702e48c6c3141cd  deviceinfo
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "
diff --git a/device/testing/device-google-kodama/modules-load.d/sound.conf b/device/testing/device-google-kodama/modules-load.d/sound.conf
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-kodama/modules-load.d/sound.conf
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-krane/APKBUILD b/device/testing/device-google-krane/APKBUILD
index 99046b3aa..ba894552f 100644
--- a/device/testing/device-google-krane/APKBUILD
+++ b/device/testing/device-google-krane/APKBUILD
@@ -3,7 +3,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-krane
 pkgdesc="Lenovo IdeaPad Duet Chromebook"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -12,16 +12,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -30,9 +27,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
 }
 
 nonfree_firmware() {
@@ -43,5 +37,4 @@ nonfree_firmware() {
 
 sha512sums="
 3cee30adc42daa052e0cca078c5cdad5b936fb639d240b747382b7c0e4c2a184578cbdf097c24cb792f500e414ee92dc614c7f7fc30ae28aeb8d625639d03542  deviceinfo
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "
diff --git a/device/testing/device-google-krane/modules-load.d/sound.conf b/device/testing/device-google-krane/modules-load.d/sound.conf
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-krane/modules-load.d/sound.conf
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-makomo/APKBUILD b/device/testing/device-google-makomo/APKBUILD
index 1487922e8..7831af9df 100644
--- a/device/testing/device-google-makomo/APKBUILD
+++ b/device/testing/device-google-makomo/APKBUILD
@@ -2,7 +2,7 @@
 # aintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-makomo
 pkgdesc="Lenovo 100e Chromebook 2nd Gen MTK 2"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,16 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf
-"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -29,9 +26,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/sound.conf \
-		"$pkgdir"/etc/modules-load.d/sound.conf
 }
 
 nonfree_firmware() {
@@ -42,5 +36,4 @@ nonfree_firmware() {
 
 sha512sums="
 3ed0183b0a6f6c840af39a99945061bcc3c97d51610db94ae1cde22d3e11cd2ca90e296726ed6b9bafd118ebb5392e61be0f14943cea58fc398d818cf2803180  deviceinfo
-2abf68f27d19a6d30d7070f4b9b506b585668e85423f4127bbdf72247dc6da2204bbf064310dd2dc0fa43b44e02758a21f5fbd21870187d45149a56d534c8cfe  sound.conf
 "
diff --git a/device/testing/device-google-makomo/modules-load.d/sound.conf b/device/testing/device-google-makomo/modules-load.d/sound.conf
deleted file mode 100644
index da87cca71..000000000
--- a/device/testing/device-google-makomo/modules-load.d/sound.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-mt8183-da7219-max98357
-mt8183-mt6358-ts3a227-max98357
diff --git a/device/testing/device-google-willow/APKBUILD b/device/testing/device-google-willow/APKBUILD
index 16d771d7a..f25866397 100644
--- a/device/testing/device-google-willow/APKBUILD
+++ b/device/testing/device-google-willow/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-willow
 pkgdesc="Acer Chromebook 311 (C722/C722T)"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,21 +11,14 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-load.d/sound.conf.sku0
-	modules-load.d/sound.conf.sku1
-"
-subpackages="
-	$pkgname-kernel-sku0:kernel_sku0
-	$pkgname-kernel-sku1:kernel_sku1
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
+source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -41,26 +34,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-kernel_sku0() {
-	pkgdesc="Google Willow Sku 0"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	install -Dm644 "$srcdir"/sound.conf.sku0 \
-		"$pkgdir"/etc/modules-load.d/sound.conf
-}
-
-kernel_sku1() {
-	pkgdesc="Google Willow Sku 1"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	install -Dm644 "$srcdir"/sound.conf.sku1 \
-		"$pkgdir"/etc/modules-load.d/sound.conf
-}
-
 sha512sums="
-a19ddaeb4922df889b851d248a4ac1b3ce7d473b4d67317c8cf20d7a2b655bc17e3c03e2629eaa5c163d7421bce68dc6843a0985d2c9bbd7916eb1806adf436d  deviceinfo
-37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2  sound.conf.sku0
-bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf.sku1
+7568faf67817872c9555a1e97082acc72fefff712c51b4fa1a0ca0e52f6dd1f95dab62cd5a8e14aa61787ac1dd18c33d4b93c5763f1bd4c4e7d71c4129d00936  deviceinfo
 "
diff --git a/device/testing/device-google-willow/deviceinfo b/device/testing/device-google-willow/deviceinfo
index aebeb2af7..6fe33d086 100644
--- a/device/testing/device-google-willow/deviceinfo
+++ b/device/testing/device-google-willow/deviceinfo
@@ -7,8 +7,7 @@ deviceinfo_name="Acer Chromebook 311 (C722/C722T)"
 deviceinfo_manufacturer="Acer"
 deviceinfo_codename="google-willow"
 deviceinfo_year="2020"
-deviceinfo_dtb_sku0="mediatek/mt8183-kukui-jacuzzi-willow-sku0"
-deviceinfo_dtb_sku1="mediatek/mt8183-kukui-jacuzzi-willow-sku1"
+deviceinfo_dtb="mediatek/mt8183-kukui-jacuzzi-willow-sku0 mediatek/mt8183-kukui-jacuzzi-willow-sku1"
 deviceinfo_modules_initfs="gpu-sched i2-hid-of hid-generic cros-ec-keyb sbs-battery"
 deviceinfo_arch="aarch64"
 
diff --git a/device/testing/device-google-willow/modules-load.d/sound.conf.sku0 b/device/testing/device-google-willow/modules-load.d/sound.conf.sku0
deleted file mode 100644
index 6fdf5a188..000000000
--- a/device/testing/device-google-willow/modules-load.d/sound.conf.sku0
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-da7219-max98357
diff --git a/device/testing/device-google-willow/modules-load.d/sound.conf.sku1 b/device/testing/device-google-willow/modules-load.d/sound.conf.sku1
deleted file mode 100644
index 918153616..000000000
--- a/device/testing/device-google-willow/modules-load.d/sound.conf.sku1
+++ /dev/null
@@ -1 +0,0 @@
-mt8183-mt6358-ts3a227-max98357