Commit fba4e9f9 authored by Hou Zhiqiang's avatar Hou Zhiqiang Committed by Scott Wood

powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible

Starting with commit <8947e396> ("Documentation: dt: mtd:
replace "nor-jedec" binding with "jedec, spi-nor"") we have
"jedec,spi-nor" binding indicating support for JEDEC identification.

Use it for all flashes that are supposed to support READ ID op
according to the datasheets.
Signed-off-by: default avatarHou Zhiqiang <Zhiqiang.Hou@freescale.com>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent fd5475a7
...@@ -142,7 +142,7 @@ spi@110000 { ...@@ -142,7 +142,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "sst,sst25wf040"; compatible = "sst,sst25wf040", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
}; };
......
...@@ -53,7 +53,7 @@ spi@7000 { ...@@ -53,7 +53,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <50000000>; spi-max-frequency = <50000000>;
......
...@@ -55,7 +55,7 @@ spi@7000 { ...@@ -55,7 +55,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <30000000>; spi-max-frequency = <30000000>;
}; };
......
...@@ -167,7 +167,7 @@ spi@7000 { ...@@ -167,7 +167,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <50000000>; spi-max-frequency = <50000000>;
......
...@@ -63,7 +63,7 @@ spi@110000 { ...@@ -63,7 +63,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25fl256s1"; compatible = "spansion,s25fl256s1", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <20000000>; /* input clock */ spi-max-frequency = <20000000>; /* input clock */
}; };
...@@ -77,7 +77,7 @@ network_clock@1 { ...@@ -77,7 +77,7 @@ network_clock@1 {
flash@2 { flash@2 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "micron,m25p32"; compatible = "micron,m25p32", "jedec,spi-nor";
reg = <2>; reg = <2>;
spi-max-frequency = <15000000>; spi-max-frequency = <15000000>;
}; };
......
...@@ -142,7 +142,7 @@ spi@7000 { ...@@ -142,7 +142,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; spi-max-frequency = <40000000>;
partition@u-boot { partition@u-boot {
...@@ -166,17 +166,17 @@ partition@fs { ...@@ -166,17 +166,17 @@ partition@fs {
}; };
}; };
flash@1 { flash@1 {
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <1>; reg = <1>;
spi-max-frequency = <40000000>; spi-max-frequency = <40000000>;
}; };
flash@2 { flash@2 {
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <2>; reg = <2>;
spi-max-frequency = <40000000>; spi-max-frequency = <40000000>;
}; };
flash@3 { flash@3 {
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <3>; reg = <3>;
spi-max-frequency = <40000000>; spi-max-frequency = <40000000>;
}; };
......
...@@ -70,12 +70,12 @@ spi0: spi@7000 { ...@@ -70,12 +70,12 @@ spi0: spi@7000 {
fsl,espi-num-chipselects = <2>; fsl,espi-num-chipselects = <2>;
flash@0 { flash@0 {
compatible = "atmel,at25df641"; compatible = "atmel,at25df641", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <10000000>; spi-max-frequency = <10000000>;
}; };
flash@1 { flash@1 {
compatible = "atmel,at25df641"; compatible = "atmel,at25df641", "jedec,spi-nor";
reg = <1>; reg = <1>;
spi-max-frequency = <10000000>; spi-max-frequency = <10000000>;
}; };
......
...@@ -110,7 +110,7 @@ spi@7000 { ...@@ -110,7 +110,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; spi-max-frequency = <40000000>;
......
...@@ -151,7 +151,7 @@ spi@7000 { ...@@ -151,7 +151,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
......
...@@ -155,7 +155,7 @@ spi@7000 { ...@@ -155,7 +155,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
/* input clock */ /* input clock */
spi-max-frequency = <40000000>; spi-max-frequency = <40000000>;
......
...@@ -148,7 +148,7 @@ spi@7000 { ...@@ -148,7 +148,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
......
...@@ -123,7 +123,7 @@ spi@7000 { ...@@ -123,7 +123,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
......
...@@ -150,7 +150,7 @@ spi@7000 { ...@@ -150,7 +150,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
......
...@@ -160,7 +160,7 @@ spi@7000 { ...@@ -160,7 +160,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
......
...@@ -86,7 +86,7 @@ spi@7000 { ...@@ -86,7 +86,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,m25p80"; compatible = "spansion,m25p80", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <1000000>; spi-max-frequency = <1000000>;
partition@0 { partition@0 {
......
...@@ -129,7 +129,7 @@ spi@7000 { ...@@ -129,7 +129,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,m25p80"; compatible = "spansion,m25p80", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; spi-max-frequency = <40000000>;
......
...@@ -137,7 +137,7 @@ spi@7000 { ...@@ -137,7 +137,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
......
...@@ -151,7 +151,7 @@ spi@7000 { ...@@ -151,7 +151,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,m25p80"; compatible = "spansion,m25p80", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; spi-max-frequency = <40000000>;
......
...@@ -155,7 +155,7 @@ spi@7000 { ...@@ -155,7 +155,7 @@ spi@7000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; spi-max-frequency = <40000000>;
......
...@@ -96,7 +96,7 @@ spi@110000 { ...@@ -96,7 +96,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
partition@u-boot { partition@u-boot {
......
...@@ -97,7 +97,7 @@ spi@110000 { ...@@ -97,7 +97,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <35000000>; /* input clock */ spi-max-frequency = <35000000>; /* input clock */
partition@u-boot { partition@u-boot {
......
...@@ -98,7 +98,7 @@ spi@110000 { ...@@ -98,7 +98,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
partition@u-boot { partition@u-boot {
......
...@@ -97,7 +97,7 @@ spi@110000 { ...@@ -97,7 +97,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
partition@u-boot { partition@u-boot {
......
...@@ -109,7 +109,7 @@ spi@110000 { ...@@ -109,7 +109,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25sl12801"; compatible = "spansion,s25sl12801", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
partition@u-boot { partition@u-boot {
......
...@@ -79,7 +79,7 @@ spi@110000 { ...@@ -79,7 +79,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,s25fl512s"; compatible = "spansion,s25fl512s", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <10000000>; /* input clk */ spi-max-frequency = <10000000>; /* input clk */
}; };
......
...@@ -87,7 +87,7 @@ spi@110000 { ...@@ -87,7 +87,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "micron,n25q128a11"; /* 16MB */ compatible = "micron,n25q128a11", "jedec,spi-nor"; /* 16MB */
reg = <0>; reg = <0>;
spi-max-frequency = <10000000>; spi-max-frequency = <10000000>;
}; };
...@@ -95,7 +95,7 @@ flash@0 { ...@@ -95,7 +95,7 @@ flash@0 {
flash@1 { flash@1 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "sst,sst25wf040"; /* 512KB */ compatible = "sst,sst25wf040", "jedec,spi-nor"; /* 512KB */
reg = <1>; reg = <1>;
spi-max-frequency = <10000000>; spi-max-frequency = <10000000>;
}; };
...@@ -103,7 +103,7 @@ flash@1 { ...@@ -103,7 +103,7 @@ flash@1 {
flash@2 { flash@2 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "eon,en25s64"; /* 8MB */ compatible = "eon,en25s64", "jedec,spi-nor"; /* 8MB */
reg = <2>; reg = <2>;
spi-max-frequency = <10000000>; spi-max-frequency = <10000000>;
}; };
......
...@@ -89,7 +89,7 @@ spi@110000 { ...@@ -89,7 +89,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "micron,n25q512ax3"; compatible = "micron,n25q512ax3", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <10000000>; /* input clk */ spi-max-frequency = <10000000>; /* input clk */
}; };
......
...@@ -104,7 +104,7 @@ spi@110000 { ...@@ -104,7 +104,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "micron,n25q512ax3"; compatible = "micron,n25q512ax3", "jedec,spi-nor";
reg = <0>; reg = <0>;
/* input clock */ /* input clock */
spi-max-frequency = <10000000>; spi-max-frequency = <10000000>;
......
...@@ -261,7 +261,7 @@ spi@110000 { ...@@ -261,7 +261,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "micron,n25q128a11"; compatible = "micron,n25q128a11", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <10000000>; /* input clock */ spi-max-frequency = <10000000>; /* input clock */
}; };
......
...@@ -109,7 +109,7 @@ spi@110000 { ...@@ -109,7 +109,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "micron,n25q512a"; compatible = "micron,n25q512a", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <10000000>; /* input clock */ spi-max-frequency = <10000000>; /* input clock */
}; };
......
...@@ -112,7 +112,7 @@ spi@110000 { ...@@ -112,7 +112,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "micron,n25q128a11"; /* 16MB */ compatible = "micron,n25q128a11", "jedec,spi-nor"; /* 16MB */
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
}; };
...@@ -120,7 +120,7 @@ flash@0 { ...@@ -120,7 +120,7 @@ flash@0 {
flash@1 { flash@1 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "sst,sst25wf040"; compatible = "sst,sst25wf040", "jedec,spi-nor";
reg = <1>; reg = <1>;
spi-max-frequency = <35000000>; spi-max-frequency = <35000000>;
}; };
...@@ -128,7 +128,7 @@ flash@1 { ...@@ -128,7 +128,7 @@ flash@1 {
flash@2 { flash@2 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "eon,en25s64"; compatible = "eon,en25s64", "jedec,spi-nor";
reg = <2>; reg = <2>;
spi-max-frequency = <35000000>; spi-max-frequency = <35000000>;
}; };
......
...@@ -113,7 +113,7 @@ spi@110000 { ...@@ -113,7 +113,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "micron,n25q512a"; compatible = "micron,n25q512a", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <10000000>; /* input clock */ spi-max-frequency = <10000000>; /* input clock */
}; };
......
...@@ -358,7 +358,7 @@ spi@110000 { ...@@ -358,7 +358,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "sst,sst25wf040"; compatible = "sst,sst25wf040", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
}; };
......
...@@ -118,7 +118,7 @@ spi@110000 { ...@@ -118,7 +118,7 @@ spi@110000 {
flash@0 { flash@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "sst,sst25wf040"; compatible = "sst,sst25wf040", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; /* input clock */ spi-max-frequency = <40000000>; /* input clock */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment