diff mbox series

[linux,dev-5.4,3/4] ARM: dts: aspeed: tacoma: Remove duplicate flash nodes

Message ID 20191223134735.559200-4-joel@jms.id.au
State Accepted, archived
Headers show
Series ast2600 device tree fixes | expand

Commit Message

Joel Stanley Dec. 23, 2019, 1:47 p.m. UTC
This is a revert of "ARM: dts: aspeed: tacoma: Enable FMC and SPI
devices" which was already applied as part of "ARM: dts: aspeed: Add
Tacoma machine".

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 31 ---------------------
 1 file changed, 31 deletions(-)

Comments

Andrew Jeffery Jan. 6, 2020, 5:17 a.m. UTC | #1
On Tue, 24 Dec 2019, at 00:17, Joel Stanley wrote:
> This is a revert of "ARM: dts: aspeed: tacoma: Enable FMC and SPI
> devices" which was already applied as part of "ARM: dts: aspeed: Add
> Tacoma machine".
> 
> Signed-off-by: Joel Stanley <joel@jms.id.au>

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
index 73aaf58d9f42..ff49ec76fa7c 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
@@ -122,37 +122,6 @@ 
 	};
 };
 
-&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>;
-	};
-};
-
 &mac2 {
 	status = "okay";
 	pinctrl-names = "default";