| Message ID | 20241023201129.1382895-1-Frank.Li@nxp.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v1,1/1] arm64: dts: layerscape: remove en25s64 and only keep jedec,spi-nor compatible string | expand |
On Wed, Oct 23, 2024 at 04:11:28PM -0400, Frank Li wrote: > 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> Applied, thanks!
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts index bbdf989058ff7..ce59b94d8c228 100644 --- 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@1 { 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 a1d9102ff32be..736722b58e77f 100644 --- 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@1 { flash@2 { #address-cells = <1>; #size-cells = <1>; - compatible = "en25s64", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; spi-cpol; spi-cpha; reg = <2>;
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> --- arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)