spi-flash: switch to "jedec, spi-nor" binding
Subsystems (13)
v2 cover spi-flash: switch to "jedec, spi-nor" binding
There is no reason not to use the Linux "jedec,spi-nor" binding in u-boot. This patchset :
- adds this compatible into sf_probe and will avoid changing the device tree files to add a u-boot specific compatible to probe a spi flash.
- switches all DTS/DTSI files to "jedec,spi-nor"
- remove the "spi-flash" compatible from sf-probe
- switch GENERIC_SPI_FLASH to jedec,spi-nor in fdtdec
- switches dt bindings examples files to "jedec,spi-nor"
Neil Armstrong (5):
mtd: sf_probe: add jedec,spi-nor compatible
dts: switch spi-flash to jedec,spi-nor compatible
mtd: sf_probe: remove spi-flash compatible
fdtdec: switch GENERIC_SPI_FLASH to jedec,spi-nor
doc: device-tree-bindings: switch from spi-flash to jedec,spi-nor
arch/arc/dts/axs10x_mb.dtsi | 2 +- arch/arc/dts/hsdk.dts | 2 +- arch/arm/dts/am335x-brppt1-spi.dts | 2 +- arch/arm/dts/am437x-idk-evm.dts | 2 +- arch/arm/dts/am437x-sk-evm.dts | 2 +- arch/arm/dts/armada-3720-db.dts | 2 +- arch/arm/dts/armada-3720-espressobin.dts | 2 +- arch/arm/dts/armada-3720-turris-mox.dts | 2 +- arch/arm/dts/armada-385-amc.dts | 2 +- arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +- arch/arm/dts/armada-38x-controlcenterdc.dts | 4 ++-- arch/arm/dts/armada-38x-solidrun-microsom.dtsi | 2 +- arch/arm/dts/armada-8040-clearfog-gt-8k.dts | 2 +- arch/arm/dts/armada-xp-theadorable.dts | 2 +- arch/arm/dts/at91-sama5d2_xplained.dts | 2 +- arch/arm/dts/at91-sama5d4_xplained.dts | 2 +- arch/arm/dts/at91-sama5d4ek.dts | 2 +- arch/arm/dts/at91sam9n12ek.dts | 2 +- arch/arm/dts/at91sam9x5ek.dtsi | 2 +- arch/arm/dts/bk4r1.dts | 4 ++-- arch/arm/dts/da850-evm-u-boot.dtsi | 2 +- arch/arm/dts/exynos5250-snow.dts | 2 +- arch/arm/dts/exynos5250-spring.dts | 2 +- arch/arm/dts/exynos5420-peach-pit.dts | 2 +- arch/arm/dts/fsl-ls1012a-2g5rdb.dts | 2 +- arch/arm/dts/fsl-ls1012a-frdm.dtsi | 2 +- arch/arm/dts/fsl-ls1012a-frwy.dts | 2 +- arch/arm/dts/fsl-ls1012a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1012a-rdb.dtsi | 2 +- arch/arm/dts/fsl-ls1043a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1043a-rdb.dts | 2 +- arch/arm/dts/fsl-ls1046a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1046a-rdb.dts | 4 ++-- arch/arm/dts/fsl-ls1088a-qds.dts | 10 +++++----- arch/arm/dts/fsl-ls1088a-rdb.dts | 4 ++-- arch/arm/dts/fsl-ls2080a-qds.dts | 8 ++++---- arch/arm/dts/fsl-ls2080a-rdb.dts | 2 +- arch/arm/dts/fsl-ls2081a-rdb.dts | 6 +++--- arch/arm/dts/fsl-ls2088a-rdb-qspi.dts | 6 +++--- arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6sx-sdb-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ull-14x14-evk.dts | 2 +- arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi | 2 +- arch/arm/dts/keystone-k2e-evm.dts | 2 +- arch/arm/dts/keystone-k2g-evm.dts | 4 ++-- arch/arm/dts/keystone-k2g-ice.dts | 2 +- arch/arm/dts/keystone-k2hk-evm.dts | 2 +- arch/arm/dts/keystone-k2l-evm.dts | 2 +- arch/arm/dts/kirkwood-atl-sbx81lifkw.dts | 2 +- arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts | 2 +- arch/arm/dts/kirkwood-dreamplug.dts | 2 +- arch/arm/dts/kirkwood-lsxl.dtsi | 2 +- arch/arm/dts/kirkwood-netxbig.dtsi | 2 +- arch/arm/dts/kirkwood-ns2-common.dtsi | 2 +- arch/arm/dts/kirkwood-synology.dtsi | 2 +- arch/arm/dts/ls1021a-iot.dtsi | 4 ++-- arch/arm/dts/ls1021a-qds.dtsi | 2 +- arch/arm/dts/ls1021a-twr.dtsi | 4 ++-- arch/arm/dts/mt7629-rfb.dts | 2 +- arch/arm/dts/omap5-u-boot.dtsi | 2 +- arch/arm/dts/r8a77970-eagle-u-boot.dts | 2 +- arch/arm/dts/rk3288-veyron.dtsi | 2 +- arch/arm/dts/rk3368-lion.dts | 2 +- arch/arm/dts/rk3399-puma.dtsi | 2 +- arch/arm/dts/rv1108-evb.dts | 2 +- arch/arm/dts/sama5d27_som1.dtsi | 2 +- arch/arm/dts/sama5d3xmb.dtsi | 2 +- arch/arm/dts/sama5d3xmb_cmp.dtsi | 2 +- arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_is1.dts | 2 +- arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 +- arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi | 4 ++-- arch/arm/dts/stm32f746-disco.dts | 2 +- arch/arm/dts/stm32f769-disco.dts | 2 +- arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 ++-- arch/arm/dts/stv0991.dts | 2 +- arch/arm/dts/zynq-zed.dts | 2 +- arch/arm/dts/zynqmp-zc1232-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1275-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1275-revB.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 2 +- arch/mips/dts/ap121.dts | 2 +- arch/mips/dts/ap143.dts | 2 +- arch/mips/dts/comtrend,ar-5315u.dts | 2 +- arch/mips/dts/comtrend,ar-5387un.dts | 2 +- arch/mips/dts/gardena-smart-gateway-mt7688.dts | 2 +- arch/mips/dts/linkit-smart-7688.dts | 2 +- arch/mips/dts/netgear,cg3100d.dts | 2 +- arch/mips/dts/sagem,f at st1704.dts | 2 +- arch/mips/dts/tplink_wdr4300.dts | 2 +- arch/nds32/dts/ae3xx.dts | 2 +- arch/riscv/dts/ae350.dts | 2 +- arch/riscv/dts/ae350_32.dts | 2 +- arch/riscv/dts/ae350_64.dts | 2 +- arch/sandbox/dts/test.dts | 2 +- arch/x86/dts/bayleybay.dts | 2 +- arch/x86/dts/baytrail_som-db5800-som-6867.dts | 2 +- arch/x86/dts/cherryhill.dts | 2 +- arch/x86/dts/chromebook_link.dts | 2 +- arch/x86/dts/chromebook_samus.dts | 2 +- arch/x86/dts/chromebox_panther.dts | 2 +- arch/x86/dts/conga-qeval20-qa3-e3845.dts | 2 +- arch/x86/dts/cougarcanyon2.dts | 2 +- arch/x86/dts/crownbay.dts | 2 +- arch/x86/dts/dfi-bt700.dtsi | 2 +- arch/x86/dts/galileo.dts | 2 +- arch/x86/dts/minnowmax.dts | 2 +- .../pinctrl/atmel,at91-pio4-pinctrl.txt | 2 +- doc/device-tree-bindings/spi/spi-atcspi200.txt | 2 +- doc/device-tree-bindings/spi/spi-stm32-qspi.txt | 2 +- drivers/mtd/spi/sf_probe.c | 2 +- lib/fdtdec.c | 2 +- 124 files changed, 155 insertions(+), 155 deletions(-)
Signature · 1 line
2.19.2
PATCH v2 1/5 mtd: sf_probe: add jedec, spi-nor compatible
There is no reason not to use the Linux "jedec,spi-nor" binding in u-boot. This patch adds this compatible into sf_probe and will avoid changing the device tree files to add a u-boot specific compatible to probe a spi flash.
This change is needed to enable SPI NOR Flash support using the non-modified device tree file for Amlogic Meson GX SoC based boards.
--- drivers/mtd/spi/sf_probe.c | 1 + 1 file changed, 1 insertion(+)
drivers/mtd/spi/sf_probe.c +1 -0
@@ -161,6 +161,7 @@ static const struct dm_spi_flash_ops spi_flash_std_ops = {static const struct udevice_id spi_flash_std_ids[] = { { .compatible ="spi-flash" }, + { .compatible ="jedec,spi-nor" }, { } };
Signature · 1 line
2.19.2
PATCH v2 2/5 dts: switch spi-flash to jedec, spi-nor compatible
In reply to Neil ArmstrongThere 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.
--- arch/arc/dts/axs10x_mb.dtsi | 2 +- arch/arc/dts/hsdk.dts | 2 +- arch/arm/dts/am335x-brppt1-spi.dts | 2 +- arch/arm/dts/am437x-idk-evm.dts | 2 +- arch/arm/dts/am437x-sk-evm.dts | 2 +- arch/arm/dts/armada-3720-db.dts | 2 +- arch/arm/dts/armada-3720-espressobin.dts | 2 +- arch/arm/dts/armada-3720-turris-mox.dts | 2 +- arch/arm/dts/armada-385-amc.dts | 2 +- arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +- arch/arm/dts/armada-38x-controlcenterdc.dts | 4 ++-- arch/arm/dts/armada-38x-solidrun-microsom.dtsi | 2 +- arch/arm/dts/armada-8040-clearfog-gt-8k.dts | 2 +- arch/arm/dts/armada-xp-theadorable.dts | 2 +- arch/arm/dts/at91-sama5d2_xplained.dts | 2 +- arch/arm/dts/at91-sama5d4_xplained.dts | 2 +- arch/arm/dts/at91-sama5d4ek.dts | 2 +- arch/arm/dts/at91sam9n12ek.dts | 2 +- arch/arm/dts/at91sam9x5ek.dtsi | 2 +- arch/arm/dts/bk4r1.dts | 4 ++-- arch/arm/dts/da850-evm-u-boot.dtsi | 2 +- arch/arm/dts/exynos5250-snow.dts | 2 +- arch/arm/dts/exynos5250-spring.dts | 2 +- arch/arm/dts/exynos5420-peach-pit.dts | 2 +- arch/arm/dts/fsl-ls1012a-2g5rdb.dts | 2 +- arch/arm/dts/fsl-ls1012a-frdm.dtsi | 2 +- arch/arm/dts/fsl-ls1012a-frwy.dts | 2 +- arch/arm/dts/fsl-ls1012a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1012a-rdb.dtsi | 2 +- arch/arm/dts/fsl-ls1043a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1043a-rdb.dts | 2 +- arch/arm/dts/fsl-ls1046a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1046a-rdb.dts | 4 ++-- arch/arm/dts/fsl-ls1088a-qds.dts | 10 +++++----- arch/arm/dts/fsl-ls1088a-rdb.dts | 4 ++-- arch/arm/dts/fsl-ls2080a-qds.dts | 8 ++++---- arch/arm/dts/fsl-ls2080a-rdb.dts | 2 +- arch/arm/dts/fsl-ls2081a-rdb.dts | 6 +++--- arch/arm/dts/fsl-ls2088a-rdb-qspi.dts | 6 +++--- arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6sx-sdb-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ull-14x14-evk.dts | 2 +- arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi | 2 +- arch/arm/dts/keystone-k2e-evm.dts | 2 +- arch/arm/dts/keystone-k2g-evm.dts | 4 ++-- arch/arm/dts/keystone-k2g-ice.dts | 2 +- arch/arm/dts/keystone-k2hk-evm.dts | 2 +- arch/arm/dts/keystone-k2l-evm.dts | 2 +- arch/arm/dts/kirkwood-atl-sbx81lifkw.dts | 2 +- arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts | 2 +- arch/arm/dts/kirkwood-dreamplug.dts | 2 +- arch/arm/dts/kirkwood-lsxl.dtsi | 2 +- arch/arm/dts/kirkwood-netxbig.dtsi | 2 +- arch/arm/dts/kirkwood-ns2-common.dtsi | 2 +- arch/arm/dts/kirkwood-synology.dtsi | 2 +- arch/arm/dts/ls1021a-iot.dtsi | 4 ++-- arch/arm/dts/ls1021a-qds.dtsi | 2 +- arch/arm/dts/ls1021a-twr.dtsi | 4 ++-- arch/arm/dts/mt7629-rfb.dts | 2 +- arch/arm/dts/omap5-u-boot.dtsi | 2 +- arch/arm/dts/r8a77970-eagle-u-boot.dts | 2 +- arch/arm/dts/rk3288-veyron.dtsi | 2 +- arch/arm/dts/rk3368-lion.dts | 2 +- arch/arm/dts/rk3399-puma.dtsi | 2 +- arch/arm/dts/rv1108-evb.dts | 2 +- arch/arm/dts/sama5d27_som1.dtsi | 2 +- arch/arm/dts/sama5d3xmb.dtsi | 2 +- arch/arm/dts/sama5d3xmb_cmp.dtsi | 2 +- arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_is1.dts | 2 +- arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 +- arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi | 4 ++-- arch/arm/dts/stm32f746-disco.dts | 2 +- arch/arm/dts/stm32f769-disco.dts | 2 +- arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 ++-- arch/arm/dts/stv0991.dts | 2 +- arch/arm/dts/zynq-zed.dts | 2 +- arch/arm/dts/zynqmp-zc1232-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1275-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1275-revB.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 2 +- arch/mips/dts/ap121.dts | 2 +- arch/mips/dts/ap143.dts | 2 +- arch/mips/dts/comtrend,ar-5315u.dts | 2 +- arch/mips/dts/comtrend,ar-5387un.dts | 2 +- arch/mips/dts/gardena-smart-gateway-mt7688.dts | 2 +- arch/mips/dts/linkit-smart-7688.dts | 2 +- arch/mips/dts/netgear,cg3100d.dts | 2 +- arch/mips/dts/sagem,f at st1704.dts | 2 +- arch/mips/dts/tplink_wdr4300.dts | 2 +- arch/nds32/dts/ae3xx.dts | 2 +- arch/riscv/dts/ae350.dts | 2 +- arch/riscv/dts/ae350_32.dts | 2 +- arch/riscv/dts/ae350_64.dts | 2 +- arch/sandbox/dts/test.dts | 2 +- arch/x86/dts/bayleybay.dts | 2 +- arch/x86/dts/baytrail_som-db5800-som-6867.dts | 2 +- arch/x86/dts/cherryhill.dts | 2 +- arch/x86/dts/chromebook_link.dts | 2 +- arch/x86/dts/chromebook_samus.dts | 2 +- arch/x86/dts/chromebox_panther.dts | 2 +- arch/x86/dts/conga-qeval20-qa3-e3845.dts | 2 +- arch/x86/dts/cougarcanyon2.dts | 2 +- arch/x86/dts/crownbay.dts | 2 +- arch/x86/dts/dfi-bt700.dtsi | 2 +- arch/x86/dts/galileo.dts | 2 +- arch/x86/dts/minnowmax.dts | 2 +- 119 files changed, 150 insertions(+), 150 deletions(-)
arch/arc/dts/axs10x_mb.dtsi +1 -1
@@ -71,7 +71,7 @@ clock-names = "spi_clk"; cs-gpio = <&cs_gpio 0>; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <4000000>; };
arch/arc/dts/hsdk.dts +1 -1
@@ -96,7 +96,7 @@ clock-names = "spi_clk"; cs-gpio = <&cs_gpio 0>; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <4000000>; };
arch/arm/dts/am335x-brppt1-spi.dts +1 -1
@@ -169,7 +169,7 @@ spi_flash: spiflash at 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>; };
arch/arm/dts/am437x-idk-evm.dts +1 -1
@@ -341,7 +341,7 @@ spi-max-frequency = <48000000>; m25p80 at 0 { - compatible = "mx66l51235l", "spi-flash"; + compatible = "mx66l51235l", "jedec,spi-nor"; spi-max-frequency = <48000000>; reg = <0>; spi-cpol;
arch/arm/dts/am437x-sk-evm.dts +1 -1
@@ -568,7 +568,7 @@ spi-max-frequency = <48000000>; m25p80 at 0 { - compatible = "mx66l51235l","spi-flash"; + compatible = "mx66l51235l","jedec,spi-nor"; spi-max-frequency = <48000000>; reg = <0>; spi-cpol;
arch/arm/dts/armada-3720-db.dts +1 -1
@@ -131,7 +131,7 @@ spi-flash at 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;
arch/arm/dts/armada-3720-espressobin.dts +1 -1
@@ -118,7 +118,7 @@ spi-flash at 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;
arch/arm/dts/armada-3720-turris-mox.dts +1 -1
@@ -105,7 +105,7 @@ spi-flash at 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;
arch/arm/dts/armada-385-amc.dts +1 -1
@@ -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;
arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +1 -1
@@ -42,7 +42,7 @@ u-boot,dm-pre-reloc; spi-flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <40000000>; u-boot,dm-pre-reloc;
arch/arm/dts/armada-38x-controlcenterdc.dts +2 -2
@@ -92,14 +92,14 @@ spi-flash at 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 at 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;
arch/arm/dts/armada-38x-solidrun-microsom.dtsi +1 -1
@@ -86,7 +86,7 @@ w25q32: spi-flash at 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";
arch/arm/dts/armada-8040-clearfog-gt-8k.dts +1 -1
@@ -232,7 +232,7 @@ status = "okay"; spi-flash at 0 { - compatible = "jedec,spi-nor", "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <10000000>;
arch/arm/dts/armada-xp-theadorable.dts +1 -1
@@ -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>; };
arch/arm/dts/at91-sama5d2_xplained.dts +1 -1
@@ -110,7 +110,7 @@ u-boot,dm-pre-reloc; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; u-boot,dm-pre-reloc;
arch/arm/dts/at91-sama5d4_xplained.dts +1 -1
@@ -117,7 +117,7 @@ status = "okay"; spi_flash at 0 { u-boot,dm-pre-reloc; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; };
arch/arm/dts/at91-sama5d4ek.dts +1 -1
@@ -137,7 +137,7 @@ status = "okay"; spi_flash at 0 { u-boot,dm-pre-reloc; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; };
arch/arm/dts/at91sam9n12ek.dts +1 -1
@@ -112,7 +112,7 @@ status = "okay"; cs-gpios = <&pioA 14 0>, <0>, <0>, <0>; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; };
arch/arm/dts/at91sam9x5ek.dtsi +1 -1
@@ -121,7 +121,7 @@ status = "okay"; cs-gpios = <&pioA 14 0>, <0>, <0>, <0>; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; };
arch/arm/dts/bk4r1.dts +2 -2
@@ -32,7 +32,7 @@ qflash0: spi_flash at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <66000000>; reg = <1>; };
arch/arm/dts/da850-evm-u-boot.dtsi +1 -1
@@ -7,5 +7,5 @@ */ &flash { - compatible = "m25p64", "spi-flash"; + compatible = "m25p64", "jedec,spi-nor"; };
arch/arm/dts/exynos5250-snow.dts +1 -1
@@ -232,7 +232,7 @@ spi at 12d30000 { spi-max-frequency = <50000000>; firmware_storage_spi: flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; }; };
arch/arm/dts/exynos5250-spring.dts +1 -1
@@ -97,7 +97,7 @@ spi at 12d30000 { spi-max-frequency = <50000000>; firmware_storage_spi: flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; }; };
arch/arm/dts/exynos5420-peach-pit.dts +1 -1
@@ -241,7 +241,7 @@ spi at 12d30000 { /* spi1 */ spi-max-frequency = <50000000>; firmware_storage_spi: flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; /*
arch/arm/dts/fsl-ls1012a-2g5rdb.dts +1 -1
@@ -27,7 +27,7 @@ qflash0: s25fl128s at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
arch/arm/dts/fsl-ls1012a-frdm.dtsi +1 -1
@@ -21,7 +21,7 @@ qflash0: s25fl128s at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
arch/arm/dts/fsl-ls1012a-frwy.dts +1 -1
@@ -28,7 +28,7 @@ qflash0: w25q16dw at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
arch/arm/dts/fsl-ls1012a-qds.dtsi +4 -4
@@ -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 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
arch/arm/dts/fsl-ls1012a-rdb.dtsi +1 -1
@@ -21,7 +21,7 @@ qflash0: s25fl128s at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
arch/arm/dts/fsl-ls1043a-qds.dtsi +4 -4
@@ -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 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
arch/arm/dts/fsl-ls1043a-rdb.dts +1 -1
@@ -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 */ };
arch/arm/dts/fsl-ls1046a-qds.dtsi +4 -4
@@ -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 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
arch/arm/dts/fsl-ls1046a-rdb.dts +2 -2
@@ -26,7 +26,7 @@ qflash0: s25fs512s at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <1>; };
arch/arm/dts/fsl-ls1088a-qds.dts +5 -5
@@ -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 at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <1>; };
arch/arm/dts/fsl-ls1088a-rdb.dts +2 -2
@@ -24,7 +24,7 @@ qflash0: s25fs512s at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <1>; };
arch/arm/dts/fsl-ls2080a-qds.dts +4 -4
@@ -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 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
arch/arm/dts/fsl-ls2080a-rdb.dts +1 -1
@@ -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;
arch/arm/dts/fsl-ls2081a-rdb.dts +3 -3
@@ -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 at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <1>; };
arch/arm/dts/fsl-ls2088a-rdb-qspi.dts +3 -3
@@ -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 at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <1>; };
arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi +2 -2
@@ -7,10 +7,10 @@ num-cs = <2>; flash0: n25q256a at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; flash1: n25q256a at 1 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; };
arch/arm/dts/imx6sx-sdb-u-boot.dtsi +2 -2
@@ -7,10 +7,10 @@ num-cs = <2>; flash0: n25q256a at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; flash1: n25q256a at 1 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; };
arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi +1 -1
@@ -5,6 +5,6 @@ &qspi { flash0: n25q256a at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; };
arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi +1 -1
@@ -5,6 +5,6 @@ &qspi { flash0: n25q256a at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; };
arch/arm/dts/imx6ull-14x14-evk.dts +1 -1
@@ -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>;
arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi +1 -1
@@ -5,6 +5,6 @@ &qspi1 { flash0: mx25l51245g at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; };
arch/arm/dts/keystone-k2e-evm.dts +1 -1
@@ -123,7 +123,7 @@ nor_flash: n25q128a11 at 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>;
arch/arm/dts/keystone-k2g-evm.dts +2 -2
@@ -47,7 +47,7 @@ spi_nor: flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; m25p,fast-read; reg = <0>;
@@ -69,7 +69,7 @@ status = "okay"; flash0: m25p80 at 0 { - compatible = "s25fl512s","spi-flash"; + compatible = "s25fl512s","jedec,spi-nor"; reg = <0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <4>;
arch/arm/dts/keystone-k2g-ice.dts +1 -1
@@ -38,7 +38,7 @@ status = "okay"; flash0: m25p80 at 0 { - compatible = "s25fl256s1", "spi-flash"; + compatible = "s25fl256s1", "jedec,spi-nor"; reg = <0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <4>;
arch/arm/dts/keystone-k2hk-evm.dts +1 -1
@@ -151,7 +151,7 @@ nor_flash: n25q128a11 at 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>;
arch/arm/dts/keystone-k2l-evm.dts +1 -1
@@ -100,7 +100,7 @@ nor_flash: n25q128a11 at 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>;
arch/arm/dts/kirkwood-atl-sbx81lifkw.dts +1 -1
@@ -78,7 +78,7 @@ flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "st,m25p128", "jedec,spi-nor", "spi-flash"; + compatible = "st,m25p128", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; mode = <0>;
arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts +1 -1
@@ -92,7 +92,7 @@ flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "st,m25p128", "jedec,spi-nor", "spi-flash"; + compatible = "st,m25p128", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; mode = <0>;
arch/arm/dts/kirkwood-dreamplug.dts +1 -1
@@ -43,7 +43,7 @@ m25p40 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "mxicy,mx25l1606e", "jedec,spi-nor", "spi-flash"; + compatible = "mxicy,mx25l1606e", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; mode = <0>;
arch/arm/dts/kirkwood-lsxl.dtsi +1 -1
@@ -79,7 +79,7 @@ m25p40 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "m25p40", "jedec,spi-nor", "spi-flash"; + compatible = "m25p40", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; mode = <0>;
arch/arm/dts/kirkwood-netxbig.dtsi +1 -1
@@ -32,7 +32,7 @@ flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "mxicy,mx25l4005a", "jedec,spi-nor", "spi-flash"; + compatible = "mxicy,mx25l4005a", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <20000000>; mode = <0>;
arch/arm/dts/kirkwood-ns2-common.dtsi +1 -1
@@ -30,7 +30,7 @@ flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "mxicy,mx25l4005a", "jedec,spi-nor", "spi-flash"; + compatible = "mxicy,mx25l4005a", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <20000000>; mode = <0>;
arch/arm/dts/kirkwood-synology.dtsi +1 -1
@@ -201,7 +201,7 @@ m25p80 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "st,m25p80", "jedec,spi-nor", "spi-flash"; + compatible = "st,m25p80", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <20000000>; mode = <0>;
arch/arm/dts/ls1021a-iot.dtsi +2 -2
@@ -27,7 +27,7 @@ qflash0: n25q128a13 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
@@ -40,7 +40,7 @@ dspiflash: at26df081a at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <16000000>; spi-cpol; spi-cpha;
arch/arm/dts/ls1021a-qds.dtsi +1 -1
@@ -43,7 +43,7 @@ qflash0: s25fl128s at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
arch/arm/dts/ls1021a-twr.dtsi +2 -2
@@ -30,7 +30,7 @@ qflash0: n25q128a13 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };
@@ -43,7 +43,7 @@ dspiflash: at26df081a at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <16000000>; spi-cpol; spi-cpha;
arch/arm/dts/mt7629-rfb.dts +1 -1
@@ -51,7 +51,7 @@ status = "okay"; spi-flash at 0{ - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; u-boot,dm-pre-reloc; };
arch/arm/dts/omap5-u-boot.dtsi +1 -1
@@ -59,7 +59,7 @@ u-boot,dm-spl; m25p80 at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; u-boot,dm-spl; }; };
arch/arm/dts/r8a77970-eagle-u-boot.dts +1 -1
@@ -44,7 +44,7 @@ flash0: spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "s25fs512s", "spi-flash", "jedec,spi-nor"; + compatible = "s25fs512s", "jedec,spi-nor"; spi-max-frequency = <50000000>; spi-tx-bus-width = <1>; spi-rx-bus-width = <1>;
arch/arm/dts/rk3288-veyron.dtsi +1 -1
@@ -307,7 +307,7 @@ spi_flash: spiflash at 0 { u-boot,dm-pre-reloc; - compatible = "spidev", "spi-flash"; + compatible = "spidev", "jedec,spi-nor"; spi-max-frequency = <20000000>; /* Reduce for Dediprog em100 pro */ reg = <0>; };
arch/arm/dts/rk3368-lion.dts +1 -1
@@ -185,7 +185,7 @@ #size-cells = <0>; spiflash: w25q32dw at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <49500000>; spi-cpol;
arch/arm/dts/rk3399-puma.dtsi +1 -1
@@ -667,7 +667,7 @@ spiflash: w25q32dw at 0 { u-boot,dm-pre-reloc; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <49500000>; spi-cpol;
arch/arm/dts/rv1108-evb.dts +1 -1
@@ -45,7 +45,7 @@ &sfc { status = "okay"; flash at 0 { - compatible = "gd25q256","spi-flash"; + compatible = "gd25q256","jedec,spi-nor"; reg = <0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <1>;
arch/arm/dts/sama5d27_som1.dtsi +1 -1
@@ -66,7 +66,7 @@ u-boot,dm-pre-reloc; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; spi-rx-bus-width = <4>;
arch/arm/dts/sama5d3xmb.dtsi +1 -1
@@ -35,7 +35,7 @@ u-boot,dm-pre-reloc; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; u-boot,dm-pre-reloc;
arch/arm/dts/sama5d3xmb_cmp.dtsi +1 -1
@@ -32,7 +32,7 @@ dmas = <0>, <0>; /* Do not use DMA for spi0 */ spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; };
arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi +1 -1
@@ -30,7 +30,7 @@ }; &flash { - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; u-boot,dm-pre-reloc; };
arch/arm/dts/socfpga_cyclone5_is1.dts +1 -1
@@ -91,7 +91,7 @@ u-boot,dm-pre-reloc; #address-cells = <1>; #size-cells = <1>; - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; reg = <0>; /* chip select */ spi-max-frequency = <100000000>; m25p,fast-read;
arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi +1 -1
@@ -34,7 +34,7 @@ }; &flash0 { - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; u-boot,dm-pre-reloc; partition at qspi-boot {
arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi +1 -1
@@ -30,7 +30,7 @@ }; &flash { - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; u-boot,dm-pre-reloc; };
arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi +1 -1
@@ -30,7 +30,7 @@ }; &flash { - compatible = "n25q256a", "spi-flash"; + compatible = "n25q256a", "jedec,spi-nor"; u-boot,dm-pre-reloc; };
arch/arm/dts/socfpga_cyclone5_sr1500.dts +1 -1
@@ -99,7 +99,7 @@ u-boot,dm-pre-reloc; #address-cells = <1>; #size-cells = <1>; - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; reg = <0>; /* chip select */ spi-max-frequency = <100000000>; m25p,fast-read;
arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi +2 -2
@@ -29,11 +29,11 @@ u-boot,dm-pre-reloc; n25q128 at 0 { - compatible = "n25q128", "spi-flash"; + compatible = "n25q128", "jedec,spi-nor"; u-boot,dm-pre-reloc; }; n25q00 at 1 { - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; u-boot,dm-pre-reloc; }; };
arch/arm/dts/stm32f746-disco.dts +1 -1
@@ -297,7 +297,7 @@ qflash0: n25q128a { #address-cells = <1>; #size-cells = <1>; - compatible = "micron,n25q128a13", "spi-flash"; + compatible = "micron,n25q128a13", "jedec,spi-nor"; spi-max-frequency = <108000000>; spi-tx-bus-width = <1>; spi-rx-bus-width = <1>;
arch/arm/dts/stm32f769-disco.dts +1 -1
@@ -246,7 +246,7 @@ qflash0: n25q128a { #address-cells = <1>; #size-cells = <1>; - compatible = "micron,n25q128a13", "spi-flash"; + compatible = "micron,n25q128a13", "jedec,spi-nor"; spi-max-frequency = <108000000>; spi-tx-bus-width = <1>; spi-rx-bus-width = <1>;
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi +2 -2
@@ -14,11 +14,11 @@ }; &flash0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; &flash1 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; &v3v3 {
arch/arm/dts/stv0991.dts +1 -1
@@ -40,7 +40,7 @@ flash0: n25q32 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; /* chip select */ spi-max-frequency = <50000000>; m25p,fast-read;
arch/arm/dts/zynq-zed.dts +1 -1
@@ -53,7 +53,7 @@ status = "okay"; num-cs = <1>; flash at 0 { - compatible = "spansion,s25fl256s", "spi-flash"; + compatible = "spansion,s25fl256s", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <30000000>; m25p,fast-read;
arch/arm/dts/zynqmp-zc1232-revA.dts +1 -1
@@ -41,7 +41,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB FIXME */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB FIXME */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/arm/dts/zynqmp-zc1254-revA.dts +1 -1
@@ -41,7 +41,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/arm/dts/zynqmp-zc1275-revA.dts +1 -1
@@ -41,7 +41,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/arm/dts/zynqmp-zc1275-revB.dts +1 -1
@@ -42,7 +42,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +1 -1
@@ -101,7 +101,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* Micron MT25QU512ABB8ESF */ + compatible = "m25p80", "jedec,spi-nor"; /* Micron MT25QU512ABB8ESF */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts +1 -1
@@ -180,7 +180,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/arm/dts/zynqmp-zcu102-revA.dts +1 -1
@@ -536,7 +536,7 @@ status = "okay"; is-dual = <1>; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/arm/dts/zynqmp-zcu104-revA.dts +1 -1
@@ -169,7 +169,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* n25q512a 128MiB */ + compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/arm/dts/zynqmp-zcu104-revC.dts +1 -1
@@ -175,7 +175,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* n25q512a 128MiB */ + compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/arm/dts/zynqmp-zcu106-revA.dts +1 -1
@@ -514,7 +514,7 @@ status = "okay"; is-dual = <1>; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/arm/dts/zynqmp-zcu111-revA.dts +1 -1
@@ -451,7 +451,7 @@ status = "okay"; is-dual = <1>; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
arch/mips/dts/ap121.dts +1 -1
@@ -34,7 +34,7 @@ spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; memory-map = <0x9f000000 0x00800000>; spi-max-frequency = <25000000>; reg = <0>;
arch/mips/dts/ap143.dts +1 -1
@@ -34,7 +34,7 @@ spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; memory-map = <0x9f000000 0x00800000>; spi-max-frequency = <25000000>; reg = <0>;
arch/mips/dts/comtrend,ar-5315u.dts +1 -1
@@ -78,7 +78,7 @@ status = "okay"; spi-flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; #address-cells = <1>; #size-cells = <1>;
arch/mips/dts/comtrend,ar-5387un.dts +1 -1
@@ -62,7 +62,7 @@ status = "okay"; spi-flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; #address-cells = <1>; #size-cells = <1>;
arch/mips/dts/gardena-smart-gateway-mt7688.dts +1 -1
@@ -97,7 +97,7 @@ spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; spi-max-frequency = <40000000>; reg = <0>; };
arch/mips/dts/linkit-smart-7688.dts +1 -1
@@ -38,7 +38,7 @@ spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; spi-max-frequency = <25000000>; reg = <0>; };
arch/mips/dts/netgear,cg3100d.dts +1 -1
@@ -93,7 +93,7 @@ status = "okay"; spi-flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; #address-cells = <1>; #size-cells = <1>;
arch/mips/dts/sagem,f at st1704.dts +1 -1
@@ -47,7 +47,7 @@ status = "okay"; spi-flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; #address-cells = <1>; #size-cells = <1>;
arch/mips/dts/tplink_wdr4300.dts +1 -1
@@ -35,7 +35,7 @@ spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; memory-map = <0x1e000000 0x00800000>; spi-max-frequency = <25000000>; reg = <0>;
arch/nds32/dts/ae3xx.dts +1 -1
@@ -93,7 +93,7 @@ clocks = <&spiclk>; interrupts = <3 4>; flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; spi-cpol;
arch/riscv/dts/ae350.dts +1 -1
@@ -219,7 +219,7 @@ interrupts = <4 4>; interrupt-parent = <&plic0>; flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; spi-cpol;
arch/riscv/dts/ae350_32.dts +1 -1
@@ -219,7 +219,7 @@ interrupts = <4 4>; interrupt-parent = <&plic0>; flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; spi-cpol;
arch/riscv/dts/ae350_64.dts +1 -1
@@ -219,7 +219,7 @@ interrupts = <4 4>; interrupt-parent = <&plic0>; flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; spi-cpol;
arch/sandbox/dts/test.dts +1 -1
@@ -534,7 +534,7 @@ cs-gpios = <0>, <&gpio_a 0>; spi.bin at 0 { reg = <0>; - compatible = "spansion,m25p16", "spi-flash"; + compatible = "spansion,m25p16", "jedec,spi-nor"; spi-max-frequency = <40000000>; sandbox,filename = "spi.bin"; };
arch/x86/dts/bayleybay.dts +1 -1
@@ -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";
arch/x86/dts/baytrail_som-db5800-som-6867.dts +1 -1
@@ -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";
arch/x86/dts/cherryhill.dts +1 -1
@@ -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";
arch/x86/dts/chromebook_link.dts +1 -1
@@ -401,7 +401,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";
arch/x86/dts/chromebook_samus.dts +1 -1
@@ -538,7 +538,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";
arch/x86/dts/chromebox_panther.dts +1 -1
@@ -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";
arch/x86/dts/conga-qeval20-qa3-e3845.dts +1 -1
@@ -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";
arch/x86/dts/cougarcanyon2.dts +1 -1
@@ -154,7 +154,7 @@ spi-flash at 0 { reg = <0>; - compatible = "winbond,w25q64bv", "spi-flash"; + compatible = "winbond,w25q64bv", "jedec,spi-nor"; memory-map = <0xff800000 0x00800000>; }; };
arch/x86/dts/crownbay.dts +1 -1
@@ -223,7 +223,7 @@ spi-flash at 0 { reg = <0>; compatible = "sst,25vf016b", - "spi-flash"; + "jedec,spi-nor"; memory-map = <0xffe00000 0x00200000>; }; };
arch/x86/dts/dfi-bt700.dtsi +1 -1
@@ -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";
arch/x86/dts/galileo.dts +1 -1
@@ -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";
arch/x86/dts/minnowmax.dts +1 -1
@@ -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";
Signature · 1 line
2.19.2
PATCH v2 2/5 dts: switch spi-flash to jedec, spi-nor compatible
Quoted 8 lines · Neil Armstrong
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.
Signed-off-by Neil Armstrong <[email protected]>
Quoted 15 lines
--- arch/arc/dts/axs10x_mb.dtsi | 2 +- arch/arc/dts/hsdk.dts | 2 +- arch/arm/dts/am335x-brppt1-spi.dts | 2 +- arch/arm/dts/am437x-idk-evm.dts | 2 +- arch/arm/dts/am437x-sk-evm.dts | 2 +- arch/arm/dts/armada-3720-db.dts | 2 +- arch/arm/dts/armada-3720-espressobin.dts | 2 +- arch/arm/dts/armada-3720-turris-mox.dts | 2 +- arch/arm/dts/armada-385-amc.dts | 2 +- arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +- arch/arm/dts/armada-38x-controlcenterdc.dts | 4 ++-- arch/arm/dts/armada-38x-solidrun-microsom.dtsi | 2 +- arch/arm/dts/armada-8040-clearfog-gt-8k.dts | 2 +- arch/arm/dts/armada-xp-theadorable.dts | 2 +-
For all the MVEBU / Armada based boards:
Thanks for working on this,
Stefan
Quoted 1,912 lines
arch/arm/dts/at91-sama5d2_xplained.dts | 2 +- arch/arm/dts/at91-sama5d4_xplained.dts | 2 +- arch/arm/dts/at91-sama5d4ek.dts | 2 +- arch/arm/dts/at91sam9n12ek.dts | 2 +- arch/arm/dts/at91sam9x5ek.dtsi | 2 +- arch/arm/dts/bk4r1.dts | 4 ++-- arch/arm/dts/da850-evm-u-boot.dtsi | 2 +- arch/arm/dts/exynos5250-snow.dts | 2 +- arch/arm/dts/exynos5250-spring.dts | 2 +- arch/arm/dts/exynos5420-peach-pit.dts | 2 +- arch/arm/dts/fsl-ls1012a-2g5rdb.dts | 2 +- arch/arm/dts/fsl-ls1012a-frdm.dtsi | 2 +- arch/arm/dts/fsl-ls1012a-frwy.dts | 2 +- arch/arm/dts/fsl-ls1012a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1012a-rdb.dtsi | 2 +- arch/arm/dts/fsl-ls1043a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1043a-rdb.dts | 2 +- arch/arm/dts/fsl-ls1046a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1046a-rdb.dts | 4 ++-- arch/arm/dts/fsl-ls1088a-qds.dts | 10 +++++----- arch/arm/dts/fsl-ls1088a-rdb.dts | 4 ++-- arch/arm/dts/fsl-ls2080a-qds.dts | 8 ++++---- arch/arm/dts/fsl-ls2080a-rdb.dts | 2 +- arch/arm/dts/fsl-ls2081a-rdb.dts | 6 +++--- arch/arm/dts/fsl-ls2088a-rdb-qspi.dts | 6 +++--- arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6sx-sdb-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ull-14x14-evk.dts | 2 +- arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi | 2 +- arch/arm/dts/keystone-k2e-evm.dts | 2 +- arch/arm/dts/keystone-k2g-evm.dts | 4 ++-- arch/arm/dts/keystone-k2g-ice.dts | 2 +- arch/arm/dts/keystone-k2hk-evm.dts | 2 +- arch/arm/dts/keystone-k2l-evm.dts | 2 +- arch/arm/dts/kirkwood-atl-sbx81lifkw.dts | 2 +- arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts | 2 +- arch/arm/dts/kirkwood-dreamplug.dts | 2 +- arch/arm/dts/kirkwood-lsxl.dtsi | 2 +- arch/arm/dts/kirkwood-netxbig.dtsi | 2 +- arch/arm/dts/kirkwood-ns2-common.dtsi | 2 +- arch/arm/dts/kirkwood-synology.dtsi | 2 +- arch/arm/dts/ls1021a-iot.dtsi | 4 ++-- arch/arm/dts/ls1021a-qds.dtsi | 2 +- arch/arm/dts/ls1021a-twr.dtsi | 4 ++-- arch/arm/dts/mt7629-rfb.dts | 2 +- arch/arm/dts/omap5-u-boot.dtsi | 2 +- arch/arm/dts/r8a77970-eagle-u-boot.dts | 2 +- arch/arm/dts/rk3288-veyron.dtsi | 2 +- arch/arm/dts/rk3368-lion.dts | 2 +- arch/arm/dts/rk3399-puma.dtsi | 2 +- arch/arm/dts/rv1108-evb.dts | 2 +- arch/arm/dts/sama5d27_som1.dtsi | 2 +- arch/arm/dts/sama5d3xmb.dtsi | 2 +- arch/arm/dts/sama5d3xmb_cmp.dtsi | 2 +- arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_is1.dts | 2 +- arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 +- arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi | 4 ++-- arch/arm/dts/stm32f746-disco.dts | 2 +- arch/arm/dts/stm32f769-disco.dts | 2 +- arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 ++-- arch/arm/dts/stv0991.dts | 2 +- arch/arm/dts/zynq-zed.dts | 2 +- arch/arm/dts/zynqmp-zc1232-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1275-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1275-revB.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 2 +- arch/mips/dts/ap121.dts | 2 +- arch/mips/dts/ap143.dts | 2 +- arch/mips/dts/comtrend,ar-5315u.dts | 2 +- arch/mips/dts/comtrend,ar-5387un.dts | 2 +- arch/mips/dts/gardena-smart-gateway-mt7688.dts | 2 +- arch/mips/dts/linkit-smart-7688.dts | 2 +- arch/mips/dts/netgear,cg3100d.dts | 2 +- arch/mips/dts/sagem,f at st1704.dts | 2 +- arch/mips/dts/tplink_wdr4300.dts | 2 +- arch/nds32/dts/ae3xx.dts | 2 +- arch/riscv/dts/ae350.dts | 2 +- arch/riscv/dts/ae350_32.dts | 2 +- arch/riscv/dts/ae350_64.dts | 2 +- arch/sandbox/dts/test.dts | 2 +- arch/x86/dts/bayleybay.dts | 2 +- arch/x86/dts/baytrail_som-db5800-som-6867.dts | 2 +- arch/x86/dts/cherryhill.dts | 2 +- arch/x86/dts/chromebook_link.dts | 2 +- arch/x86/dts/chromebook_samus.dts | 2 +- arch/x86/dts/chromebox_panther.dts | 2 +- arch/x86/dts/conga-qeval20-qa3-e3845.dts | 2 +- arch/x86/dts/cougarcanyon2.dts | 2 +- arch/x86/dts/crownbay.dts | 2 +- arch/x86/dts/dfi-bt700.dtsi | 2 +- arch/x86/dts/galileo.dts | 2 +- arch/x86/dts/minnowmax.dts | 2 +- 119 files changed, 150 insertions(+), 150 deletions(-)arch/arc/dts/axs10x_mb.dtsi +1
-1@@ -71,7 +71,7 @@ clock-names = "spi_clk"; cs-gpio = <&cs_gpio 0>; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <4000000>; };arch/arc/dts/hsdk.dts +1
-1@@ -96,7 +96,7 @@ clock-names = "spi_clk"; cs-gpio = <&cs_gpio 0>; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <4000000>; };arch/arm/dts/am335x-brppt1-spi.dts +1
-1@@ -169,7 +169,7 @@ spi_flash: spiflash at 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>; };arch/arm/dts/am437x-idk-evm.dts +1
-1@@ -341,7 +341,7 @@ spi-max-frequency = <48000000>; m25p80 at 0 { - compatible = "mx66l51235l", "spi-flash"; + compatible = "mx66l51235l", "jedec,spi-nor"; spi-max-frequency = <48000000>; reg = <0>; spi-cpol;arch/arm/dts/am437x-sk-evm.dts +1
-1@@ -568,7 +568,7 @@ spi-max-frequency = <48000000>; m25p80 at 0 { - compatible = "mx66l51235l","spi-flash"; + compatible = "mx66l51235l","jedec,spi-nor"; spi-max-frequency = <48000000>; reg = <0>; spi-cpol;arch/arm/dts/armada-3720-db.dts +1
-1@@ -131,7 +131,7 @@ spi-flash at 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;arch/arm/dts/armada-3720-espressobin.dts +1
-1@@ -118,7 +118,7 @@ spi-flash at 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;arch/arm/dts/armada-3720-turris-mox.dts +1
-1@@ -105,7 +105,7 @@ spi-flash at 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;arch/arm/dts/armada-385-amc.dts +1
-1@@ -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;arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +1
-1@@ -42,7 +42,7 @@ u-boot,dm-pre-reloc; spi-flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <40000000>; u-boot,dm-pre-reloc;arch/arm/dts/armada-38x-controlcenterdc.dts +2
-2@@ -92,14 +92,14 @@ spi-flash at 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 at 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;arch/arm/dts/armada-38x-solidrun-microsom.dtsi +1
-1@@ -86,7 +86,7 @@ w25q32: spi-flash at 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";arch/arm/dts/armada-8040-clearfog-gt-8k.dts +1
-1@@ -232,7 +232,7 @@ status = "okay"; spi-flash at 0 { - compatible = "jedec,spi-nor", "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <10000000>;arch/arm/dts/armada-xp-theadorable.dts +1
-1@@ -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>; };arch/arm/dts/at91-sama5d2_xplained.dts +1
-1@@ -110,7 +110,7 @@ u-boot,dm-pre-reloc; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; u-boot,dm-pre-reloc;arch/arm/dts/at91-sama5d4_xplained.dts +1
-1@@ -117,7 +117,7 @@ status = "okay"; spi_flash at 0 { u-boot,dm-pre-reloc; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; };arch/arm/dts/at91-sama5d4ek.dts +1
-1@@ -137,7 +137,7 @@ status = "okay"; spi_flash at 0 { u-boot,dm-pre-reloc; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; };arch/arm/dts/at91sam9n12ek.dts +1
-1@@ -112,7 +112,7 @@ status = "okay"; cs-gpios = <&pioA 14 0>, <0>, <0>, <0>; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; };arch/arm/dts/at91sam9x5ek.dtsi +1
-1@@ -121,7 +121,7 @@ status = "okay"; cs-gpios = <&pioA 14 0>, <0>, <0>, <0>; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; };arch/arm/dts/bk4r1.dts +2
-2@@ -32,7 +32,7 @@ qflash0: spi_flash at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <66000000>; reg = <1>; };arch/arm/dts/da850-evm-u-boot.dtsi +1
-1@@ -7,5 +7,5 @@ */ &flash { - compatible = "m25p64", "spi-flash"; + compatible = "m25p64", "jedec,spi-nor"; };arch/arm/dts/exynos5250-snow.dts +1
-1@@ -232,7 +232,7 @@ spi at 12d30000 { spi-max-frequency = <50000000>; firmware_storage_spi: flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; }; };arch/arm/dts/exynos5250-spring.dts +1
-1@@ -97,7 +97,7 @@ spi at 12d30000 { spi-max-frequency = <50000000>; firmware_storage_spi: flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; }; };arch/arm/dts/exynos5420-peach-pit.dts +1
-1@@ -241,7 +241,7 @@ spi at 12d30000 { /* spi1 */ spi-max-frequency = <50000000>; firmware_storage_spi: flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; /*arch/arm/dts/fsl-ls1012a-2g5rdb.dts +1
-1@@ -27,7 +27,7 @@ qflash0: s25fl128s at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };arch/arm/dts/fsl-ls1012a-frdm.dtsi +1
-1@@ -21,7 +21,7 @@ qflash0: s25fl128s at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };arch/arm/dts/fsl-ls1012a-frwy.dts +1
-1@@ -28,7 +28,7 @@ qflash0: w25q16dw at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };arch/arm/dts/fsl-ls1012a-qds.dtsi +4
-4@@ -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 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };arch/arm/dts/fsl-ls1012a-rdb.dtsi +1
-1@@ -21,7 +21,7 @@ qflash0: s25fl128s at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };arch/arm/dts/fsl-ls1043a-qds.dtsi +4
-4@@ -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 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };arch/arm/dts/fsl-ls1043a-rdb.dts +1
-1@@ -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 */ };arch/arm/dts/fsl-ls1046a-qds.dtsi +4
-4@@ -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 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };arch/arm/dts/fsl-ls1046a-rdb.dts +2
-2@@ -26,7 +26,7 @@ qflash0: s25fs512s at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <1>; };arch/arm/dts/fsl-ls1088a-qds.dts +5
-5@@ -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 at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <1>; };arch/arm/dts/fsl-ls1088a-rdb.dts +2
-2@@ -24,7 +24,7 @@ qflash0: s25fs512s at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <1>; };arch/arm/dts/fsl-ls2080a-qds.dts +4
-4@@ -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 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };arch/arm/dts/fsl-ls2080a-rdb.dts +1
-1@@ -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;arch/arm/dts/fsl-ls2081a-rdb.dts +3
-3@@ -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 at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <1>; };arch/arm/dts/fsl-ls2088a-rdb-qspi.dts +3
-3@@ -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 at 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 at 1 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <1>; };arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi +2
-2@@ -7,10 +7,10 @@ num-cs = <2>; flash0: n25q256a at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; flash1: n25q256a at 1 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; };arch/arm/dts/imx6sx-sdb-u-boot.dtsi +2
-2@@ -7,10 +7,10 @@ num-cs = <2>; flash0: n25q256a at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; flash1: n25q256a at 1 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; };arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi +1
-1@@ -5,6 +5,6 @@ &qspi { flash0: n25q256a at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; };arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi +1
-1@@ -5,6 +5,6 @@ &qspi { flash0: n25q256a at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; };arch/arm/dts/imx6ull-14x14-evk.dts +1
-1@@ -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>;arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi +1
-1@@ -5,6 +5,6 @@ &qspi1 { flash0: mx25l51245g at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; };arch/arm/dts/keystone-k2e-evm.dts +1
-1@@ -123,7 +123,7 @@ nor_flash: n25q128a11 at 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>;arch/arm/dts/keystone-k2g-evm.dts +2
-2@@ -47,7 +47,7 @@ spi_nor: flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; m25p,fast-read; reg = <0>;@@ -69,7 +69,7 @@ status = "okay"; flash0: m25p80 at 0 { - compatible = "s25fl512s","spi-flash"; + compatible = "s25fl512s","jedec,spi-nor"; reg = <0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <4>;arch/arm/dts/keystone-k2g-ice.dts +1
-1@@ -38,7 +38,7 @@ status = "okay"; flash0: m25p80 at 0 { - compatible = "s25fl256s1", "spi-flash"; + compatible = "s25fl256s1", "jedec,spi-nor"; reg = <0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <4>;arch/arm/dts/keystone-k2hk-evm.dts +1
-1@@ -151,7 +151,7 @@ nor_flash: n25q128a11 at 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>;arch/arm/dts/keystone-k2l-evm.dts +1
-1@@ -100,7 +100,7 @@ nor_flash: n25q128a11 at 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>;arch/arm/dts/kirkwood-atl-sbx81lifkw.dts +1
-1@@ -78,7 +78,7 @@ flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "st,m25p128", "jedec,spi-nor", "spi-flash"; + compatible = "st,m25p128", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; mode = <0>;arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts +1
-1@@ -92,7 +92,7 @@ flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "st,m25p128", "jedec,spi-nor", "spi-flash"; + compatible = "st,m25p128", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; mode = <0>;arch/arm/dts/kirkwood-dreamplug.dts +1
-1@@ -43,7 +43,7 @@ m25p40 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "mxicy,mx25l1606e", "jedec,spi-nor", "spi-flash"; + compatible = "mxicy,mx25l1606e", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; mode = <0>;arch/arm/dts/kirkwood-lsxl.dtsi +1
-1@@ -79,7 +79,7 @@ m25p40 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "m25p40", "jedec,spi-nor", "spi-flash"; + compatible = "m25p40", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; mode = <0>;arch/arm/dts/kirkwood-netxbig.dtsi +1
-1@@ -32,7 +32,7 @@ flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "mxicy,mx25l4005a", "jedec,spi-nor", "spi-flash"; + compatible = "mxicy,mx25l4005a", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <20000000>; mode = <0>;arch/arm/dts/kirkwood-ns2-common.dtsi +1
-1@@ -30,7 +30,7 @@ flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "mxicy,mx25l4005a", "jedec,spi-nor", "spi-flash"; + compatible = "mxicy,mx25l4005a", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <20000000>; mode = <0>;arch/arm/dts/kirkwood-synology.dtsi +1
-1@@ -201,7 +201,7 @@ m25p80 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "st,m25p80", "jedec,spi-nor", "spi-flash"; + compatible = "st,m25p80", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <20000000>; mode = <0>;arch/arm/dts/ls1021a-iot.dtsi +2
-2@@ -27,7 +27,7 @@ qflash0: n25q128a13 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };@@ -40,7 +40,7 @@ dspiflash: at26df081a at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <16000000>; spi-cpol; spi-cpha;arch/arm/dts/ls1021a-qds.dtsi +1
-1@@ -43,7 +43,7 @@ qflash0: s25fl128s at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };arch/arm/dts/ls1021a-twr.dtsi +2
-2@@ -30,7 +30,7 @@ qflash0: n25q128a13 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; };@@ -43,7 +43,7 @@ dspiflash: at26df081a at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <16000000>; spi-cpol; spi-cpha;arch/arm/dts/mt7629-rfb.dts +1
-1@@ -51,7 +51,7 @@ status = "okay"; spi-flash at 0{ - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; u-boot,dm-pre-reloc; };arch/arm/dts/omap5-u-boot.dtsi +1
-1@@ -59,7 +59,7 @@ u-boot,dm-spl; m25p80 at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; u-boot,dm-spl; }; };arch/arm/dts/r8a77970-eagle-u-boot.dts +1
-1@@ -44,7 +44,7 @@ flash0: spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "s25fs512s", "spi-flash", "jedec,spi-nor"; + compatible = "s25fs512s", "jedec,spi-nor"; spi-max-frequency = <50000000>; spi-tx-bus-width = <1>; spi-rx-bus-width = <1>;arch/arm/dts/rk3288-veyron.dtsi +1
-1@@ -307,7 +307,7 @@ spi_flash: spiflash at 0 { u-boot,dm-pre-reloc; - compatible = "spidev", "spi-flash"; + compatible = "spidev", "jedec,spi-nor"; spi-max-frequency = <20000000>; /* Reduce for Dediprog em100 pro */ reg = <0>; };arch/arm/dts/rk3368-lion.dts +1
-1@@ -185,7 +185,7 @@ #size-cells = <0>; spiflash: w25q32dw at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <49500000>; spi-cpol;arch/arm/dts/rk3399-puma.dtsi +1
-1@@ -667,7 +667,7 @@ spiflash: w25q32dw at 0 { u-boot,dm-pre-reloc; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <49500000>; spi-cpol;arch/arm/dts/rv1108-evb.dts +1
-1@@ -45,7 +45,7 @@ &sfc { status = "okay"; flash at 0 { - compatible = "gd25q256","spi-flash"; + compatible = "gd25q256","jedec,spi-nor"; reg = <0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <1>;arch/arm/dts/sama5d27_som1.dtsi +1
-1@@ -66,7 +66,7 @@ u-boot,dm-pre-reloc; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; spi-rx-bus-width = <4>;arch/arm/dts/sama5d3xmb.dtsi +1
-1@@ -35,7 +35,7 @@ u-boot,dm-pre-reloc; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; u-boot,dm-pre-reloc;arch/arm/dts/sama5d3xmb_cmp.dtsi +1
-1@@ -32,7 +32,7 @@ dmas = <0>, <0>; /* Do not use DMA for spi0 */ spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; };arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi +1
-1@@ -30,7 +30,7 @@ }; &flash { - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; u-boot,dm-pre-reloc; };arch/arm/dts/socfpga_cyclone5_is1.dts +1
-1@@ -91,7 +91,7 @@ u-boot,dm-pre-reloc; #address-cells = <1>; #size-cells = <1>; - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; reg = <0>; /* chip select */ spi-max-frequency = <100000000>; m25p,fast-read;arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi +1
-1@@ -34,7 +34,7 @@ }; &flash0 { - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; u-boot,dm-pre-reloc; partition at qspi-boot {arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi +1
-1@@ -30,7 +30,7 @@ }; &flash { - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; u-boot,dm-pre-reloc; };arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi +1
-1@@ -30,7 +30,7 @@ }; &flash { - compatible = "n25q256a", "spi-flash"; + compatible = "n25q256a", "jedec,spi-nor"; u-boot,dm-pre-reloc; };arch/arm/dts/socfpga_cyclone5_sr1500.dts +1
-1@@ -99,7 +99,7 @@ u-boot,dm-pre-reloc; #address-cells = <1>; #size-cells = <1>; - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; reg = <0>; /* chip select */ spi-max-frequency = <100000000>; m25p,fast-read;arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi +2
-2@@ -29,11 +29,11 @@ u-boot,dm-pre-reloc; n25q128 at 0 { - compatible = "n25q128", "spi-flash"; + compatible = "n25q128", "jedec,spi-nor"; u-boot,dm-pre-reloc; }; n25q00 at 1 { - compatible = "n25q00", "spi-flash"; + compatible = "n25q00", "jedec,spi-nor"; u-boot,dm-pre-reloc; }; };arch/arm/dts/stm32f746-disco.dts +1
-1@@ -297,7 +297,7 @@ qflash0: n25q128a { #address-cells = <1>; #size-cells = <1>; - compatible = "micron,n25q128a13", "spi-flash"; + compatible = "micron,n25q128a13", "jedec,spi-nor"; spi-max-frequency = <108000000>; spi-tx-bus-width = <1>; spi-rx-bus-width = <1>;arch/arm/dts/stm32f769-disco.dts +1
-1@@ -246,7 +246,7 @@ qflash0: n25q128a { #address-cells = <1>; #size-cells = <1>; - compatible = "micron,n25q128a13", "spi-flash"; + compatible = "micron,n25q128a13", "jedec,spi-nor"; spi-max-frequency = <108000000>; spi-tx-bus-width = <1>; spi-rx-bus-width = <1>;arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi +2
-2@@ -14,11 +14,11 @@ }; &flash0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; &flash1 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; }; &v3v3 {arch/arm/dts/stv0991.dts +1
-1@@ -40,7 +40,7 @@ flash0: n25q32 at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; /* chip select */ spi-max-frequency = <50000000>; m25p,fast-read;arch/arm/dts/zynq-zed.dts +1
-1@@ -53,7 +53,7 @@ status = "okay"; num-cs = <1>; flash at 0 { - compatible = "spansion,s25fl256s", "spi-flash"; + compatible = "spansion,s25fl256s", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <30000000>; m25p,fast-read;arch/arm/dts/zynqmp-zc1232-revA.dts +1
-1@@ -41,7 +41,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB FIXME */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB FIXME */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/arm/dts/zynqmp-zc1254-revA.dts +1
-1@@ -41,7 +41,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/arm/dts/zynqmp-zc1275-revA.dts +1
-1@@ -41,7 +41,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/arm/dts/zynqmp-zc1275-revB.dts +1
-1@@ -42,7 +42,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +1
-1@@ -101,7 +101,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* Micron MT25QU512ABB8ESF */ + compatible = "m25p80", "jedec,spi-nor"; /* Micron MT25QU512ABB8ESF */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts +1
-1@@ -180,7 +180,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/arm/dts/zynqmp-zcu102-revA.dts +1
-1@@ -536,7 +536,7 @@ status = "okay"; is-dual = <1>; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/arm/dts/zynqmp-zcu104-revA.dts +1
-1@@ -169,7 +169,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* n25q512a 128MiB */ + compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/arm/dts/zynqmp-zcu104-revC.dts +1
-1@@ -175,7 +175,7 @@ &qspi { status = "okay"; flash at 0 { - compatible = "m25p80", "spi-flash"; /* n25q512a 128MiB */ + compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/arm/dts/zynqmp-zcu106-revA.dts +1
-1@@ -514,7 +514,7 @@ status = "okay"; is-dual = <1>; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/arm/dts/zynqmp-zcu111-revA.dts +1
-1@@ -451,7 +451,7 @@ status = "okay"; is-dual = <1>; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;arch/mips/dts/ap121.dts +1
-1@@ -34,7 +34,7 @@ spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; memory-map = <0x9f000000 0x00800000>; spi-max-frequency = <25000000>; reg = <0>;arch/mips/dts/ap143.dts +1
-1@@ -34,7 +34,7 @@ spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; memory-map = <0x9f000000 0x00800000>; spi-max-frequency = <25000000>; reg = <0>;arch/mips/dts/comtrend,ar-5315u.dts +1
-1@@ -78,7 +78,7 @@ status = "okay"; spi-flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; #address-cells = <1>; #size-cells = <1>;arch/mips/dts/comtrend,ar-5387un.dts +1
-1@@ -62,7 +62,7 @@ status = "okay"; spi-flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; #address-cells = <1>; #size-cells = <1>;arch/mips/dts/gardena-smart-gateway-mt7688.dts +1
-1@@ -97,7 +97,7 @@ spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; spi-max-frequency = <40000000>; reg = <0>; };arch/mips/dts/linkit-smart-7688.dts +1
-1@@ -38,7 +38,7 @@ spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; spi-max-frequency = <25000000>; reg = <0>; };arch/mips/dts/netgear,cg3100d.dts +1
-1@@ -93,7 +93,7 @@ status = "okay"; spi-flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; #address-cells = <1>; #size-cells = <1>;arch/mips/dts/sagem,f at st1704.dts +1
-1@@ -47,7 +47,7 @@ status = "okay"; spi-flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; #address-cells = <1>; #size-cells = <1>;arch/mips/dts/tplink_wdr4300.dts +1
-1@@ -35,7 +35,7 @@ spi-flash at 0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; memory-map = <0x1e000000 0x00800000>; spi-max-frequency = <25000000>; reg = <0>;arch/nds32/dts/ae3xx.dts +1
-1@@ -93,7 +93,7 @@ clocks = <&spiclk>; interrupts = <3 4>; flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; spi-cpol;arch/riscv/dts/ae350.dts +1
-1@@ -219,7 +219,7 @@ interrupts = <4 4>; interrupt-parent = <&plic0>; flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; spi-cpol;arch/riscv/dts/ae350_32.dts +1
-1@@ -219,7 +219,7 @@ interrupts = <4 4>; interrupt-parent = <&plic0>; flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; spi-cpol;arch/riscv/dts/ae350_64.dts +1
-1@@ -219,7 +219,7 @@ interrupts = <4 4>; interrupt-parent = <&plic0>; flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; spi-cpol;arch/sandbox/dts/test.dts +1
-1@@ -534,7 +534,7 @@ cs-gpios = <0>, <&gpio_a 0>; spi.bin at 0 { reg = <0>; - compatible = "spansion,m25p16", "spi-flash"; + compatible = "spansion,m25p16", "jedec,spi-nor"; spi-max-frequency = <40000000>; sandbox,filename = "spi.bin"; };arch/x86/dts/bayleybay.dts +1
-1@@ -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";arch/x86/dts/baytrail_som-db5800-som-6867.dts +1
-1@@ -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";arch/x86/dts/cherryhill.dts +1
-1@@ -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";arch/x86/dts/chromebook_link.dts +1
-1@@ -401,7 +401,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";arch/x86/dts/chromebook_samus.dts +1
-1@@ -538,7 +538,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";arch/x86/dts/chromebox_panther.dts +1
-1@@ -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";arch/x86/dts/conga-qeval20-qa3-e3845.dts +1
-1@@ -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";arch/x86/dts/cougarcanyon2.dts +1
-1@@ -154,7 +154,7 @@ spi-flash at 0 { reg = <0>; - compatible = "winbond,w25q64bv", "spi-flash"; + compatible = "winbond,w25q64bv", "jedec,spi-nor"; memory-map = <0xff800000 0x00800000>; }; };arch/x86/dts/crownbay.dts +1
-1@@ -223,7 +223,7 @@ spi-flash at 0 { reg = <0>; compatible = "sst,25vf016b", - "spi-flash"; + "jedec,spi-nor"; memory-map = <0xffe00000 0x00200000>; }; };arch/x86/dts/dfi-bt700.dtsi +1
-1@@ -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";arch/x86/dts/galileo.dts +1
-1@@ -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";arch/x86/dts/minnowmax.dts +1
-1@@ -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";
PATCH v2 3/5 mtd: sf_probe: remove spi-flash compatible
In reply to Neil ArmstrongNow the "spi-flash" compatible has been removed in the DTS files, remove this compatible from sf_probe to finally use the Linux "jedec,spi-nor" compatible.
--- drivers/mtd/spi/sf_probe.c | 1 - 1 file changed, 1 deletion(-)
drivers/mtd/spi/sf_probe.c +0 -1
@@ -160,7 +160,6 @@ static const struct dm_spi_flash_ops spi_flash_std_ops = { };static const struct udevice_id spi_flash_std_ids[] = { - { .compatible ="spi-flash" }, { .compatible ="jedec,spi-nor" }, { } };
Signature · 1 line
2.19.2
PATCH v2 3/5 mtd: sf_probe: remove spi-flash compatible
+ Simon
Quoted 15 lines · Neil Armstrong
Now the "spi-flash" compatible has been removed in the DTS files, remove this compatible from
sf_probeto finally use the Linux "jedec,spi-nor" compatible.Signed-off-by Neil Armstrong <[email protected]>--- drivers/mtd/spi/sf_probe.c | 1 - 1 file changed, 1 deletion(-)drivers/mtd/spi/sf_probe.c +0
-0
drivers/mtd/spi/sf_probe.c static const struct dm_spi_flash_ops spi_flash_std_ops = { · line 163
Quoted 5 lines
drivers/mtd/spi/sf_probe.c +0
-1@@ -160,7 +160,6 @@ static const struct dm_spi_flash_ops spi_flash_std_ops = { };static const struct udevice_id spi_flash_std_ids[] = { - { .compatible ="spi-flash" }, { .compatible ="jedec,spi-nor" },
Sandbox is the user for spi-flash binding, but I'm fine with using know binding from Linux to use sandbox. Simon is that OK?
PATCH v2 4/5 fdtdec: switch GENERIC_SPI_FLASH to jedec, spi-nor
In reply to Neil ArmstrongThe x86 code uses "spi-flash" to detect a flash node, switch to "jedec,spi-nor" since the DTS files has been switched already.
--- lib/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/fdtdec.c +1 -1
@@ -49,7 +49,7 @@ static const char * const compat_names[COMPAT_COUNT] = {COMPAT (SAMSUNG_EXYNOS_MIPI_DSI ,"samsung,exynos-mipi-dsi" ),COMPAT (SAMSUNG_EXYNOS_DWMMC ,"samsung,exynos-dwmmc" ),COMPAT (SAMSUNG_EXYNOS_MMC ,"samsung,exynos-mmc" ), -COMPAT (GENERIC_SPI_FLASH ,"spi-flash" ), +COMPAT (GENERIC_SPI_FLASH ,"jedec,spi-nor" ),COMPAT (MAXIM_98095_CODEC ,"maxim,max98095-codec" ),COMPAT (SAMSUNG_EXYNOS5_I2C ,"samsung,exynos5-hsi2c" ), COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
Signature · 1 line
2.19.2
PATCH v2 4/5 fdtdec: switch GENERIC_SPI_FLASH to jedec, spi-nor
Quoted 14 lines · Neil Armstrong
The x86 code uses "spi-flash" to detect a flash node, switch to "jedec,spi-nor" since the DTS files has been switched already.
Signed-off-by Neil Armstrong <[email protected]>--- lib/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/fdtdec.c +0
-0
lib/fdtdec.c static const char * const compat_names[COMPAT_COUNT] = { · line 52
Quoted 5 lines
lib/fdtdec.c +1
-1@@ -49,7 +49,7 @@ static const char * const compat_names[COMPAT_COUNT] = {COMPAT (SAMSUNG_EXYNOS_MIPI_DSI ,"samsung,exynos-mipi-dsi" ),COMPAT (SAMSUNG_EXYNOS_DWMMC ,"samsung,exynos-dwmmc" ),COMPAT (SAMSUNG_EXYNOS_MMC ,"samsung,exynos-mmc" ), - COMPAT(GENERIC_SPI_FLASH, "spi-flash"), + COMPAT(GENERIC_SPI_FLASH, "jedec,spi-nor"),
I'm not familiar with this code and where it is used, but to keep U-Boot buildable and runnable (e.g. for 'git bisect'), do we need to move this patch to before removing the "spi-flash" compatible or even into patch 2 where the device trees are changed?
Regards,
Simon
Quoted 6 lines
lib/fdtdec.c +0
-1COMPAT (MAXIM_98095_CODEC ,"maxim,max98095-codec" ),COMPAT (SAMSUNG_EXYNOS5_I2C ,"samsung,exynos5-hsi2c" ), COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"), --2.19.2
PATCH v2 4/5 fdtdec: switch GENERIC_SPI_FLASH to jedec, spi-nor
Quoted 10 lines · Simon Goldschmidt
Quoted 9 lines · Neil Armstrong
The x86 code uses "spi-flash" to detect a flash node, switch to "jedec,spi-nor" since the DTS files has been switched already.
Signed-off-by Neil Armstrong <[email protected]>--- lib/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines
lib/fdtdec.c static const char * const compat_names[COMPAT_COUNT] = { · line 52
Quoted 10 lines
lib/fdtdec.c +1
-1@@ -49,7 +49,7 @@ static const char * const compat_names[COMPAT_COUNT] = {COMPAT (SAMSUNG_EXYNOS_MIPI_DSI ,"samsung,exynos-mipi-dsi" ),COMPAT (SAMSUNG_EXYNOS_DWMMC ,"samsung,exynos-dwmmc" ),COMPAT (SAMSUNG_EXYNOS_MMC ,"samsung,exynos-mmc" ), - COMPAT(GENERIC_SPI_FLASH, "spi-flash"), + COMPAT(GENERIC_SPI_FLASH, "jedec,spi-nor"),I'm not familiar with this code and where it is used, but to keep U-Boot buildable and runnable (e.g. for 'git bisect'), do we need to move this patch to before removing the "spi-flash" compatible or even into patch 2 where the device trees are changed?
Yep, it should even go in the same patch as the x86 dts changes.
Neil
Quoted 10 lines
Regards,
SimonQuoted 6 lines
lib/fdtdec.c +0
-1COMPAT (MAXIM_98095_CODEC ,"maxim,max98095-codec" ),COMPAT (SAMSUNG_EXYNOS5_I2C ,"samsung,exynos5-hsi2c" ), COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"), --2.19.2
PATCH v2 4/5 fdtdec: switch GENERIC_SPI_FLASH to jedec, spi-nor
Quoted 28 lines · Neil Armstrong
Quoted 10 lines · Simon Goldschmidt
Quoted 9 lines · Neil Armstrong
The x86 code uses "spi-flash" to detect a flash node, switch to "jedec,spi-nor" since the DTS files has been switched already.
Signed-off-by Neil Armstrong <[email protected]>--- lib/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 15 lines
lib/fdtdec.c static const char * const compat_names[COMPAT_COUNT] = { · line 52
Quoted 10 lines
lib/fdtdec.c +1
-1@@ -49,7 +49,7 @@ static const char * const compat_names[COMPAT_COUNT] = {COMPAT (SAMSUNG_EXYNOS_MIPI_DSI ,"samsung,exynos-mipi-dsi" ),COMPAT (SAMSUNG_EXYNOS_DWMMC ,"samsung,exynos-dwmmc" ),COMPAT (SAMSUNG_EXYNOS_MMC ,"samsung,exynos-mmc" ), - COMPAT(GENERIC_SPI_FLASH, "spi-flash"), + COMPAT(GENERIC_SPI_FLASH, "jedec,spi-nor"),I'm not familiar with this code and where it is used, but to keep U-Boot buildable and runnable (e.g. for 'git bisect'), do we need to move this patch to before removing the "spi-flash" compatible or even into patch 2 where the device trees are changed?
Quoted 1 line
Yep, it should even go in the same patch as the x86 dts changes.
Yes, I think so. Thanks for doing this!
Regards,
Bin
PATCH v2 5/5 doc: device-tree-bindings: switch from spi-flash to jedec, spi-nor
In reply to Neil ArmstrongSince all DTS files has been switched to "jedec,spi-nor", remove the "spi-flash" compatible from the bindings examples.
--- doc/device-tree-bindings/pinctrl/atmel,at91-pio4-pinctrl.txt | 2 +- doc/device-tree-bindings/spi/spi-atcspi200.txt | 2 +- doc/device-tree-bindings/spi/spi-stm32-qspi.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
doc/device-tree-bindings/pinctrl/atmel,at91-pio4-pinctrl.txt +1 -1
@@ -42,7 +42,7 @@ Example: status = "okay"; spi_flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; };
doc/device-tree-bindings/spi/spi-atcspi200.txt +1 -1
@@ -28,7 +28,7 @@ Example: clocks = <&spiclk>; interrupts = <3 4>; flash at 0 { - compatible = "spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; spi-cpol;
doc/device-tree-bindings/spi/spi-stm32-qspi.txt +1 -1
@@ -29,7 +29,7 @@ Example: qflash0: n25q128a { #address-cells = <1>; #size-cells = <1>; - compatible = "micron,n25q128a13", "spi-flash"; + compatible = "micron,n25q128a13", "jedec,spi-nor"; spi-max-frequency = <108000000>; spi-tx-bus-width = <4>; spi-rx-bus-width = <4>;
Signature · 1 line
2.19.2
v2 cover spi-flash: switch to "jedec, spi-nor" binding
In reply to Neil ArmstrongQuoted 9 lines · Neil Armstrong
There is no reason not to use the Linux "jedec,spi-nor" binding in u-boot. This patchset :
- adds this compatible intosf_probeand will avoid changing the device tree files to add a u-boot specific compatible to probe a spi flash.
- switches all DTS/DTSI files to "jedec,spi-nor"
- remove the "spi-flash" compatible from sf-probe
- switchGENERIC_SPI_FLASHto jedec,spi-nor in fdtdec
- switches dt bindings examples files to "jedec,spi-nor"
Thanks for working on this!
Aside from the comment to patch #4:
I'll try to find the time to do a test-run on my hardware, but honestly, I don't expect to find problems ;-)
Regards,
Simon
Quoted 136 lines
Neil Armstrong (5):
mtd:sf_probe: add jedec,spi-nor compatible
dts: switch spi-flash to jedec,spi-nor compatible
mtd:sf_probe: remove spi-flash compatible
fdtdec: switchGENERIC_SPI_FLASHto jedec,spi-nor
doc: device-tree-bindings: switch from spi-flash to jedec,spi-norarch/arc/dts/axs10x_mb.dtsi | 2 +- arch/arc/dts/hsdk.dts | 2 +- arch/arm/dts/am335x-brppt1-spi.dts | 2 +- arch/arm/dts/am437x-idk-evm.dts | 2 +- arch/arm/dts/am437x-sk-evm.dts | 2 +- arch/arm/dts/armada-3720-db.dts | 2 +- arch/arm/dts/armada-3720-espressobin.dts | 2 +- arch/arm/dts/armada-3720-turris-mox.dts | 2 +- arch/arm/dts/armada-385-amc.dts | 2 +- arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +- arch/arm/dts/armada-38x-controlcenterdc.dts | 4 ++-- arch/arm/dts/armada-38x-solidrun-microsom.dtsi | 2 +- arch/arm/dts/armada-8040-clearfog-gt-8k.dts | 2 +- arch/arm/dts/armada-xp-theadorable.dts | 2 +- arch/arm/dts/at91-sama5d2_xplained.dts | 2 +- arch/arm/dts/at91-sama5d4_xplained.dts | 2 +- arch/arm/dts/at91-sama5d4ek.dts | 2 +- arch/arm/dts/at91sam9n12ek.dts | 2 +- arch/arm/dts/at91sam9x5ek.dtsi | 2 +- arch/arm/dts/bk4r1.dts | 4 ++-- arch/arm/dts/da850-evm-u-boot.dtsi | 2 +- arch/arm/dts/exynos5250-snow.dts | 2 +- arch/arm/dts/exynos5250-spring.dts | 2 +- arch/arm/dts/exynos5420-peach-pit.dts | 2 +- arch/arm/dts/fsl-ls1012a-2g5rdb.dts | 2 +- arch/arm/dts/fsl-ls1012a-frdm.dtsi | 2 +- arch/arm/dts/fsl-ls1012a-frwy.dts | 2 +- arch/arm/dts/fsl-ls1012a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1012a-rdb.dtsi | 2 +- arch/arm/dts/fsl-ls1043a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1043a-rdb.dts | 2 +- arch/arm/dts/fsl-ls1046a-qds.dtsi | 8 ++++---- arch/arm/dts/fsl-ls1046a-rdb.dts | 4 ++-- arch/arm/dts/fsl-ls1088a-qds.dts | 10 +++++----- arch/arm/dts/fsl-ls1088a-rdb.dts | 4 ++-- arch/arm/dts/fsl-ls2080a-qds.dts | 8 ++++---- arch/arm/dts/fsl-ls2080a-rdb.dts | 2 +- arch/arm/dts/fsl-ls2081a-rdb.dts | 6 +++--- arch/arm/dts/fsl-ls2088a-rdb-qspi.dts | 6 +++--- arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6sx-sdb-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ull-14x14-evk.dts | 2 +- arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi | 2 +- arch/arm/dts/keystone-k2e-evm.dts | 2 +- arch/arm/dts/keystone-k2g-evm.dts | 4 ++-- arch/arm/dts/keystone-k2g-ice.dts | 2 +- arch/arm/dts/keystone-k2hk-evm.dts | 2 +- arch/arm/dts/keystone-k2l-evm.dts | 2 +- arch/arm/dts/kirkwood-atl-sbx81lifkw.dts | 2 +- arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts | 2 +- arch/arm/dts/kirkwood-dreamplug.dts | 2 +- arch/arm/dts/kirkwood-lsxl.dtsi | 2 +- arch/arm/dts/kirkwood-netxbig.dtsi | 2 +- arch/arm/dts/kirkwood-ns2-common.dtsi | 2 +- arch/arm/dts/kirkwood-synology.dtsi | 2 +- arch/arm/dts/ls1021a-iot.dtsi | 4 ++-- arch/arm/dts/ls1021a-qds.dtsi | 2 +- arch/arm/dts/ls1021a-twr.dtsi | 4 ++-- arch/arm/dts/mt7629-rfb.dts | 2 +- arch/arm/dts/omap5-u-boot.dtsi | 2 +- arch/arm/dts/r8a77970-eagle-u-boot.dts | 2 +- arch/arm/dts/rk3288-veyron.dtsi | 2 +- arch/arm/dts/rk3368-lion.dts | 2 +- arch/arm/dts/rk3399-puma.dtsi | 2 +- arch/arm/dts/rv1108-evb.dts | 2 +- arch/arm/dts/sama5d27_som1.dtsi | 2 +- arch/arm/dts/sama5d3xmb.dtsi | 2 +- arch/arm/dts/sama5d3xmb_cmp.dtsi | 2 +- arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_is1.dts | 2 +- arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 +- arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi | 4 ++-- arch/arm/dts/stm32f746-disco.dts | 2 +- arch/arm/dts/stm32f769-disco.dts | 2 +- arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 ++-- arch/arm/dts/stv0991.dts | 2 +- arch/arm/dts/zynq-zed.dts | 2 +- arch/arm/dts/zynqmp-zc1232-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1275-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1275-revB.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 2 +- arch/mips/dts/ap121.dts | 2 +- arch/mips/dts/ap143.dts | 2 +- arch/mips/dts/comtrend,ar-5315u.dts | 2 +- arch/mips/dts/comtrend,ar-5387un.dts | 2 +- arch/mips/dts/gardena-smart-gateway-mt7688.dts | 2 +- arch/mips/dts/linkit-smart-7688.dts | 2 +- arch/mips/dts/netgear,cg3100d.dts | 2 +- arch/mips/dts/sagem,f at st1704.dts | 2 +- arch/mips/dts/tplink_wdr4300.dts | 2 +- arch/nds32/dts/ae3xx.dts | 2 +- arch/riscv/dts/ae350.dts | 2 +- arch/riscv/dts/ae350_32.dts | 2 +- arch/riscv/dts/ae350_64.dts | 2 +- arch/sandbox/dts/test.dts | 2 +- arch/x86/dts/bayleybay.dts | 2 +- arch/x86/dts/baytrail_som-db5800-som-6867.dts | 2 +- arch/x86/dts/cherryhill.dts | 2 +- arch/x86/dts/chromebook_link.dts | 2 +- arch/x86/dts/chromebook_samus.dts | 2 +- arch/x86/dts/chromebox_panther.dts | 2 +- arch/x86/dts/conga-qeval20-qa3-e3845.dts | 2 +- arch/x86/dts/cougarcanyon2.dts | 2 +- arch/x86/dts/crownbay.dts | 2 +- arch/x86/dts/dfi-bt700.dtsi | 2 +- arch/x86/dts/galileo.dts | 2 +- arch/x86/dts/minnowmax.dts | 2 +- .../pinctrl/atmel,at91-pio4-pinctrl.txt | 2 +- doc/device-tree-bindings/spi/spi-atcspi200.txt | 2 +- doc/device-tree-bindings/spi/spi-stm32-qspi.txt | 2 +- drivers/mtd/spi/sf_probe.c | 2 +- lib/fdtdec.c | 2 +- 124 files changed, 155 insertions(+), 155 deletions(-)--
2.19.2