diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-12-23 14:47:34 +0100 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-01-08 03:15:39 +0100 |
| commit | 87c5947ffeec42a4ef72e19b4c822be5d8e09c84 (patch) | |
| tree | c1a1056a8f4d901f52ea1cb5611b0e6fc459e6ec /arch | |
| parent | ARM: dts: aspeed: tacoma: Remove duplicate i2c busses (diff) | |
| download | linux-87c5947ffeec42a4ef72e19b4c822be5d8e09c84.tar.xz linux-87c5947ffeec42a4ef72e19b4c822be5d8e09c84.zip | |
ARM: dts: aspeed: tacoma: Remove duplicate flash nodes
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".
Fixes: 8737481e381c ("ARM: dts: aspeed: tacoma: Enable FMC and SPI devices")
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 31 |
1 files changed, 0 insertions, 31 deletions
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"; |