From cfc84db9766867ecb233457632976ea4a8ed2725 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 18 Jul 2018 13:47:23 +0930 Subject: kernel: FSI fixes, FSI ColdFire master, AST2400 scratch regs Benjamin Herrenschmidt (4): fsi: sbefifo: Fix checker warning about late NULL check fsi: Don't use device_unregister() in fsi_master_register() dt-bindings: fsi: Document binding for the fsi-master-ast-cf "device" fsi: master-ast-cf: Add new FSI master using Aspeed ColdFire Guenter Roeck (1): fsi/sbefifo: Add dependency on OF_ADDRESS Joel Stanley (2): fsi: master-gpio: Sync with 'Add missing release function' ARM: dts: aspeed-g4: Expose SuperIO scratch registers Wei Yongjun (1): fsi: sbefifo: Fix missing unlock on error in sbefifo_dump_ffdc() Change-Id: I7b14830959e9e3ed4c1e38cf1a8106370f53b62a Signed-off-by: Joel Stanley --- meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig | 1 + meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig | 1 + meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'meta-openbmc-bsp') 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 01272e788..48a2f1c18 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_BMP280=y 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 bab5f07a0..12234dfb0 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_DPS310=y 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 8a16ca3b4..a8b3f3d64 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 -- cgit v1.2.1