@@ -60,7 +60,6 @@
&fmc {
status = "okay";
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -68,7 +67,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -81,7 +79,6 @@
flash@0 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi1_default>;
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -90,7 +87,6 @@
flash@1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi1_default &pinctrl_spi1cs1_default>;
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -63,7 +63,6 @@
&fmc {
status = "okay";
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -71,7 +70,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -84,7 +82,6 @@
flash@0 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi1_default>;
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -93,7 +90,6 @@
flash@1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi1_default &pinctrl_spi1cs1_default>;
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -65,7 +65,6 @@
&fmc {
status = "okay";
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -73,7 +72,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -86,7 +84,6 @@
flash@0 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi1_default>;
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -95,7 +92,6 @@
flash@1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi1_default &pinctrl_spi1cs1_default>;
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -87,7 +87,6 @@
pinctrl-0 = <&pinctrl_fmcquad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -95,7 +94,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -103,7 +101,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -120,7 +117,6 @@
&pinctrl_spi1wp_default &pinctrl_spi1quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -128,7 +124,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -144,7 +139,6 @@
&pinctrl_spi2cs2_default &pinctrl_spi2quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -152,7 +146,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -160,7 +153,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -122,7 +122,6 @@
pinctrl-0 = <&pinctrl_fmcquad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -130,7 +129,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -138,7 +136,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -155,7 +152,6 @@
&pinctrl_spi1wp_default &pinctrl_spi1quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -163,7 +159,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -179,7 +174,6 @@
&pinctrl_spi2cs2_default &pinctrl_spi2quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -187,7 +181,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -195,7 +188,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -76,7 +76,6 @@
&fmc {
status = "okay";
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -84,7 +83,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -123,7 +123,6 @@
pinctrl-0 = <&pinctrl_fmcquad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -131,7 +130,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -139,7 +137,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -156,7 +153,6 @@
&pinctrl_spi1wp_default &pinctrl_spi1quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -164,7 +160,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -180,7 +175,6 @@
&pinctrl_spi2cs2_default &pinctrl_spi2quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -188,7 +182,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -196,7 +189,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -124,7 +124,6 @@
pinctrl-0 = <&pinctrl_fmcquad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -132,7 +131,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -140,7 +138,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -157,7 +154,6 @@
&pinctrl_spi1wp_default &pinctrl_spi1quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -165,7 +161,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -181,7 +176,6 @@
&pinctrl_spi2cs2_default &pinctrl_spi2quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -189,7 +183,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -197,7 +190,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -124,7 +124,6 @@
timing-calibration-disabled;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <25000000>;
spi-tx-bus-width = <1>;
@@ -132,7 +131,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <25000000>;
spi-tx-bus-width = <1>;
@@ -140,7 +138,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <25000000>;
spi-tx-bus-width = <1>;
@@ -158,7 +155,6 @@
timing-calibration-disabled;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <25000000>;
spi-tx-bus-width = <1>;
@@ -166,7 +162,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <25000000>;
spi-tx-bus-width = <1>;
@@ -183,7 +178,6 @@
timing-calibration-disabled;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <25000000>;
spi-tx-bus-width = <1>;
@@ -191,7 +185,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <25000000>;
spi-tx-bus-width = <1>;
@@ -199,7 +192,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <25000000>;
spi-tx-bus-width = <1>;
@@ -74,7 +74,6 @@
flash@0 {
// TODO: what compatible strings should be here?
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -82,7 +81,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -92,7 +92,6 @@
pinctrl-0 = <&pinctrl_fmcquad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -108,7 +107,6 @@
&pinctrl_spi2cs2_default &pinctrl_spi2quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -122,7 +122,6 @@
pinctrl-0 = <&pinctrl_fmcquad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -130,7 +129,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -138,7 +136,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -155,7 +152,6 @@
&pinctrl_spi1wp_default &pinctrl_spi1quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -163,7 +159,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -179,7 +174,6 @@
&pinctrl_spi2cs2_default &pinctrl_spi2quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -187,7 +181,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -195,7 +188,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -65,7 +65,6 @@
flash@0 {
// TODO: what compatible strings should be here?
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -73,7 +72,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
@@ -115,7 +115,6 @@
pinctrl-0 = <&pinctrl_fmcquad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -123,7 +122,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -131,7 +129,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -148,7 +145,6 @@
&pinctrl_spi1wp_default &pinctrl_spi1quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -156,7 +152,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -172,7 +167,6 @@
&pinctrl_spi2cs2_default &pinctrl_spi2quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -180,7 +174,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -188,7 +181,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -122,7 +122,6 @@
pinctrl-0 = <&pinctrl_fmcquad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -130,7 +129,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -138,7 +136,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -155,7 +152,6 @@
&pinctrl_spi1wp_default &pinctrl_spi1quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -163,7 +159,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -179,7 +174,6 @@
&pinctrl_spi2cs2_default &pinctrl_spi2quad_default>;
flash@0 {
- compatible = "spi-flash", "sst,w25q256";
status = "okay";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -187,7 +181,6 @@
};
flash@1 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
@@ -195,7 +188,6 @@
};
flash@2 {
- compatible = "spi-flash", "sst,w25q256";
status = "disabled";
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
The underlying SoC definitions use compatible "jedec,spi-nor", so does the aspeed SPI driver, this to be in sync with Linux and the latest U-Boot. Cc: Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- arch/arm/dts/ast2400-evb.dts | 4 ---- arch/arm/dts/ast2400-palmetto.dts | 4 ---- arch/arm/dts/ast2500-evb.dts | 4 ---- arch/arm/dts/ast2600-bletchley.dts | 8 -------- arch/arm/dts/ast2600-evb.dts | 8 -------- arch/arm/dts/ast2600-fpga.dts | 2 -- arch/arm/dts/ast2600-intel.dts | 8 -------- arch/arm/dts/ast2600-ncsi.dts | 8 -------- arch/arm/dts/ast2600-pfr.dts | 8 -------- arch/arm/dts/ast2600-rainier.dts | 2 -- arch/arm/dts/ast2600-s6q.dts | 2 -- arch/arm/dts/ast2600-slt.dts | 8 -------- arch/arm/dts/ast2600-tacoma.dts | 2 -- arch/arm/dts/ast2600a0-evb.dts | 8 -------- arch/arm/dts/ast2600a1-evb.dts | 8 -------- 15 files changed, 84 deletions(-)