kernel: Enable UBI, FSI hub support and device tree updates

This introduces hub master support for the FSI driver, enabling it to initialise
and talk to the FSI address space on the second socket of P9 machines.

UBI and UBIFS support is enabled in the kernel in preparation for using them in
OpenBMC.

The P9 device trees have been brought in sync with each other, with all now
describing the mailbox and lpc drivers necessary for using mboxd for host boot
firmware communication.

Adriana Kobylak (1):
  arm: configs: aspeed: Add UBI support

Christopher Bostic (4):
  drivers/fsi: Add hub master support
  drivers/fsi: Move common read/write code into shared utility
  drivers/fsi: Cleanup and retry op on error
  drivers/fsi: Initialize slave link field

Edward A. James (3):
  drivers: fsi: scom: Zero out user buffer first
  drivers: fsi: Fix FSI core size checking user interfaces
  drivers: fsi: i2c: Fixup probe to allow multiple engines

Joel Stanley (2):
  ARM: dts: aspeed: Fix RAM size in Romulus and Witherspoon
  ARM: dts: aspeed: Reserve RAM on P9 machines

Lei YU (1):
  ARM: dts: aspeed: Enable Romulus mailbox and LPC control nodes

Change-Id: I26855d0fcce0ba435892cc1f031a0e1b10121f5c
Signed-off-by: Joel Stanley <joel@jms.id.au>

3 files changed, 9 insertions, 1 deletions

diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
index aad4358a3..e9a318297 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
@@ -71,6 +71,9 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_PARTITIONED_MASTER=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_ASPEED_FLASH_SPI=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_BLOCK=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=4
@@ -161,6 +164,7 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_SUMMARY=y
 CONFIG_JFFS2_FS_XATTR=y
+CONFIG_UBIFS_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_NFS_FS=y
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
index 211e69df3..3db5d145c 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
@@ -74,6 +74,9 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_PARTITIONED_MASTER=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_ASPEED_FLASH_SPI=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_BLOCK=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=4
@@ -165,6 +168,7 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_SUMMARY=y
 CONFIG_JFFS2_FS_XATTR=y
+CONFIG_UBIFS_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_NFS_FS=y
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
index 1a7406447..c1530cddc 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
@@ -1,6 +1,6 @@
 KBRANCH ?= "dev-4.7"
 LINUX_VERSION ?= "4.7"
 
-SRCREV="59b0211af5f0057016606aa9cbfb3640ffaba6d4"
+SRCREV="cd72aa35e473996f548d8a1612d2e8cf7006f44e"
 
 require linux-obmc.inc