[PATCH 1/8] ARM: dts: aspeed: facebook: Declare SPI NOR flashes on boards
Jacky Huang <[email protected]>
| Newsgroups | org.ozlabs.lists.linux-aspeed,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel,org.ozlabs.lists.openbmc |
|---|---|
| Message-ID | <[email protected]> |
Declare jedec,spi-nor flash nodes with the properties previously inherited from aspeed-g6.dtsi stubs. Keep status = "okay" so these boards stay enabled while the SoC stubs still exist. Signed-off-by: Jacky Huang <[email protected]> --- arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-anacapa.dts | 7 +++++++ .../boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts | 9 +++++++++ .../arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts | 6 ++++++ .../arm/boot/dts/aspeed/aspeed-bmc-facebook-clemente.dts | 6 ++++++ .../boot/dts/aspeed/aspeed-bmc-facebook-greatlakes.dts | 4 ++++ arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 ++++++++ arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 6 ++++++ .../boot/dts/aspeed/aspeed-bmc-facebook-rainiera6.dts | 8 ++++++++ .../boot/dts/aspeed/aspeed-bmc-facebook-sanmiguel.dts | 6 ++++++ .../boot/dts/aspeed/aspeed-bmc-facebook-santabarbara.dts | 8 ++++++++ .../boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 4 ++++ .../boot/dts/aspeed/aspeed-bmc-facebook-yosemite5.dts | 8 ++++++++ .../boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi | 8 ++++++++ 13 files changed, 88 insertions(+) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-anacapa.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-anacapa.dts index 1fddf3a5d138..e3b0e21e8e03 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-anacapa.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-anacapa.dts @@ -166,18 +166,24 @@ &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "alt-bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; }; }; @@ -1023,6 +1029,7 @@ &spi2 { flash@0 { compatible = "jedec,spi-nor"; + reg = <0>; label = "pnor"; spi-max-frequency = <12000000>; spi-tx-bus-width = <2>; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts index d1a04b63df9e..409757a10120 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts @@ -314,17 +314,23 @@ fixed-link { &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "alt-bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; }; }; @@ -334,10 +340,13 @@ &spi2 { pinctrl-0 = <&pinctrl_spi2_default>; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "pnor"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; }; }; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts index 14dd0ab64130..c6b9c67bd965 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts @@ -170,17 +170,23 @@ &mac3 { &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "alt-bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; }; }; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-clemente.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-clemente.dts index 820d39a92974..82e5d7b9ab71 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-clemente.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-clemente.dts @@ -189,18 +189,24 @@ &ehci0 { &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "alt-bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; }; }; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-greatlakes.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-greatlakes.dts index 49914a4a179f..a7df5e7ed650 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-greatlakes.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-greatlakes.dts @@ -82,6 +82,8 @@ &rtc { &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; @@ -90,6 +92,8 @@ flash@0 { #include "openbmc-flash-layout-64.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "bmc2"; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts index 5602a502d07b..e35041946d33 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts @@ -139,18 +139,24 @@ &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "alt-bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; }; }; @@ -161,6 +167,8 @@ &spi2 { pinctrl-0 = <&pinctrl_spi2_default>; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "pnor"; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts index eb8d4b95596c..3bf8945691c8 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts @@ -161,17 +161,23 @@ &mdio3 { &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "alt-bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; }; }; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-rainiera6.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-rainiera6.dts index b29e08cea254..cb41b78536bf 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-rainiera6.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-rainiera6.dts @@ -128,18 +128,24 @@ &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "alt-bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; }; }; @@ -969,6 +975,8 @@ &spi2 { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; m25p,fast-read; label = "pnor"; spi-max-frequency = <12000000>; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-sanmiguel.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-sanmiguel.dts index 3cc6e772cc8c..73d013cf3dc6 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-sanmiguel.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-sanmiguel.dts @@ -117,20 +117,26 @@ &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; label = "bmc"; spi-max-frequency = <50000000>; m25p,fast-read; status = "okay"; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; label = "alt-bmc"; spi-max-frequency = <50000000>; m25p,fast-read; status = "okay"; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128-alt.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-santabarbara.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-santabarbara.dts index 0a3e2e241063..efe1a2ea52fd 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-santabarbara.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-santabarbara.dts @@ -173,18 +173,24 @@ &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "alt-bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; }; }; @@ -1867,6 +1873,8 @@ &spi2 { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; m25p,fast-read; label = "pnor"; spi-max-frequency = <12000000>; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts index e4172be84e7f..bfc7df61bfc8 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts @@ -162,6 +162,8 @@ &mac3 { &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; @@ -171,6 +173,8 @@ flash@0 { #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "alt-bmc"; diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite5.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite5.dts index 6287f80d70d9..e2d4aafb6437 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite5.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite5.dts @@ -128,18 +128,24 @@ &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; #include "openbmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "alt-bmc"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; }; }; @@ -1028,6 +1034,8 @@ &spi2 { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; m25p,fast-read; label = "pnor"; spi-max-frequency = <12000000>; diff --git a/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi b/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi index 0ef225acddfc..180015ccb209 100644 --- a/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi +++ b/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi @@ -51,17 +51,25 @@ &fmc { status = "okay"; flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; status = "okay"; m25p,fast-read; label = "spi0.0"; + spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; #include "facebook-bmc-flash-layout-128.dtsi" }; flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; status = "okay"; m25p,fast-read; label = "spi0.1"; + spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; partitions { compatible = "fixed-partitions"; -- 2.43.0