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

The x86 code and DT uses "spi-flash" to detect a flash node, switch to
"jedec,spi-nor" in the DTS files and in fdtdec by switching the
GENERIC_SPI_FLASH value to to jedec,spi-nor.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>

diff --git a/arch/x86/dts/bayleybay.dts b/arch/x86/dts/bayleybay.dts
index 291dc07ff601174d6a41f87b24801e94614c49c3..d0168e88dbd8d84f0c056c13950a2e6d6ed081f3 100644 (file)
--- a/arch/x86/dts/bayleybay.dts
+++ b/arch/x86/dts/bayleybay.dts
@@ -175,7 +175,7 @@
                                        #size-cells = <1>;
                                        reg = <0>;
                                        compatible = "winbond,w25q64dw",
-                                               "spi-flash";
+                                               "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";

diff --git a/arch/x86/dts/baytrail_som-db5800-som-6867.dts b/arch/x86/dts/baytrail_som-db5800-som-6867.dts
index 4e8a761ce87a1bfd3c6009fd32e6bc0c014a7876..5abbc66ce98523fad0140fad45b17db69fccea88 100644 (file)
--- a/arch/x86/dts/baytrail_som-db5800-som-6867.dts
+++ b/arch/x86/dts/baytrail_som-db5800-som-6867.dts
@@ -199,7 +199,7 @@
                                        #size-cells = <1>;
                                        reg = <0>;
                                        compatible = "macronix,mx25l6405d",
-                                               "spi-flash";
+                                               "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";

diff --git a/arch/x86/dts/cherryhill.dts b/arch/x86/dts/cherryhill.dts
index 39e2d2fa4b222feb43194b31b296edb90b5c84d0..37146fde2ba93aff7b03f94e52930b8ed90fe23d 100644 (file)
--- a/arch/x86/dts/cherryhill.dts
+++ b/arch/x86/dts/cherryhill.dts
@@ -147,7 +147,7 @@
                                        #address-cells = <1>;
                                        #size-cells = <1>;
                                        reg = <0>;
-                                       compatible = "macronix,mx25u6435f", "spi-flash";
+                                       compatible = "macronix,mx25u6435f", "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";

diff --git a/arch/x86/dts/chromebook_link.dts b/arch/x86/dts/chromebook_link.dts
index c5653feac7241eb83eec7132bd65485bf2441310..09488f13b583e9d6182e0ad4ae0d2dee8e0019e1 100644 (file)
--- a/arch/x86/dts/chromebook_link.dts
+++ b/arch/x86/dts/chromebook_link.dts
@@ -429,7 +429,7 @@
                                        u-boot,dm-pre-reloc;
                                        reg = <0>;
                                        compatible = "winbond,w25q64",
-                                                       "spi-flash";
+                                                       "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";

diff --git a/arch/x86/dts/chromebook_samus.dts b/arch/x86/dts/chromebook_samus.dts
index ad687ce2cc3511816cb1728f8e0ae8a628597353..35211ed81b19005026e374b12dc5e5238e68d33b 100644 (file)
--- a/arch/x86/dts/chromebook_samus.dts
+++ b/arch/x86/dts/chromebook_samus.dts
@@ -567,7 +567,7 @@
                                        #address-cells = <1>;
                                        reg = <0>;
                                        compatible = "winbond,w25q64",
-                                                       "spi-flash";
+                                                       "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";

diff --git a/arch/x86/dts/chromebox_panther.dts b/arch/x86/dts/chromebox_panther.dts
index f56e482944bc3514ea6014fc0d81ebd3fba56477..bcd4c4d9c1bd25efa20b0798ff13882da511296e 100644 (file)
--- a/arch/x86/dts/chromebox_panther.dts
+++ b/arch/x86/dts/chromebox_panther.dts
@@ -47,7 +47,7 @@
                                        #address-cells = <1>;
                                        reg = <0>;
                                        compatible = "winbond,w25q64",
-                                               "spi-flash";
+                                               "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";

