ARM: dts: aspeed: Add "spi-max-frequency" property

Keep the FMC controller chips at a safe 50 MHz rate and use 100 MHz
for the PNOR on the machines using a AST2500 SoC.

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

diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
index c9d88c90135e6d32a8778c5cbef6ac2e8e77c0c4..8bec21ed0de536472948b35b78801e0b6efa52b9 100644 (file)
--- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
+++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -40,6 +40,7 @@
                status = "okay";
                m25p,fast-read;
                label = "bmc";
+               spi-max-frequency = <50000000>;
 #include "openbmc-flash-layout.dtsi"
        };
 };
@@ -50,6 +51,7 @@
                status = "okay";
                m25p,fast-read;
                label = "pnor";
+               spi-max-frequency = <100000000>;
        };
 };
 

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index b0cb34ccb1356ec54359cfdf3bf62644f07b3ebf..eb4e93a57ff443fbff4c116d0b204a5150f2aacc 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -87,6 +87,7 @@
                status = "okay";
                m25p,fast-read;
                label = "bmc";
+               spi-max-frequency = <50000000>;
 #include "openbmc-flash-layout.dtsi"
        };
 };
@@ -99,6 +100,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
+               spi-max-frequency = <50000000>;
                label = "pnor";
        };
 };

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
index 9628ecb879cf53d59004432ff84581f6a26efa8f..bb513f245a5ed053803cf982a796491c5b1938e1 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -112,6 +112,7 @@
                status = "okay";
                m25p,fast-read;
                label = "bmc";
+               spi-max-frequency = <50000000>;
 #include "openbmc-flash-layout.dtsi"
        };
 };
@@ -125,6 +126,7 @@
                status = "okay";
                m25p,fast-read;
                label = "pnor";
+               spi-max-frequency = <100000000>;
        };
 };
 

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index 31ea34e14c79a2016d7582e2e46e591e0f77d2ae..bf30fbdbe8f3f2498b9dcbdaa23d923a8772dfce 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -200,6 +200,7 @@
                status = "okay";
                label = "bmc";
                m25p,fast-read;
+               spi-max-frequency = <50000000>;
 
                partitions {
                        #address-cells = < 1 >;
@@ -224,6 +225,7 @@
                status = "okay";
                label = "alt-bmc";
                m25p,fast-read;
+               spi-max-frequency = <50000000>;
 
                partitions {
                        #address-cells = < 1 >;
@@ -242,7 +244,6 @@
                                label = "alt-obmc-ubi";
                        };
                };
-
        };
 };
 
@@ -255,6 +256,7 @@
                status = "okay";
                label = "pnor";
                m25p,fast-read;
+               spi-max-frequency = <100000000>;
        };
 };
 

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index 30624378316dad4415b00efc93372ccc6d14a896..3c514dfc7feefd3d9e31abddd16de74a04ea19cf 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -130,6 +130,7 @@
                status = "okay";
                label = "bmc";
                m25p,fast-read;
+               spi-max-frequency = <50000000>;
 #include "openbmc-flash-layout.dtsi"
        };
 };
@@ -143,6 +144,7 @@
                status = "okay";
                label = "pnor";
                m25p,fast-read;
+               spi-max-frequency = <100000000>;
        };
 };
 

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 36df031e82d6c75fc61a54cc7e7968f2146bd645..46c0891aac5ab8241e92ae1f97afd32a6f06e74b 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -65,6 +65,7 @@
                        flash@0 {
                                reg = < 0 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                        flash@1 {
@@ -100,6 +101,7 @@
                        flash@0 {
                                reg = < 0 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                };

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index d9ff5bf1622395f356ecdbdc4e54a6acb3ee17b0..3449bcc93d7bc69872b0f722488dde515c352ac6 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -72,16 +72,19 @@
                        flash@0 {
                                reg = < 0 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                        flash@1 {
                                reg = < 1 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                        flash@2 {
                                reg = < 2 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                };
@@ -97,11 +100,13 @@
                        flash@0 {
                                reg = < 0 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                        flash@1 {
                                reg = < 1 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                };
@@ -117,11 +122,13 @@
                        flash@0 {
                                reg = < 0 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                        flash@1 {
                                reg = < 1 >;
                                compatible = "jedec,spi-nor";
+                               spi-max-frequency = <50000000>;
                                status = "disabled";
                        };
                };