From 69d0cbb995f315d8d7a973f5003947e9de37fff8 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 11 Jul 2019 09:48:49 -0500 Subject: witherspoon-128: Remove mbox node from device tree The mbox device driver was never upstreamed and has been dropped from the linux tree. Remove the node from the witherspoon-128 system as it has already been removed from the upstreamed systems. Also rebase the patch on top of the latest linux dev-5.2 branch. (From meta-ibm rev: a1920244eedde427d312c84cd74f11e1cde84818) Change-Id: If6b5f012ae2f26886c7994d739ee2a97be0e2141 Signed-off-by: Adriana Kobylak Signed-off-by: Brad Bishop --- ...eed-Witherspoon-128-Update-BMC-partitioni.patch | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch index 547d5f098..b0e61ccd4 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch @@ -1,4 +1,4 @@ -From a3007793ae0c53b4a39159c6d69502de832a0914 Mon Sep 17 00:00:00 2001 +From 886807887052b408717137acfeb6a8633748a210 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 7 Feb 2019 11:23:00 -0600 Subject: [PATCH] ARM: dts: Aspeed: Witherspoon-128: Update BMC partitioning @@ -9,17 +9,17 @@ BMC flash chips. Signed-off-by: Adriana Kobylak --- arch/arm/boot/dts/Makefile | 1 + - .../boot/dts/aspeed-bmc-opp-witherspoon-128.dts | 712 +++++++++++++++++++++ - 2 files changed, 713 insertions(+) + .../boot/dts/aspeed-bmc-opp-witherspoon-128.dts | 708 +++++++++++++++++++++ + 2 files changed, 709 insertions(+) create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index bd40148..2341358 100644 +index eb6de52..833c354 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -1245,6 +1245,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ - aspeed-bmc-opp-palmetto.dtb \ - aspeed-bmc-opp-romulus.dtb \ +@@ -1280,6 +1280,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ + aspeed-bmc-opp-swift.dtb \ + aspeed-bmc-opp-vesnin.dtb \ aspeed-bmc-opp-witherspoon.dtb \ + aspeed-bmc-opp-witherspoon-128.dtb \ aspeed-bmc-opp-zaius.dtb \ @@ -27,10 +27,10 @@ index bd40148..2341358 100644 aspeed-bmc-quanta-q71l.dtb diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts new file mode 100644 -index 0000000..db34564 +index 0000000..36b4749 --- /dev/null +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts -@@ -0,0 +1,712 @@ +@@ -0,0 +1,708 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; +#include "aspeed-g5.dtsi" @@ -322,10 +322,6 @@ index 0000000..db34564 + flash = <&spi1>; +}; + -+&mbox { -+ status = "okay"; -+}; -+ +&mac0 { + status = "okay"; + pinctrl-names = "default"; -- cgit v1.2.3