diff --git a/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig b/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig
index d0abbf1..939a60e 100644
--- a/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig
+++ b/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig
@@ -141,6 +141,7 @@
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_ASPEED=y
 CONFIG_I2C_FSI=y
+CONFIG_SPI=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_ASPEED=y
diff --git a/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig
index 209ed49..d189de8 100644
--- a/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig
+++ b/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig
@@ -3,6 +3,8 @@
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
@@ -138,10 +140,12 @@
 CONFIG_HW_RANDOM_TIMERIOMEM=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA9541=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_ASPEED=y
 CONFIG_I2C_FSI=y
+CONFIG_SPI=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_ASPEED=y
diff --git a/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig
index 43a77c1..bf6e952 100644
--- a/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig
+++ b/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig
@@ -152,6 +152,7 @@
 CONFIG_HW_RANDOM_TIMERIOMEM=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA9541=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_ASPEED=y
diff --git a/recipes-kernel/linux/linux-aspeed_git.bb b/recipes-kernel/linux/linux-aspeed_git.bb
index 0cf3798..7057ccd 100644
--- a/recipes-kernel/linux/linux-aspeed_git.bb
+++ b/recipes-kernel/linux/linux-aspeed_git.bb
@@ -1,6 +1,6 @@
-KBRANCH ?= "dev-5.3"
-LINUX_VERSION ?= "5.3.15"
+KBRANCH ?= "dev-5.4"
+LINUX_VERSION ?= "5.4.4"
 
-SRCREV="fdc60468f3e452364d432f1a7c3f83d58bba1b84"
+SRCREV="91b5e9f45c23ff55d8b547ddf1661337a70e2b22"
 
 require linux-aspeed.inc