Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Starting with commit <8947e396a829> ("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: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
Signed-off-by: Scott Wood <oss@buserror.net>

authored by

Hou Zhiqiang and committed by
Scott Wood
fba4e9f9 fd5475a7

+43 -43
+1 -1
arch/powerpc/boot/dts/fsl/b4qds.dtsi
··· 142 142 flash@0 { 143 143 #address-cells = <1>; 144 144 #size-cells = <1>; 145 - compatible = "sst,sst25wf040"; 145 + compatible = "sst,sst25wf040", "jedec,spi-nor"; 146 146 reg = <0>; 147 147 spi-max-frequency = <40000000>; /* input clock */ 148 148 };
+1 -1
arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi
··· 53 53 flash@0 { 54 54 #address-cells = <1>; 55 55 #size-cells = <1>; 56 - compatible = "spansion,s25sl12801"; 56 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 57 57 reg = <0>; 58 58 spi-max-frequency = <50000000>; 59 59
+1 -1
arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi
··· 55 55 flash@0 { 56 56 #address-cells = <1>; 57 57 #size-cells = <1>; 58 - compatible = "spansion,s25sl12801"; 58 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 59 59 reg = <0>; 60 60 spi-max-frequency = <30000000>; 61 61 };
+1 -1
arch/powerpc/boot/dts/fsl/c293pcie.dts
··· 167 167 flash@0 { 168 168 #address-cells = <1>; 169 169 #size-cells = <1>; 170 - compatible = "spansion,s25sl12801"; 170 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 171 171 reg = <0>; 172 172 spi-max-frequency = <50000000>; 173 173
+2 -2
arch/powerpc/boot/dts/fsl/kmcoge4.dts
··· 63 63 flash@0 { 64 64 #address-cells = <1>; 65 65 #size-cells = <1>; 66 - compatible = "spansion,s25fl256s1"; 66 + compatible = "spansion,s25fl256s1", "jedec,spi-nor"; 67 67 reg = <0>; 68 68 spi-max-frequency = <20000000>; /* input clock */ 69 69 }; ··· 77 77 flash@2 { 78 78 #address-cells = <1>; 79 79 #size-cells = <1>; 80 - compatible = "micron,m25p32"; 80 + compatible = "micron,m25p32", "jedec,spi-nor"; 81 81 reg = <2>; 82 82 spi-max-frequency = <15000000>; 83 83 };
+4 -4
arch/powerpc/boot/dts/fsl/mpc8536ds.dtsi
··· 142 142 flash@0 { 143 143 #address-cells = <1>; 144 144 #size-cells = <1>; 145 - compatible = "spansion,s25sl12801"; 145 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 146 146 reg = <0>; 147 147 spi-max-frequency = <40000000>; 148 148 partition@u-boot { ··· 166 166 }; 167 167 }; 168 168 flash@1 { 169 - compatible = "spansion,s25sl12801"; 169 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 170 170 reg = <1>; 171 171 spi-max-frequency = <40000000>; 172 172 }; 173 173 flash@2 { 174 - compatible = "spansion,s25sl12801"; 174 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 175 175 reg = <2>; 176 176 spi-max-frequency = <40000000>; 177 177 }; 178 178 flash@3 { 179 - compatible = "spansion,s25sl12801"; 179 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 180 180 reg = <3>; 181 181 spi-max-frequency = <40000000>; 182 182 };
+2 -2
arch/powerpc/boot/dts/fsl/mvme2500.dts
··· 70 70 fsl,espi-num-chipselects = <2>; 71 71 72 72 flash@0 { 73 - compatible = "atmel,at25df641"; 73 + compatible = "atmel,at25df641", "jedec,spi-nor"; 74 74 reg = <0>; 75 75 spi-max-frequency = <10000000>; 76 76 }; 77 77 flash@1 { 78 - compatible = "atmel,at25df641"; 78 + compatible = "atmel,at25df641", "jedec,spi-nor"; 79 79 reg = <1>; 80 80 spi-max-frequency = <10000000>; 81 81 };
+1 -1
arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
··· 110 110 flash@0 { 111 111 #address-cells = <1>; 112 112 #size-cells = <1>; 113 - compatible = "spansion,s25sl12801"; 113 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 114 114 reg = <0>; 115 115 spi-max-frequency = <40000000>; 116 116
+1 -1
arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
··· 151 151 flash@0 { 152 152 #address-cells = <1>; 153 153 #size-cells = <1>; 154 - compatible = "spansion,s25sl12801"; 154 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 155 155 reg = <0>; 156 156 spi-max-frequency = <40000000>; /* input clock */ 157 157
+1 -1
arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts
··· 155 155 flash@0 { 156 156 #address-cells = <1>; 157 157 #size-cells = <1>; 158 - compatible = "spansion,s25sl12801"; 158 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 159 159 reg = <0>; 160 160 /* input clock */ 161 161 spi-max-frequency = <40000000>;
+1 -1
arch/powerpc/boot/dts/fsl/p1020rdb.dtsi
··· 148 148 flash@0 { 149 149 #address-cells = <1>; 150 150 #size-cells = <1>; 151 - compatible = "spansion,s25sl12801"; 151 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 152 152 reg = <0>; 153 153 spi-max-frequency = <40000000>; /* input clock */ 154 154
+1 -1
arch/powerpc/boot/dts/fsl/p1021mds.dts
··· 123 123 flash@0 { 124 124 #address-cells = <1>; 125 125 #size-cells = <1>; 126 - compatible = "spansion,s25sl12801"; 126 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 127 127 reg = <0>; 128 128 spi-max-frequency = <40000000>; /* input clock */ 129 129
+1 -1
arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi
··· 150 150 flash@0 { 151 151 #address-cells = <1>; 152 152 #size-cells = <1>; 153 - compatible = "spansion,s25sl12801"; 153 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 154 154 reg = <0>; 155 155 spi-max-frequency = <40000000>; /* input clock */ 156 156
+1 -1
arch/powerpc/boot/dts/fsl/p1022ds.dtsi
··· 160 160 flash@0 { 161 161 #address-cells = <1>; 162 162 #size-cells = <1>; 163 - compatible = "spansion,s25sl12801"; 163 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 164 164 reg = <0>; 165 165 spi-max-frequency = <40000000>; /* input clock */ 166 166
+1 -1
arch/powerpc/boot/dts/fsl/p1022rdk.dts
··· 86 86 flash@0 { 87 87 #address-cells = <1>; 88 88 #size-cells = <1>; 89 - compatible = "spansion,m25p80"; 89 + compatible = "spansion,m25p80", "jedec,spi-nor"; 90 90 reg = <0>; 91 91 spi-max-frequency = <1000000>; 92 92 partition@0 {
+1 -1
arch/powerpc/boot/dts/fsl/p1024rdb.dtsi
··· 129 129 flash@0 { 130 130 #address-cells = <1>; 131 131 #size-cells = <1>; 132 - compatible = "spansion,m25p80"; 132 + compatible = "spansion,m25p80", "jedec,spi-nor"; 133 133 reg = <0>; 134 134 spi-max-frequency = <40000000>; 135 135
+1 -1
arch/powerpc/boot/dts/fsl/p1025rdb.dtsi
··· 137 137 flash@0 { 138 138 #address-cells = <1>; 139 139 #size-cells = <1>; 140 - compatible = "spansion,s25sl12801"; 140 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 141 141 reg = <0>; 142 142 spi-max-frequency = <40000000>; /* input clock */ 143 143
+1 -1
arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi
··· 151 151 flash@0 { 152 152 #address-cells = <1>; 153 153 #size-cells = <1>; 154 - compatible = "spansion,m25p80"; 154 + compatible = "spansion,m25p80", "jedec,spi-nor"; 155 155 reg = <0>; 156 156 spi-max-frequency = <40000000>; 157 157
+1 -1
arch/powerpc/boot/dts/fsl/p2020rdb.dts
··· 155 155 flash@0 { 156 156 #address-cells = <1>; 157 157 #size-cells = <1>; 158 - compatible = "spansion,s25sl12801"; 158 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 159 159 reg = <0>; 160 160 spi-max-frequency = <40000000>; 161 161
+1 -1
arch/powerpc/boot/dts/fsl/p2041rdb.dts
··· 96 96 flash@0 { 97 97 #address-cells = <1>; 98 98 #size-cells = <1>; 99 - compatible = "spansion,s25sl12801"; 99 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 100 100 reg = <0>; 101 101 spi-max-frequency = <40000000>; /* input clock */ 102 102 partition@u-boot {
+1 -1
arch/powerpc/boot/dts/fsl/p3041ds.dts
··· 97 97 flash@0 { 98 98 #address-cells = <1>; 99 99 #size-cells = <1>; 100 - compatible = "spansion,s25sl12801"; 100 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 101 101 reg = <0>; 102 102 spi-max-frequency = <35000000>; /* input clock */ 103 103 partition@u-boot {
+1 -1
arch/powerpc/boot/dts/fsl/p4080ds.dts
··· 98 98 flash@0 { 99 99 #address-cells = <1>; 100 100 #size-cells = <1>; 101 - compatible = "spansion,s25sl12801"; 101 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 102 102 reg = <0>; 103 103 spi-max-frequency = <40000000>; /* input clock */ 104 104 partition@u-boot {
+1 -1
arch/powerpc/boot/dts/fsl/p5020ds.dts
··· 97 97 flash@0 { 98 98 #address-cells = <1>; 99 99 #size-cells = <1>; 100 - compatible = "spansion,s25sl12801"; 100 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 101 101 reg = <0>; 102 102 spi-max-frequency = <40000000>; /* input clock */ 103 103 partition@u-boot {
+1 -1
arch/powerpc/boot/dts/fsl/p5040ds.dts
··· 109 109 flash@0 { 110 110 #address-cells = <1>; 111 111 #size-cells = <1>; 112 - compatible = "spansion,s25sl12801"; 112 + compatible = "spansion,s25sl12801", "jedec,spi-nor"; 113 113 reg = <0>; 114 114 spi-max-frequency = <40000000>; /* input clock */ 115 115 partition@u-boot {
+1 -1
arch/powerpc/boot/dts/fsl/t1023rdb.dts
··· 79 79 flash@0 { 80 80 #address-cells = <1>; 81 81 #size-cells = <1>; 82 - compatible = "spansion,s25fl512s"; 82 + compatible = "spansion,s25fl512s", "jedec,spi-nor"; 83 83 reg = <0>; 84 84 spi-max-frequency = <10000000>; /* input clk */ 85 85 };
+3 -3
arch/powerpc/boot/dts/fsl/t1024qds.dts
··· 87 87 flash@0 { 88 88 #address-cells = <1>; 89 89 #size-cells = <1>; 90 - compatible = "micron,n25q128a11"; /* 16MB */ 90 + compatible = "micron,n25q128a11", "jedec,spi-nor"; /* 16MB */ 91 91 reg = <0>; 92 92 spi-max-frequency = <10000000>; 93 93 }; ··· 95 95 flash@1 { 96 96 #address-cells = <1>; 97 97 #size-cells = <1>; 98 - compatible = "sst,sst25wf040"; /* 512KB */ 98 + compatible = "sst,sst25wf040", "jedec,spi-nor"; /* 512KB */ 99 99 reg = <1>; 100 100 spi-max-frequency = <10000000>; 101 101 }; ··· 103 103 flash@2 { 104 104 #address-cells = <1>; 105 105 #size-cells = <1>; 106 - compatible = "eon,en25s64"; /* 8MB */ 106 + compatible = "eon,en25s64", "jedec,spi-nor"; /* 8MB */ 107 107 reg = <2>; 108 108 spi-max-frequency = <10000000>; 109 109 };
+1 -1
arch/powerpc/boot/dts/fsl/t1024rdb.dts
··· 89 89 flash@0 { 90 90 #address-cells = <1>; 91 91 #size-cells = <1>; 92 - compatible = "micron,n25q512ax3"; 92 + compatible = "micron,n25q512ax3", "jedec,spi-nor"; 93 93 reg = <0>; 94 94 spi-max-frequency = <10000000>; /* input clk */ 95 95 };
+1 -1
arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi
··· 104 104 flash@0 { 105 105 #address-cells = <1>; 106 106 #size-cells = <1>; 107 - compatible = "micron,n25q512ax3"; 107 + compatible = "micron,n25q512ax3", "jedec,spi-nor"; 108 108 reg = <0>; 109 109 /* input clock */ 110 110 spi-max-frequency = <10000000>;
+1 -1
arch/powerpc/boot/dts/fsl/t104xqds.dtsi
··· 261 261 flash@0 { 262 262 #address-cells = <1>; 263 263 #size-cells = <1>; 264 - compatible = "micron,n25q128a11"; 264 + compatible = "micron,n25q128a11", "jedec,spi-nor"; 265 265 reg = <0>; 266 266 spi-max-frequency = <10000000>; /* input clock */ 267 267 };
+1 -1
arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
··· 109 109 flash@0 { 110 110 #address-cells = <1>; 111 111 #size-cells = <1>; 112 - compatible = "micron,n25q512a"; 112 + compatible = "micron,n25q512a", "jedec,spi-nor"; 113 113 reg = <0>; 114 114 spi-max-frequency = <10000000>; /* input clock */ 115 115 };
+3 -3
arch/powerpc/boot/dts/fsl/t208xqds.dtsi
··· 112 112 flash@0 { 113 113 #address-cells = <1>; 114 114 #size-cells = <1>; 115 - compatible = "micron,n25q128a11"; /* 16MB */ 115 + compatible = "micron,n25q128a11", "jedec,spi-nor"; /* 16MB */ 116 116 reg = <0>; 117 117 spi-max-frequency = <40000000>; /* input clock */ 118 118 }; ··· 120 120 flash@1 { 121 121 #address-cells = <1>; 122 122 #size-cells = <1>; 123 - compatible = "sst,sst25wf040"; 123 + compatible = "sst,sst25wf040", "jedec,spi-nor"; 124 124 reg = <1>; 125 125 spi-max-frequency = <35000000>; 126 126 }; ··· 128 128 flash@2 { 129 129 #address-cells = <1>; 130 130 #size-cells = <1>; 131 - compatible = "eon,en25s64"; 131 + compatible = "eon,en25s64", "jedec,spi-nor"; 132 132 reg = <2>; 133 133 spi-max-frequency = <35000000>; 134 134 };
+1 -1
arch/powerpc/boot/dts/fsl/t208xrdb.dtsi
··· 113 113 flash@0 { 114 114 #address-cells = <1>; 115 115 #size-cells = <1>; 116 - compatible = "micron,n25q512a"; 116 + compatible = "micron,n25q512a", "jedec,spi-nor"; 117 117 reg = <0>; 118 118 spi-max-frequency = <10000000>; /* input clock */ 119 119 };
+1 -1
arch/powerpc/boot/dts/fsl/t4240qds.dts
··· 358 358 flash@0 { 359 359 #address-cells = <1>; 360 360 #size-cells = <1>; 361 - compatible = "sst,sst25wf040"; 361 + compatible = "sst,sst25wf040", "jedec,spi-nor"; 362 362 reg = <0>; 363 363 spi-max-frequency = <40000000>; /* input clock */ 364 364 };
+1 -1
arch/powerpc/boot/dts/fsl/t4240rdb.dts
··· 118 118 flash@0 { 119 119 #address-cells = <1>; 120 120 #size-cells = <1>; 121 - compatible = "sst,sst25wf040"; 121 + compatible = "sst,sst25wf040", "jedec,spi-nor"; 122 122 reg = <0>; 123 123 spi-max-frequency = <40000000>; /* input clock */ 124 124 };