kernel: FSI, ASPEED SPI NOR, ASPEED GFX
Benjamin Herrenschmidt (11):
drm: aspeed: Enable/disable vblank in pipe enable/disable
devres: Add devm_of_iomap()
fsi: Move code around to avoid forward declaration
fsi: Add mechanism to set the tSendDelay and tEchoDelay values
fsi: master-gpio: Rename and adjust send delay
fsi: master-gpio: Add support for link_config
fsi: master-gpio: Add more tracepoints
fsi: master-gpio: Remove unused definitions
fsi: master-gpio: Remove "GPIO" prefix on some definitions
fsi: master-gpio: Add missing release function
fsi: Move various master definitions to a common header
Cédric Le Goater (2):
ARM: dts: aspeed: Add "spi-max-frequency" property
mtd: spi-nor: aspeed: limit the maximum SPI frequency
Joel Stanley (2):
ARM: config: aspeed: Enable SHA256 and HMAC
ARM: config: aspeed: Re-enable DEVMEM
Resolves: openbmc/openbmc#3164
Change-Id: I7f1970a8123b6d335e6dd2bda525c02cc393ede4
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Eddie James <eajames@linux.vnet.ibm.com>
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 8b7eb78..7d5a5e8 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.3"
-SRCREV="34a1e3e8f06c66cc6834679d99e0f09dfad85d3f"
+SRCREV="7d98f10b6320b0f617482ff3c3c79b3bafbe602c"
require linux-aspeed.inc
diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch
index f514ef2..f51f362 100644
--- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch
+++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch
@@ -1,4 +1,4 @@
-From 3e0b58ab998209b392a2870124503659245c2483 Mon Sep 17 00:00:00 2001
+From b18dcf9d63f024b01373fc2a083b2695830d71cc Mon Sep 17 00:00:00 2001
From: "Edward A. James" <eajames@us.ibm.com>
Date: Wed, 16 Aug 2017 07:58:56 -0500
Subject: [PATCH] ARM: dts: Aspeed: Witherspoon: Update BMC partitioning
@@ -18,7 +18,7 @@
diff --git a/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi b/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
new file mode 100644
-index 000000000000..927759950023
+index 0000000..9277599
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
@@ -0,0 +1,18 @@
@@ -42,7 +42,7 @@
+ };
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
new file mode 100644
-index 000000000000..0059ad16d2ba
+index 0000000..0059ad1
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
@@ -0,0 +1,18 @@
@@ -65,25 +65,26 @@
+ };
+ };
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
-index b24ea9967fc8..0b69aa942e18 100644
+index c51e3e8..058b9b7 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
-@@ -182,13 +182,14 @@
- status = "okay";
+@@ -191,7 +191,7 @@
label = "bmc";
m25p,fast-read;
+ spi-max-frequency = <50000000>;
-#include "openbmc-flash-layout.dtsi"
+#include "aspeed-bmc-opp-flash-layout-ubi.dtsi"
};
flash@1 {
- status = "okay";
+@@ -199,6 +199,7 @@
label = "alt";
m25p,fast-read;
+ spi-max-frequency = <50000000>;
+#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi"
};
};
--
-2.15.1
+1.8.3.1