diff --git a/config/boards/rock-5b-plus.conf b/config/boards/rock-5b-plus.conf
index 653d89c7aa7e..322424a482a4 100644
--- a/config/boards/rock-5b-plus.conf
+++ b/config/boards/rock-5b-plus.conf
@@ -14,8 +14,8 @@ BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 declare -g UEFI_EDK2_BOARD_ID="rock-5bplus" # This _only_ used for uefi-edk2-rk3588 extension
 
-function post_family_tweaks__rock5b_naming_audios() {
-	display_alert "$BOARD" "Renaming rock5b audios" "info"
+function post_family_tweaks__rock5bplus_udev_rules() {
+	display_alert "$BOARD" "Renaming rock5bplus audios" "info"
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
 	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
@@ -23,6 +23,8 @@ function post_family_tweaks__rock5b_naming_audios() {
 	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
 	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp1-sound", ENV{SOUND_DESCRIPTION}="DP1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
 	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	display_alert "$BOARD" "Goodix touch orientation rule" "info"
+	echo 'ACTION=="add|change", ENV{ID_INPUT_TOUCHSCREEN}=="1", ATTRS{name}=="goodix-ts", ENV{LIBINPUT_CALIBRATION_MATRIX}="0 -1 1 1 0 0"' >> $SDCARD/etc/udev/rules.d/99-radxa-display8hd-touch.rules
 
 	return 0
 }
diff --git a/config/kernel/linux-rk35xx-vendor.config b/config/kernel/linux-rk35xx-vendor.config
index 5fa5e7f1aca1..4d881cd007e2 100644
--- a/config/kernel/linux-rk35xx-vendor.config
+++ b/config/kernel/linux-rk35xx-vendor.config
@@ -1037,12 +1037,12 @@ CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
 CONFIG_TOUCHSCREEN_EXC3000=m
 CONFIG_TOUCHSCREEN_FTS=y
 CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
+# CONFIG_TOUCHSCREEN_GOODIX is not set
 CONFIG_TOUCHSCREEN_GSL3673=y
 CONFIG_TOUCHSCREEN_GSL3673_800X1280=m
 CONFIG_TOUCHSCREEN_GSLX680_PAD=m
 CONFIG_TOUCHSCREEN_GT1X=y
-CONFIG_TOUCHSCREEN_GT9XX=m
+CONFIG_TOUCHSCREEN_GT9XX=y
 CONFIG_TOUCHSCREEN_HIDEEP=m
 CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
 CONFIG_TOUCHSCREEN_ILI210X=m