From 2cac4f7b07b4f0ca275048da76986055cee542d2 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Sat, 4 Mar 2017 00:22:14 +1030 Subject: kernel: FSI and P9 fixes Two fixes for FSI bugs that users were seeing often. A revert of the Zaius reserved memory region device tree change due to a kernel bug where u-boot will happily load data into the region that the kernel subsequently marks as inaccessible. This is a temporary fix until the ARM early boot code can be fixed. Finally, a change to bring Romulus PNOR SPI settings to parity with the other P9 platforms. Christopher Bostic (2): drivers/fsi: Change hub sysfs name drivers/fsi: Don't scan after fsi-gpio_master unbound Lei YU (1): arm: aspeed: romulus: Set PNOR SPI address mapping Patrick Williams (1): Set Zaius back to old address range Change-Id: I3887c7dbd3f6fd450fb096ba59e0189af87039d7 Signed-off-by: Joel Stanley --- .../0001-Set-Zaius-back-to-old-address-range.patch | 31 ---------------------- .../recipes-kernel/linux/linux-obmc_%.bbappend | 1 - 2 files changed, 32 deletions(-) delete mode 100644 meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/0001-Set-Zaius-back-to-old-address-range.patch (limited to 'meta-openbmc-machines') diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/0001-Set-Zaius-back-to-old-address-range.patch b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/0001-Set-Zaius-back-to-old-address-range.patch deleted file mode 100644 index 506f31bf6..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/0001-Set-Zaius-back-to-old-address-range.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f19b706443020196098c41c1ddd15823dcc9db78 Mon Sep 17 00:00:00 2001 -From: Patrick Williams -Date: Fri, 24 Feb 2017 15:24:48 -0600 -Subject: [PATCH] Set Zaius back to old address range - -See openbmc/openbmc#1203 - -Signed-off-by: Patrick Williams ---- - arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts -index 548ef1e..dc05468 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts -@@ -25,9 +25,9 @@ - #size-cells = <1>; - ranges; - -- flash_memory: region@bc000000 { -+ flash_memory: region@98000000 { - no-map; -- reg = <0xbc000000 0x04000000>; /* 64M */ -+ reg = <0x98000000 0x04000000>; /* 64M */ - }; - }; - --- -2.10.2 - diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend index c392e85c4..f3a83990b 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend @@ -1,3 +1,2 @@ FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:" SRC_URI_append_zaius = " file://zaius.cfg" -SRC_URI_append_zaius = " file://0001-Set-Zaius-back-to-old-address-range.patch" -- cgit v1.2.1