arm64: dts: layerscape: remove en25s64 and only keep jedec,spi-nor compatible string

In jedec,spi-nor.yaml:
  SPI NOR flashes compatible with the JEDEC SFDP standard or which may be
  identified with the READ ID opcode (0x9F) do not deserve a specific
  compatible. They should instead only be matched against the generic
  "jedec,spi-nor" compatible.

en25s64 already in drivers/mtd/spi-nor/eon.c. So remove it safely and fix
below warning:
  arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: flash@2: compatible: 'oneOf' conditional failed, one must be fixed:
        ['en25s64', 'jedec,spi-nor'] is too long

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
index bbdf989058ff7795f3ba514d667630f514bc8b53..ce59b94d8c2282e5c7eb2425a0921b80c9677809 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
@@ -87,7 +87,7 @@
        flash@2 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "en25s64", "jedec,spi-nor";
+               compatible = "jedec,spi-nor";
                spi-cpol;
                spi-cpha;
                reg = <2>;

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
index a1d9102ff32be97b0e3599545764a6cb36b0b997..736722b58e77f74b9a067a3e6e35b9dad19ad816 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
@@ -69,7 +69,7 @@
        flash@2 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "en25s64", "jedec,spi-nor";
+               compatible = "jedec,spi-nor";
                spi-cpol;
                spi-cpha;
                reg = <2>;