diff --git a/device/testing/device-huawei-kiwi/APKBUILD b/device/testing/device-huawei-kiwi/APKBUILD
index 0aa11f211..38c810b19 100644
--- a/device/testing/device-huawei-kiwi/APKBUILD
+++ b/device/testing/device-huawei-kiwi/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-huawei-kiwi
 pkgdesc="Huawei Honor 5X"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,7 @@ subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 nonfree_firmware() {
 	pkgdesc="Modem/GPU/WiFi/BT/Video firmware"
-	depends="linux-firmware-qcom firmware-huawei-kiwi wcnss-wlan"
+	depends="linux-firmware-qcom firmware-huawei-kiwi wcnss-wlan firmware-adreno"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/linux-huawei-kiwi/APKBUILD b/device/testing/linux-huawei-kiwi/APKBUILD
index ef5a5f0eb..4a8ba6ce4 100644
--- a/device/testing/linux-huawei-kiwi/APKBUILD
+++ b/device/testing/linux-huawei-kiwi/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linux-huawei-kiwi
 pkgver=5.9_rc7
-pkgrel=0
+pkgrel=1
 pkgdesc="Huawei Honor 5X kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -14,7 +14,7 @@ options="!strip !check !tracedeps pmb:cross-native"
 makedepends="bash bc bison devicepkg-dev installkernel flex openssl-dev perl"
 
 _repository="msm8939-mainline-linux"
-_commit="cf997bbb83ffb33f40d3707419e0141bb668dbbc"
+_commit="36b820fdeba148f05eb1eaf9cbea94050ce6cbe9"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz
@@ -46,5 +46,5 @@ package() {
 		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
 }
 
-sha512sums="d0126c017b5253039800c6e743e7e8c178e6745c76f15078fee025dcd9584cfd888c1cc2acac5d8718f2635e0db30c4e2867124a818eb77b64da5cc4d866d0ba  linux-huawei-kiwi-cf997bbb83ffb33f40d3707419e0141bb668dbbc.tar.gz
-89fb4b215a3e6144b6c3ccd57af694f561c91bfa3c4c93093cb15fc57717b81720d68f9c0298c66eb9efe2173b71a5c7ccbbb812387bc2af63f010fec2918a52  config-huawei-kiwi.aarch64"
+sha512sums="3802f0bc6fab81a6fff0e48800fd2c7ce96ab8ab1b068eb54f2a402e3a4edb77a97d21af39392588a42a48abace19eed5bc3bbaa83598df5eba4df3b43010011  linux-huawei-kiwi-36b820fdeba148f05eb1eaf9cbea94050ce6cbe9.tar.gz
+a0fc476a7af2926a870285d3a68bea361284cd062c7f8bdb15fc2292f949c3ce8c30760056229cbbc294ecd28b25c295420baf850aefde5941477d5a98ec0e34  config-huawei-kiwi.aarch64"
diff --git a/device/testing/linux-huawei-kiwi/config-huawei-kiwi.aarch64 b/device/testing/linux-huawei-kiwi/config-huawei-kiwi.aarch64
index 1cdc9c35c..b2a692d36 100644
--- a/device/testing/linux-huawei-kiwi/config-huawei-kiwi.aarch64
+++ b/device/testing/linux-huawei-kiwi/config-huawei-kiwi.aarch64
@@ -1722,6 +1722,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+CONFIG_TOUCHSCREEN_CYTTSP5=m
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
@@ -2797,7 +2798,7 @@ CONFIG_DRM_PANEL_SIMPLE=m
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
-CONFIG_DRM_PANEL_HUAWEI_NT35532=m
+CONFIG_DRM_PANEL_CMI_NT35532=m
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -5262,7 +5263,7 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 CONFIG_CRC32_SLICEBY8=y