From 502ed4c0f99c2cc94928ffda3050ee5ef94cacbe Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 12 Dec 2017 13:27:13 +1030 Subject: kernel: Add Intel S2600WF, gpio and pinctrl fixes, machine updates Andrew Jeffery (2): ARM: dts: aspeed: Ensure platform mux RMII1 for MAC0 pinctrl: aspeed: Rework strap register write logic for the AST2500 James Feist (2): ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi ARM: dts: Add S2600WF BMC Machine Lei YU (1): ARM: dts: aspeed: P8: Add checkstop gpio key Patrick Venture (6): ARM: dts: aspeed: gpio controller register range ARM: dts: aspeed: quanta: add aliases for i2c pcie ARM: dts: aspeed: quanta-q71l: move coin battery sensor ARM: dts: aspeed: zaius: move coin battery sensor ARM: dts: aspeed-g4: add serial gpio driver entry ARM: dts: aspeed: quanta: add i2cmux for frus Peter Hanson (1): ARM: dts: quanta: i2c-2 idle disconnects Rick Altherr (1): pinctrl: aspeed: Allow disabling Port D and Port E loopback mode Vishwanatha Subbanna (1): ARM: dts: aspeed: witherspoon: Add power-button LED Yong Li (1): pinctrl: aspeed: Fix ast2500 strap register write logic Change-Id: I960b2c28eb0f0e0af055ea0ecdf48e01256c2f14 Signed-off-by: Joel Stanley --- .../0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch | 2 +- meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-phosphor/common/recipes-kernel') diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch index 40e061092..3407f2f79 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch @@ -71,7 +71,7 @@ index dd30c20..51f965e 100644 status = "okay"; m25p,fast-read; --#include "aspeed-bmc-opp-flash-layout.dtsi" +-#include "openbmc-flash-layout.dtsi" +#include "aspeed-bmc-opp-flash-layout-ubi.dtsi" }; flash@1 { diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb index a2712cc7e..3c91d5f13 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-4.10" LINUX_VERSION ?= "4.10.17" -SRCREV="e7ae4c9b5df12838e66a25df93df02e47bdb7d11" +SRCREV="72b52ebab574eaf0bcd2256ae16a25976a37c407" require linux-obmc.inc -- cgit v1.2.1