diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
index 01272e7..48a2f1c 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
@@ -205,6 +205,7 @@
 CONFIG_FSI=y
 CONFIG_FSI_MASTER_GPIO=y
 CONFIG_FSI_MASTER_HUB=y
+CONFIG_FSI_MASTER_AST_CF=y
 CONFIG_FSI_SCOM=y
 CONFIG_FSI_SBEFIFO=y
 CONFIG_FSI_OCC=y
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
index bab5f07..12234df 100755
--- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
@@ -205,6 +205,7 @@
 CONFIG_FSI=y
 CONFIG_FSI_MASTER_GPIO=y
 CONFIG_FSI_MASTER_HUB=y
+CONFIG_FSI_MASTER_AST_CF=y
 CONFIG_FSI_SCOM=y
 CONFIG_FSI_SBEFIFO=y
 CONFIG_FSI_OCC=y
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index 8a16ca3..a8b3f3d 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
@@ -1,6 +1,6 @@
 KBRANCH ?= "dev-4.17"
 LINUX_VERSION ?= "4.17.4"
 
-SRCREV="8fb9a0714f8ff91756a9746707c4f884b3745a40"
+SRCREV="5968d6cf37d26fc8ea7c29305b0757cc1331e717"
 
 require linux-aspeed.inc