diff --git a/arch/x86/dts/conga-qeval20-qa3-e3845.dts b/arch/x86/dts/conga-qeval20-qa3-e3845.dts
index 5884dbc277d36e0507105d287e8d8d7dfaac4a05..70b8c045193c47254e5dbbfd29f7835eda493776 100644 (file)
--- a/arch/x86/dts/conga-qeval20-qa3-e3845.dts
+++ b/arch/x86/dts/conga-qeval20-qa3-e3845.dts
@@ -186,7 +186,7 @@
                                        #size-cells = <1>;
                                        reg = <0>;
                                        compatible = "stmicro,n25q064a",
-                                               "spi-flash";
+                                               "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";

diff --git a/arch/x86/dts/cougarcanyon2.dts b/arch/x86/dts/cougarcanyon2.dts
index 9801790083f9a9d54ef0c680d367ffacf70e4d1e..c6ba811e059e58b5a1594174db83c7e912035f17 100644 (file)
--- a/arch/x86/dts/cougarcanyon2.dts
+++ b/arch/x86/dts/cougarcanyon2.dts
@@ -154,7 +154,7 @@
 
                                spi-flash@0 {
                                        reg = <0>;
-                                       compatible = "winbond,w25q64bv", "spi-flash";
+                                       compatible = "winbond,w25q64bv", "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                };
                        };

diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts
index 8938a94e7707c2c503cce2d533d7877ff4b47df1..f492c35875b65c39a43e155b0b449da8ecd54a4e 100644 (file)
--- a/arch/x86/dts/crownbay.dts
+++ b/arch/x86/dts/crownbay.dts
@@ -224,7 +224,7 @@
                                spi-flash@0 {
                                        reg = <0>;
                                        compatible = "sst,25vf016b",
-                                               "spi-flash";
+                                               "jedec,spi-nor";
                                        memory-map = <0xffe00000 0x00200000>;
                                };
                        };

diff --git a/arch/x86/dts/dfi-bt700.dtsi b/arch/x86/dts/dfi-bt700.dtsi
index 51d33e772fc8da8bee59b6127b32aeae7a5c50cf..e9930cb04363e2440245d693f618664eda29169f 100644 (file)
--- a/arch/x86/dts/dfi-bt700.dtsi
+++ b/arch/x86/dts/dfi-bt700.dtsi
@@ -197,7 +197,7 @@
                                        #size-cells = <1>;
                                        reg = <0>;
                                        compatible = "stmicro,n25q064a",
-                                               "spi-flash";
+                                               "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";

diff --git a/arch/x86/dts/galileo.dts b/arch/x86/dts/galileo.dts
index 3a5d168268d43e08dba0f7d5899898183e3ad3ef..5de4568679a46d0c5a3b001d0050d45f6f34d77e 100644 (file)
--- a/arch/x86/dts/galileo.dts
+++ b/arch/x86/dts/galileo.dts
@@ -139,7 +139,7 @@
                                        #address-cells = <1>;
                                        reg = <0>;
                                        compatible = "winbond,w25q64",
-                                               "spi-flash";
+                                               "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";

diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts
index 6c65fb9611c2eaf35711f06d5e269cd103498c5b..f4cdb2c3cd2ca3707158ddc17ffbaef1fa30986e 100644 (file)
--- a/arch/x86/dts/minnowmax.dts
+++ b/arch/x86/dts/minnowmax.dts
@@ -199,7 +199,7 @@
                                        #size-cells = <1>;
                                        reg = <0>;
                                        compatible = "stmicro,n25q064a",
-                                               "spi-flash";
+                                               "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index a51dc5e98670ccf02883ef5ee03633c05db9cdf0..21f1eee92d3035689d954f59c3ab59da6572a576 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -45,7 +45,7 @@ static const char * const compat_names[COMPAT_COUNT] = {
        COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"),
        COMPAT(SAMSUNG_EXYNOS_MIPI_DSI, "samsung,exynos-mipi-dsi"),
        COMPAT(SAMSUNG_EXYNOS_DWMMC, "samsung,exynos-dwmmc"),
-       COMPAT(GENERIC_SPI_FLASH, "spi-flash"),
+       COMPAT(GENERIC_SPI_FLASH, "jedec,spi-nor"),
        COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
        COMPAT(INTEL_MICROCODE, "intel,microcode"),
        COMPAT(INTEL_QRK_MRC, "intel,quark-mrc"),