From: Cédric Le Goater <clg@kaod.org>
Date: Wed, 25 Sep 2019 12:42:28 +0000 (+0200)
Subject: ARM: dts: aspeed: rainier: Enable FMC and SPI devices
X-Git-Tag: v5.5-rc1~39^2~8^2~33
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f97fa21f48808d011aa3507ff64763a6bac06b63;p=linux-2.6-block.git

ARM: dts: aspeed: rainier: Enable FMC and SPI devices

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Acked-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 773f725ab7e9..98b559d4acae 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -430,3 +430,34 @@
 	pinctrl-0 = <&pinctrl_rmii4_default>;
 	use-ncsi;
 };
+
+&fmc {
+	status = "okay";
+	flash@0 {
+		status = "okay";
+		m25p,fast-read;
+		label = "bmc";
+		spi-max-frequency = <50000000>;
+#include "openbmc-flash-layout-128.dtsi"
+	};
+
+	flash@1 {
+		status = "okay";
+		m25p,fast-read;
+		label = "alt-bmc";
+		spi-max-frequency = <50000000>;
+	};
+};
+
+&spi1 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_spi1_default>;
+
+	flash@0 {
+		status = "okay";
+		m25p,fast-read;
+		label = "pnor";
+		spi-max-frequency = <100000000>;
+	};
+};