Commit ffd4c7c2 authored by Neil Armstrong's avatar Neil Armstrong Committed by Jagan Teki

dts: switch spi-flash to jedec, spi-nor compatible

There is no reason not to use the Linux "jedec,spi-nor" binding in U-Boot
dts files. This compatible has been added in sf_probe, let use it.

This patch switches to jedec,spi-nor when spi-flash is used in the DTS
and DTSI files, and removed spi-flash when jedec,spi-nor is already
present.

The x86 dts are switched in a separate commit since it depends on a change
in fdtdec.
Signed-off-by: Neil Armstrong's avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: Stefan Roese's avatarStefan Roese <sr@denx.de>
Reviewed-by: default avatarSimon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Reviewed-by: default avatarEvgeniy Paltsev <paltsev@synopsys.com>
Reviewed-by: Rick Chen's avatarRick Chen <rick@andestech.com>
Reviewed-by: Patrick Delaunay's avatarPatrick Delaunay <Patrick.delaunay@st.com>
Reviewed-by: default avatarJagan Teki <jagan@openedev.com>
parent a2dc8b18
......@@ -71,7 +71,7 @@
clock-names = "spi_clk";
cs-gpio = <&cs_gpio 0>;
spi_flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <4000000>;
};
......
......@@ -96,7 +96,7 @@
clock-names = "spi_clk";
cs-gpio = <&cs_gpio 0>;
spi_flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <4000000>;
};
......
......@@ -169,7 +169,7 @@
spi_flash: spiflash@0 {
u-boot,dm-spl;
u-boot,dm-pre-reloc;
compatible = "spidev", "spi-flash";
compatible = "spidev", "jedec,spi-nor";
spi-max-frequency = <24000000>;
reg = <0>;
};
......
......@@ -339,7 +339,7 @@
spi-max-frequency = <48000000>;
m25p80@0 {
compatible = "mx66l51235l", "spi-flash";
compatible = "mx66l51235l", "jedec,spi-nor";
spi-max-frequency = <48000000>;
reg = <0>;
spi-cpol;
......
......@@ -568,7 +568,7 @@
spi-max-frequency = <48000000>;
m25p80@0 {
compatible = "mx66l51235l","spi-flash";
compatible = "mx66l51235l","jedec,spi-nor";
spi-max-frequency = <48000000>;
reg = <0>;
spi-cpol;
......
......@@ -131,7 +131,7 @@
spi-flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,m25p128", "spi-flash";
compatible = "st,m25p128", "jedec,spi-nor";
reg = <0>; /* Chip select 0 */
spi-max-frequency = <50000000>;
m25p,fast-read;
......
......@@ -118,7 +118,7 @@
spi-flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,m25p128", "spi-flash";
compatible = "st,m25p128", "jedec,spi-nor";
reg = <0>; /* Chip select 0 */
spi-max-frequency = <50000000>;
m25p,fast-read;
......
......@@ -115,7 +115,7 @@
spi-flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,s25fl064l", "spi-flash";
compatible = "st,s25fl064l", "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <20000000>;
m25p,fast-read;
......
......@@ -154,7 +154,7 @@
u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,m25p128", "jedec,spi-nor", "spi-flash";
compatible = "st,m25p128", "jedec,spi-nor";
reg = <0>; /* Chip select 0 */
spi-max-frequency = <50000000>;
m25p,fast-read;
......
......@@ -42,7 +42,7 @@
u-boot,dm-pre-reloc;
spi-flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <40000000>;
u-boot,dm-pre-reloc;
......
......@@ -573,14 +573,14 @@
spi-flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q016a", "spi-flash";
compatible = "n25q016a", "jedec,spi-nor";
reg = <0>; /* Chip select 0 */
spi-max-frequency = <108000000>;
};
spi-flash@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q128a11", "spi-flash";
compatible = "n25q128a11", "jedec,spi-nor";
reg = <1>; /* Chip select 1 */
spi-max-frequency = <108000000>;
u-boot,dm-pre-reloc;
......
......@@ -86,7 +86,7 @@
w25q32: spi-flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "w25q32", "jedec,spi-nor", "spi-flash";
compatible = "w25q32", "jedec,spi-nor";
reg = <0>; /* Chip select 0 */
spi-max-frequency = <3000000>;
status = "disabled";
......
......@@ -240,7 +240,7 @@
status = "okay";
spi-flash@0 {
compatible = "jedec,spi-nor", "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
......
......@@ -134,7 +134,7 @@
u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q128a13", "jedec,spi-nor", "spi-flash";
compatible = "n25q128a13", "jedec,spi-nor";
reg = <0>; /* Chip select 0 */
spi-max-frequency = <27777777>;
};
......
......@@ -110,7 +110,7 @@
u-boot,dm-pre-reloc;
spi_flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
u-boot,dm-pre-reloc;
......
......@@ -117,7 +117,7 @@
status = "okay";
spi_flash@0 {
u-boot,dm-pre-reloc;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
};
......
......@@ -137,7 +137,7 @@
status = "okay";
spi_flash@0 {
u-boot,dm-pre-reloc;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
};
......
......@@ -112,7 +112,7 @@
status = "okay";
cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
spi_flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
};
......
......@@ -121,7 +121,7 @@
status = "okay";
cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
spi_flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
};
......
......@@ -32,7 +32,7 @@
qflash0: spi_flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <108000000>;
reg = <0>;
};
......@@ -40,7 +40,7 @@
qflash1: spi_flash@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <66000000>;
reg = <1>;
};
......
......@@ -7,5 +7,5 @@
*/
&flash {
compatible = "m25p64", "spi-flash";
compatible = "m25p64", "jedec,spi-nor";
};
......@@ -232,7 +232,7 @@
spi@12d30000 {
spi-max-frequency = <50000000>;
firmware_storage_spi: flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
};
};
......
......@@ -149,7 +149,7 @@
spi@12d30000 {
spi-max-frequency = <50000000>;
firmware_storage_spi: flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
};
};
......
......@@ -257,7 +257,7 @@
spi@12d30000 { /* spi1 */
spi-max-frequency = <50000000>;
firmware_storage_spi: flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
/*
......
......@@ -27,7 +27,7 @@
qflash0: s25fl128s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
};
......
......@@ -21,7 +21,7 @@
qflash0: s25fl128s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
};
......
......@@ -28,7 +28,7 @@
qflash0: w25q16dw@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
};
......
......@@ -20,7 +20,7 @@
dflash0: n25q128a {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <1000000>; /* input clock */
};
......@@ -28,7 +28,7 @@
dflash1: sst25wf040b {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3500000>;
reg = <1>;
};
......@@ -36,7 +36,7 @@
dflash2: en25s64 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3500000>;
reg = <2>;
};
......@@ -49,7 +49,7 @@
qflash0: s25fl128s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
};
......
......@@ -21,7 +21,7 @@
qflash0: s25fl128s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
};
......
......@@ -24,7 +24,7 @@
dflash0: n25q128a {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <1000000>; /* input clock */
spi-cpol;
spi-cpha;
......@@ -34,7 +34,7 @@
dflash1: sst25wf040b {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3500000>;
spi-cpol;
spi-cpha;
......@@ -44,7 +44,7 @@
dflash2: en25s64 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3500000>;
spi-cpol;
spi-cpha;
......@@ -59,7 +59,7 @@
qflash0: s25fl128s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
};
......
......@@ -26,7 +26,7 @@
dspiflash: n25q12a {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <1000000>; /* input clock */
};
......
......@@ -24,7 +24,7 @@
dflash0: n25q128a {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <1000000>; /* input clock */
spi-cpol;
spi-cpha;
......@@ -34,7 +34,7 @@
dflash1: sst25wf040b {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3500000>;
spi-cpol;
spi-cpha;
......@@ -44,7 +44,7 @@
dflash2: en25s64 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3500000>;
spi-cpol;
spi-cpha;
......@@ -59,7 +59,7 @@
qflash0: s25fl128s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
};
......
......@@ -26,7 +26,7 @@
qflash0: s25fs512s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
};
......@@ -34,7 +34,7 @@
qflash1: s25fs512s@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <1>;
};
......
......@@ -62,7 +62,7 @@
dflash0: n25q128a {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <1000000>; /* input clock */
};
......@@ -70,7 +70,7 @@
dflash1: sst25wf040b {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3500000>;
reg = <1>;
};
......@@ -78,7 +78,7 @@
dflash2: en25s64 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3500000>;
reg = <2>;
};
......@@ -91,7 +91,7 @@
qflash0: s25fs512s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
};
......@@ -99,7 +99,7 @@
qflash1: s25fs512s@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <1>;
};
......
......@@ -24,7 +24,7 @@
qflash0: s25fs512s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
};
......@@ -32,7 +32,7 @@
qflash1: s25fs512s@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <1>;
};
......
......@@ -26,7 +26,7 @@
dflash0: n25q128a {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3000000>;
spi-cpol;
spi-cpha;
......@@ -35,7 +35,7 @@
dflash1: sst25wf040b {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3000000>;
spi-cpol;
spi-cpha;
......@@ -44,7 +44,7 @@
dflash2: en25s64 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3000000>;
spi-cpol;
spi-cpha;
......@@ -59,7 +59,7 @@
qflash0: s25fs256s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
};
......
......@@ -25,7 +25,7 @@
dflash0: n25q512a {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3000000>;
spi-cpol;
spi-cpha;
......
......@@ -28,7 +28,7 @@
dflash0: n25q512a {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3000000>;
spi-cpol;
spi-cpha;
......@@ -43,7 +43,7 @@
qflash0: s25fs512s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
};
......@@ -51,7 +51,7 @@
qflash1: s25fs512s@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <1>;
};
......
......@@ -28,7 +28,7 @@
dflash0: n25q512a {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <3000000>;
spi-cpol;
spi-cpha;
......@@ -43,7 +43,7 @@
qflash0: s25fs512s@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
};
......@@ -51,7 +51,7 @@
qflash1: s25fs512s@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <1>;
};
......
......@@ -7,10 +7,10 @@
num-cs = <2>;
flash0: n25q256a@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
};
flash1: n25q256a@1 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
};
};
......@@ -7,10 +7,10 @@
num-cs = <2>;
flash0: n25q256a@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
};
flash1: n25q256a@1 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
};
};
......@@ -5,6 +5,6 @@
&qspi {
flash0: n25q256a@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
};
};
\ No newline at end of file
......@@ -5,6 +5,6 @@
&qspi {
flash0: n25q256a@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
};
};
\ No newline at end of file
......@@ -455,7 +455,7 @@
#address-cells = <1>;
#size-cells = <1>;
/* compatible = "micron,n25q256a"; */
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <29000000>;
spi-nor,ddr-quad-read-dummy = <6>;
reg = <0>;
......
......@@ -5,6 +5,6 @@
&qspi1 {
flash0: mx25l51245g@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
};
};
......@@ -123,7 +123,7 @@
nor_flash: n25q128a11@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "Micron,n25q128a11", "spi-flash";
compatible = "Micron,n25q128a11", "jedec,spi-nor";
spi-max-frequency = <54000000>;
m25p,fast-read;
reg = <0>;
......
......@@ -75,7 +75,7 @@
spi_nor: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
m25p,fast-read;
reg = <0>;
......@@ -97,7 +97,7 @@
status = "okay";