* [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding
@ 2019-01-15 12:59 Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 1/5] mtd: sf_probe: add jedec, spi-nor compatible Neil Armstrong
` (6 more replies)
0 siblings, 7 replies; 14+ messages in thread
From: Neil Armstrong @ 2019-01-15 12:59 UTC (permalink / raw
To: u-boot
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"
Changes since v2:
- collected tags
- extracted x86 dts changed and merged it with the fdtdec change
- updated for new boards
Neil Armstrong (5):
mtd: sf_probe: add jedec,spi-nor compatible
dts: switch spi-flash to jedec,spi-nor compatible
x86: dts: switch spi-flash to jedec,spi-nor compatible
mtd: sf_probe: remove spi-flash compatible
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/luton_pcb091.dts | 2 +-
arch/mips/dts/mscc,ocelot_pcb.dtsi | 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_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 +-
125 files changed, 156 insertions(+), 156 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 1/5] mtd: sf_probe: add jedec, spi-nor compatible
2019-01-15 12:59 [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
@ 2019-01-15 12:59 ` Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 2/5] dts: switch spi-flash to " Neil Armstrong
` (5 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Neil Armstrong @ 2019-01-15 12:59 UTC (permalink / raw
To: u-boot
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.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---
drivers/mtd/spi/sf_probe.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 00f8558e70..7a379914d8 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -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" },
{ }
};
--
2.20.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 2/5] dts: switch spi-flash to jedec, spi-nor compatible
2019-01-15 12:59 [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 1/5] mtd: sf_probe: add jedec, spi-nor compatible Neil Armstrong
@ 2019-01-15 12:59 ` Neil Armstrong
2019-01-17 18:08 ` [U-Boot] [uboot-snps-arc] " Eugeniy Paltsev
` (2 more replies)
2019-01-15 12:59 ` [U-Boot] [PATCH v3 3/5] x86: " Neil Armstrong
` (4 subsequent siblings)
6 siblings, 3 replies; 14+ messages in thread
From: Neil Armstrong @ 2019-01-15 12:59 UTC (permalink / raw
To: u-boot
There is no reason not to use the Linux "jedec,spi-nor" binding in U-Boot
dts files. This compatible has been added in sf_probe, let use it.
This patch switches to jedec,spi-nor when spi-flash is used in the DTS
and DTSI files, and removed spi-flash when jedec,spi-nor is already
present.
The x86 dts are switched in a separate commit since it depends on a change
in fdtdec.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---
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/luton_pcb091.dts | 2 +-
arch/mips/dts/mscc,ocelot_pcb.dtsi | 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_32.dts | 2 +-
arch/riscv/dts/ae350_64.dts | 2 +-
arch/sandbox/dts/test.dts | 2 +-
108 files changed, 139 insertions(+), 139 deletions(-)
diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi
index dfc03810ca..b5aacd5170 100644
--- a/arch/arc/dts/axs10x_mb.dtsi
+++ b/arch/arc/dts/axs10x_mb.dtsi
@@ -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>;
};
diff --git a/arch/arc/dts/hsdk.dts b/arch/arc/dts/hsdk.dts
index f024b96925..5e9ba054a4 100644
--- a/arch/arc/dts/hsdk.dts
+++ b/arch/arc/dts/hsdk.dts
@@ -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>;
};
diff --git a/arch/arm/dts/am335x-brppt1-spi.dts b/arch/arm/dts/am335x-brppt1-spi.dts
index 522ed50902..01ab74be5e 100644
--- a/arch/arm/dts/am335x-brppt1-spi.dts
+++ b/arch/arm/dts/am335x-brppt1-spi.dts
@@ -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>;
};
diff --git a/arch/arm/dts/am437x-idk-evm.dts b/arch/arm/dts/am437x-idk-evm.dts
index 28e3e1ba32..19d1462d15 100644
--- a/arch/arm/dts/am437x-idk-evm.dts
+++ b/arch/arm/dts/am437x-idk-evm.dts
@@ -339,7 +339,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;
diff --git a/arch/arm/dts/am437x-sk-evm.dts b/arch/arm/dts/am437x-sk-evm.dts
index 927d8d3e88..dc8fcde458 100644
--- a/arch/arm/dts/am437x-sk-evm.dts
+++ b/arch/arm/dts/am437x-sk-evm.dts
@@ -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;
diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts
index 770c08aa7d..1b219c423b 100644
--- a/arch/arm/dts/armada-3720-db.dts
+++ b/arch/arm/dts/armada-3720-db.dts
@@ -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;
diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts
index 7bfccb0435..84e2c2adba 100644
--- a/arch/arm/dts/armada-3720-espressobin.dts
+++ b/arch/arm/dts/armada-3720-espressobin.dts
@@ -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;
diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts
index 7babc16679..91a9cd088b 100644
--- a/arch/arm/dts/armada-3720-turris-mox.dts
+++ b/arch/arm/dts/armada-3720-turris-mox.dts
@@ -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;
diff --git a/arch/arm/dts/armada-385-amc.dts b/arch/arm/dts/armada-385-amc.dts
index d4d127fa02..93c80e35f5 100644
--- a/arch/arm/dts/armada-385-amc.dts
+++ b/arch/arm/dts/armada-385-amc.dts
@@ -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;
diff --git a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
index 904429b974..1b46797583 100644
--- a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
+++ b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
@@ -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;
diff --git a/arch/arm/dts/armada-38x-controlcenterdc.dts b/arch/arm/dts/armada-38x-controlcenterdc.dts
index 2cc996876a..788fd2218b 100644
--- a/arch/arm/dts/armada-38x-controlcenterdc.dts
+++ b/arch/arm/dts/armada-38x-controlcenterdc.dts
@@ -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;
diff --git a/arch/arm/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/dts/armada-38x-solidrun-microsom.dtsi
index 74f58de85c..a2627223ce 100644
--- a/arch/arm/dts/armada-38x-solidrun-microsom.dtsi
+++ b/arch/arm/dts/armada-38x-solidrun-microsom.dtsi
@@ -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";
diff --git a/arch/arm/dts/armada-8040-clearfog-gt-8k.dts b/arch/arm/dts/armada-8040-clearfog-gt-8k.dts
index 498105f25f..659a9c9d35 100644
--- a/arch/arm/dts/armada-8040-clearfog-gt-8k.dts
+++ b/arch/arm/dts/armada-8040-clearfog-gt-8k.dts
@@ -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>;
diff --git a/arch/arm/dts/armada-xp-theadorable.dts b/arch/arm/dts/armada-xp-theadorable.dts
index 965c38426c..6231910c68 100644
--- a/arch/arm/dts/armada-xp-theadorable.dts
+++ b/arch/arm/dts/armada-xp-theadorable.dts
@@ -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>;
};
diff --git a/arch/arm/dts/at91-sama5d2_xplained.dts b/arch/arm/dts/at91-sama5d2_xplained.dts
index 33064b390a..c0708feeb7 100644
--- a/arch/arm/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/dts/at91-sama5d2_xplained.dts
@@ -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;
diff --git a/arch/arm/dts/at91-sama5d4_xplained.dts b/arch/arm/dts/at91-sama5d4_xplained.dts
index 58a0e60d18..7da5086865 100644
--- a/arch/arm/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/dts/at91-sama5d4_xplained.dts
@@ -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>;
};
diff --git a/arch/arm/dts/at91-sama5d4ek.dts b/arch/arm/dts/at91-sama5d4ek.dts
index a5d75452cf..c1d657814d 100644
--- a/arch/arm/dts/at91-sama5d4ek.dts
+++ b/arch/arm/dts/at91-sama5d4ek.dts
@@ -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>;
};
diff --git a/arch/arm/dts/at91sam9n12ek.dts b/arch/arm/dts/at91sam9n12ek.dts
index 888bda15aa..64a7abf639 100644
--- a/arch/arm/dts/at91sam9n12ek.dts
+++ b/arch/arm/dts/at91sam9n12ek.dts
@@ -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>;
};
diff --git a/arch/arm/dts/at91sam9x5ek.dtsi b/arch/arm/dts/at91sam9x5ek.dtsi
index f2a532d605..1f7f37b687 100644
--- a/arch/arm/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/dts/at91sam9x5ek.dtsi
@@ -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>;
};
diff --git a/arch/arm/dts/bk4r1.dts b/arch/arm/dts/bk4r1.dts
index 866b80e0b0..16c60268fb 100644
--- a/arch/arm/dts/bk4r1.dts
+++ b/arch/arm/dts/bk4r1.dts
@@ -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>;
};
diff --git a/arch/arm/dts/da850-evm-u-boot.dtsi b/arch/arm/dts/da850-evm-u-boot.dtsi
index ab1de77954..360e79e68d 100644
--- a/arch/arm/dts/da850-evm-u-boot.dtsi
+++ b/arch/arm/dts/da850-evm-u-boot.dtsi
@@ -7,5 +7,5 @@
*/
&flash {
- compatible = "m25p64", "spi-flash";
+ compatible = "m25p64", "jedec,spi-nor";
};
diff --git a/arch/arm/dts/exynos5250-snow.dts b/arch/arm/dts/exynos5250-snow.dts
index 7587dc0ff2..e41f2d3041 100644
--- a/arch/arm/dts/exynos5250-snow.dts
+++ b/arch/arm/dts/exynos5250-snow.dts
@@ -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>;
};
};
diff --git a/arch/arm/dts/exynos5250-spring.dts b/arch/arm/dts/exynos5250-spring.dts
index 191e12af6a..ae142a69ab 100644
--- a/arch/arm/dts/exynos5250-spring.dts
+++ b/arch/arm/dts/exynos5250-spring.dts
@@ -96,7 +96,7 @@
spi at 12d30000 {
spi-max-frequency = <50000000>;
firmware_storage_spi: flash at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
reg = <0>;
};
};
diff --git a/arch/arm/dts/exynos5420-peach-pit.dts b/arch/arm/dts/exynos5420-peach-pit.dts
index 4a96a18110..a68c3b5174 100644
--- a/arch/arm/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/dts/exynos5420-peach-pit.dts
@@ -257,7 +257,7 @@
spi at 12d30000 { /* spi1 */
spi-max-frequency = <50000000>;
firmware_storage_spi: flash at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
reg = <0>;
/*
diff --git a/arch/arm/dts/fsl-ls1012a-2g5rdb.dts b/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
index cdd4ce45aa..fecef88e08 100644
--- a/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
+++ b/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls1012a-frdm.dtsi b/arch/arm/dts/fsl-ls1012a-frdm.dtsi
index 9cb3de1d40..a357793bfa 100644
--- a/arch/arm/dts/fsl-ls1012a-frdm.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-frdm.dtsi
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls1012a-frwy.dts b/arch/arm/dts/fsl-ls1012a-frwy.dts
index a56909ab92..7242af51e4 100644
--- a/arch/arm/dts/fsl-ls1012a-frwy.dts
+++ b/arch/arm/dts/fsl-ls1012a-frwy.dts
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls1012a-qds.dtsi b/arch/arm/dts/fsl-ls1012a-qds.dtsi
index 661af0e49e..a330597b6c 100644
--- a/arch/arm/dts/fsl-ls1012a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-qds.dtsi
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dtsi b/arch/arm/dts/fsl-ls1012a-rdb.dtsi
index 757e2eb351..f053e789c2 100644
--- a/arch/arm/dts/fsl-ls1012a-rdb.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-rdb.dtsi
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls1043a-qds.dtsi b/arch/arm/dts/fsl-ls1043a-qds.dtsi
index 3841aee11e..70e1a6a53f 100644
--- a/arch/arm/dts/fsl-ls1043a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1043a-qds.dtsi
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls1043a-rdb.dts b/arch/arm/dts/fsl-ls1043a-rdb.dts
index c42cad7034..721b158169 100644
--- a/arch/arm/dts/fsl-ls1043a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1043a-rdb.dts
@@ -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 */
};
diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi
index ada8a859b1..c95f44fc36 100644
--- a/arch/arm/dts/fsl-ls1046a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index ba30fd262a..a05c9e9b9e 100644
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls1088a-qds.dts b/arch/arm/dts/fsl-ls1088a-qds.dts
index 4ea451c1b6..8fbb52f0e0 100644
--- a/arch/arm/dts/fsl-ls1088a-qds.dts
+++ b/arch/arm/dts/fsl-ls1088a-qds.dts
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls1088a-rdb.dts b/arch/arm/dts/fsl-ls1088a-rdb.dts
index f30bbb7247..765d1e3d74 100644
--- a/arch/arm/dts/fsl-ls1088a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1088a-rdb.dts
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls2080a-qds.dts b/arch/arm/dts/fsl-ls2080a-qds.dts
index 39fbc1b79c..2a0a5280d0 100644
--- a/arch/arm/dts/fsl-ls2080a-qds.dts
+++ b/arch/arm/dts/fsl-ls2080a-qds.dts
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls2080a-rdb.dts b/arch/arm/dts/fsl-ls2080a-rdb.dts
index e7567cfa23..0a87caeba9 100644
--- a/arch/arm/dts/fsl-ls2080a-rdb.dts
+++ b/arch/arm/dts/fsl-ls2080a-rdb.dts
@@ -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;
diff --git a/arch/arm/dts/fsl-ls2081a-rdb.dts b/arch/arm/dts/fsl-ls2081a-rdb.dts
index 73e2683d59..b0b7ef08a0 100644
--- a/arch/arm/dts/fsl-ls2081a-rdb.dts
+++ b/arch/arm/dts/fsl-ls2081a-rdb.dts
@@ -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>;
};
diff --git a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
index c8bf9a01fe..df56a4169d 100644
--- a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
+++ b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
@@ -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>;
};
diff --git a/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
index f5c68d707c..549461df71 100644
--- a/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
+++ b/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
@@ -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";
};
};
diff --git a/arch/arm/dts/imx6sx-sdb-u-boot.dtsi b/arch/arm/dts/imx6sx-sdb-u-boot.dtsi
index 8e592cded9..8f9236da0f 100644
--- a/arch/arm/dts/imx6sx-sdb-u-boot.dtsi
+++ b/arch/arm/dts/imx6sx-sdb-u-boot.dtsi
@@ -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";
};
};
diff --git a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
index db640d6e67..77cb461a21 100644
--- a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
@@ -5,6 +5,6 @@
&qspi {
flash0: n25q256a at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
};
};
\ No newline at end of file
diff --git a/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi
index db640d6e67..77cb461a21 100644
--- a/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi
@@ -5,6 +5,6 @@
&qspi {
flash0: n25q256a at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
};
};
\ No newline at end of file
diff --git a/arch/arm/dts/imx6ull-14x14-evk.dts b/arch/arm/dts/imx6ull-14x14-evk.dts
index 8a1b67d6bb..9ebcfe1f4e 100644
--- a/arch/arm/dts/imx6ull-14x14-evk.dts
+++ b/arch/arm/dts/imx6ull-14x14-evk.dts
@@ -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>;
diff --git a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
index 2ce6961096..585af6d211 100644
--- a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
@@ -5,6 +5,6 @@
&qspi1 {
flash0: mx25l51245g at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
};
};
diff --git a/arch/arm/dts/keystone-k2e-evm.dts b/arch/arm/dts/keystone-k2e-evm.dts
index 3be8b53252..9288df21ce 100644
--- a/arch/arm/dts/keystone-k2e-evm.dts
+++ b/arch/arm/dts/keystone-k2e-evm.dts
@@ -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>;
diff --git a/arch/arm/dts/keystone-k2g-evm.dts b/arch/arm/dts/keystone-k2g-evm.dts
index 6c9de25b94..d91869f2c2 100644
--- a/arch/arm/dts/keystone-k2g-evm.dts
+++ b/arch/arm/dts/keystone-k2g-evm.dts
@@ -75,7 +75,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>;
@@ -97,7 +97,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>;
diff --git a/arch/arm/dts/keystone-k2g-ice.dts b/arch/arm/dts/keystone-k2g-ice.dts
index 698338b93d..680dfee071 100644
--- a/arch/arm/dts/keystone-k2g-ice.dts
+++ b/arch/arm/dts/keystone-k2g-ice.dts
@@ -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>;
diff --git a/arch/arm/dts/keystone-k2hk-evm.dts b/arch/arm/dts/keystone-k2hk-evm.dts
index 76a675f1e4..84c58d75ad 100644
--- a/arch/arm/dts/keystone-k2hk-evm.dts
+++ b/arch/arm/dts/keystone-k2hk-evm.dts
@@ -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>;
diff --git a/arch/arm/dts/keystone-k2l-evm.dts b/arch/arm/dts/keystone-k2l-evm.dts
index b5c56176bf..91cefdf2aa 100644
--- a/arch/arm/dts/keystone-k2l-evm.dts
+++ b/arch/arm/dts/keystone-k2l-evm.dts
@@ -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>;
diff --git a/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts b/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts
index e5b1efa141..4ae74f4316 100644
--- a/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts
+++ b/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts
@@ -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>;
diff --git a/arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts b/arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts
index c234449936..6e3418f246 100644
--- a/arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts
+++ b/arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts
@@ -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>;
diff --git a/arch/arm/dts/kirkwood-dreamplug.dts b/arch/arm/dts/kirkwood-dreamplug.dts
index a647a65c20..7f326e2674 100644
--- a/arch/arm/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/dts/kirkwood-dreamplug.dts
@@ -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>;
diff --git a/arch/arm/dts/kirkwood-lsxl.dtsi b/arch/arm/dts/kirkwood-lsxl.dtsi
index 479a750d1d..c99c0da093 100644
--- a/arch/arm/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/dts/kirkwood-lsxl.dtsi
@@ -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>;
diff --git a/arch/arm/dts/kirkwood-netxbig.dtsi b/arch/arm/dts/kirkwood-netxbig.dtsi
index 135ac8021c..b5737026e2 100644
--- a/arch/arm/dts/kirkwood-netxbig.dtsi
+++ b/arch/arm/dts/kirkwood-netxbig.dtsi
@@ -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>;
diff --git a/arch/arm/dts/kirkwood-ns2-common.dtsi b/arch/arm/dts/kirkwood-ns2-common.dtsi
index f997bb4df2..51530ea866 100644
--- a/arch/arm/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/dts/kirkwood-ns2-common.dtsi
@@ -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>;
diff --git a/arch/arm/dts/kirkwood-synology.dtsi b/arch/arm/dts/kirkwood-synology.dtsi
index b80d8ee370..c97ed29a0a 100644
--- a/arch/arm/dts/kirkwood-synology.dtsi
+++ b/arch/arm/dts/kirkwood-synology.dtsi
@@ -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>;
diff --git a/arch/arm/dts/ls1021a-iot.dtsi b/arch/arm/dts/ls1021a-iot.dtsi
index 3371b9f572..7633ddb4fb 100644
--- a/arch/arm/dts/ls1021a-iot.dtsi
+++ b/arch/arm/dts/ls1021a-iot.dtsi
@@ -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;
diff --git a/arch/arm/dts/ls1021a-qds.dtsi b/arch/arm/dts/ls1021a-qds.dtsi
index 47c128f16f..56017a4687 100644
--- a/arch/arm/dts/ls1021a-qds.dtsi
+++ b/arch/arm/dts/ls1021a-qds.dtsi
@@ -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>;
};
diff --git a/arch/arm/dts/ls1021a-twr.dtsi b/arch/arm/dts/ls1021a-twr.dtsi
index 14e0ceafe7..9b8d92baa1 100644
--- a/arch/arm/dts/ls1021a-twr.dtsi
+++ b/arch/arm/dts/ls1021a-twr.dtsi
@@ -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;
diff --git a/arch/arm/dts/mt7629-rfb.dts b/arch/arm/dts/mt7629-rfb.dts
index a6d28a060f..52c30260f2 100644
--- a/arch/arm/dts/mt7629-rfb.dts
+++ b/arch/arm/dts/mt7629-rfb.dts
@@ -51,7 +51,7 @@
status = "okay";
spi-flash at 0{
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
reg = <0>;
u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/omap5-u-boot.dtsi b/arch/arm/dts/omap5-u-boot.dtsi
index 54a7285e6e..1b1d765fae 100644
--- a/arch/arm/dts/omap5-u-boot.dtsi
+++ b/arch/arm/dts/omap5-u-boot.dtsi
@@ -68,7 +68,7 @@
u-boot,dm-spl;
m25p80 at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
u-boot,dm-spl;
};
};
diff --git a/arch/arm/dts/r8a77970-eagle-u-boot.dts b/arch/arm/dts/r8a77970-eagle-u-boot.dts
index 5b17f1d1f0..eb868eda41 100644
--- a/arch/arm/dts/r8a77970-eagle-u-boot.dts
+++ b/arch/arm/dts/r8a77970-eagle-u-boot.dts
@@ -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>;
diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi
index 92b68878fd..71c77339f5 100644
--- a/arch/arm/dts/rk3288-veyron.dtsi
+++ b/arch/arm/dts/rk3288-veyron.dtsi
@@ -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>;
};
diff --git a/arch/arm/dts/rk3368-lion.dts b/arch/arm/dts/rk3368-lion.dts
index 5e578b175b..2814542083 100644
--- a/arch/arm/dts/rk3368-lion.dts
+++ b/arch/arm/dts/rk3368-lion.dts
@@ -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;
diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index 8304f67192..aec13a28f1 100644
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -658,7 +658,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;
diff --git a/arch/arm/dts/rv1108-evb.dts b/arch/arm/dts/rv1108-evb.dts
index ccb9969da0..c91776bc10 100644
--- a/arch/arm/dts/rv1108-evb.dts
+++ b/arch/arm/dts/rv1108-evb.dts
@@ -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>;
diff --git a/arch/arm/dts/sama5d27_som1.dtsi b/arch/arm/dts/sama5d27_som1.dtsi
index 9efcf635ad..ea7540bcfc 100644
--- a/arch/arm/dts/sama5d27_som1.dtsi
+++ b/arch/arm/dts/sama5d27_som1.dtsi
@@ -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>;
diff --git a/arch/arm/dts/sama5d3xmb.dtsi b/arch/arm/dts/sama5d3xmb.dtsi
index f9ef905ff5..c75b76aef2 100644
--- a/arch/arm/dts/sama5d3xmb.dtsi
+++ b/arch/arm/dts/sama5d3xmb.dtsi
@@ -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;
diff --git a/arch/arm/dts/sama5d3xmb_cmp.dtsi b/arch/arm/dts/sama5d3xmb_cmp.dtsi
index 9792b2a9d0..5566fde514 100644
--- a/arch/arm/dts/sama5d3xmb_cmp.dtsi
+++ b/arch/arm/dts/sama5d3xmb_cmp.dtsi
@@ -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>;
};
diff --git a/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
index c44d1ee2fa..e75f2902c5 100644
--- a/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
@@ -30,7 +30,7 @@
};
&flash {
- compatible = "n25q00", "spi-flash";
+ compatible = "n25q00", "jedec,spi-nor";
u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/socfpga_cyclone5_is1.dts b/arch/arm/dts/socfpga_cyclone5_is1.dts
index b7054bfd5a..93e4d45ad2 100644
--- a/arch/arm/dts/socfpga_cyclone5_is1.dts
+++ b/arch/arm/dts/socfpga_cyclone5_is1.dts
@@ -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;
diff --git a/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
index 9436e0fa8b..2fafd7e399 100644
--- a/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
@@ -34,7 +34,7 @@
};
&flash0 {
- compatible = "n25q00", "spi-flash";
+ compatible = "n25q00", "jedec,spi-nor";
u-boot,dm-pre-reloc;
partition at qspi-boot {
diff --git a/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi
index 648f1bd01d..7ef30531f4 100644
--- a/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi
@@ -30,7 +30,7 @@
};
&flash {
- compatible = "n25q00", "spi-flash";
+ compatible = "n25q00", "jedec,spi-nor";
u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi
index 31bd1dba0f..1003115cea 100644
--- a/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi
@@ -30,7 +30,7 @@
};
&flash {
- compatible = "n25q256a", "spi-flash";
+ compatible = "n25q256a", "jedec,spi-nor";
u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/socfpga_cyclone5_sr1500.dts b/arch/arm/dts/socfpga_cyclone5_sr1500.dts
index 6a6c29be79..1a18c4f3ba 100644
--- a/arch/arm/dts/socfpga_cyclone5_sr1500.dts
+++ b/arch/arm/dts/socfpga_cyclone5_sr1500.dts
@@ -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;
diff --git a/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi
index 360b946ba2..e05ca8279a 100644
--- a/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi
@@ -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;
};
};
diff --git a/arch/arm/dts/stm32f746-disco.dts b/arch/arm/dts/stm32f746-disco.dts
index 7ef33d6381..babd37f1c1 100644
--- a/arch/arm/dts/stm32f746-disco.dts
+++ b/arch/arm/dts/stm32f746-disco.dts
@@ -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>;
diff --git a/arch/arm/dts/stm32f769-disco.dts b/arch/arm/dts/stm32f769-disco.dts
index 1e8ef742ce..a23d02d300 100644
--- a/arch/arm/dts/stm32f769-disco.dts
+++ b/arch/arm/dts/stm32f769-disco.dts
@@ -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>;
diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
index 30b173478c..409f983fb2 100644
--- a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
@@ -14,11 +14,11 @@
};
&flash0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
};
&flash1 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
};
&v3v3 {
diff --git a/arch/arm/dts/stv0991.dts b/arch/arm/dts/stv0991.dts
index 98bd5dfc70..b04e89971c 100644
--- a/arch/arm/dts/stv0991.dts
+++ b/arch/arm/dts/stv0991.dts
@@ -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;
diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts
index 9c505fb7b8..8b1cf5475d 100644
--- a/arch/arm/dts/zynq-zed.dts
+++ b/arch/arm/dts/zynq-zed.dts
@@ -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;
diff --git a/arch/arm/dts/zynqmp-zc1232-revA.dts b/arch/arm/dts/zynqmp-zc1232-revA.dts
index 5c212ba468..6117f83c47 100644
--- a/arch/arm/dts/zynqmp-zc1232-revA.dts
+++ b/arch/arm/dts/zynqmp-zc1232-revA.dts
@@ -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>;
diff --git a/arch/arm/dts/zynqmp-zc1254-revA.dts b/arch/arm/dts/zynqmp-zc1254-revA.dts
index 881aacc582..6ac8346d23 100644
--- a/arch/arm/dts/zynqmp-zc1254-revA.dts
+++ b/arch/arm/dts/zynqmp-zc1254-revA.dts
@@ -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>;
diff --git a/arch/arm/dts/zynqmp-zc1275-revA.dts b/arch/arm/dts/zynqmp-zc1275-revA.dts
index 7403f153e4..82c30a3fbe 100644
--- a/arch/arm/dts/zynqmp-zc1275-revA.dts
+++ b/arch/arm/dts/zynqmp-zc1275-revA.dts
@@ -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>;
diff --git a/arch/arm/dts/zynqmp-zc1275-revB.dts b/arch/arm/dts/zynqmp-zc1275-revB.dts
index e84b2da164..c6348ffced 100644
--- a/arch/arm/dts/zynqmp-zc1275-revB.dts
+++ b/arch/arm/dts/zynqmp-zc1275-revB.dts
@@ -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>;
diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
index 9768dfe044..8824f5cc02 100644
--- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
@@ -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>;
diff --git a/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts b/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
index 9afbbb63b4..84c2904dc2 100644
--- a/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
@@ -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>;
diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index 05be919f6f..d209355510 100644
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -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>;
diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
index 431dff52fe..c7a3cdcf61 100644
--- a/arch/arm/dts/zynqmp-zcu104-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
@@ -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>;
diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
index becc6a0fe1..2d9d195f38 100644
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -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>;
diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index 7735e9d2c8..2358c241dd 100644
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -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>;
diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index 172e6cc2ca..7653e11715 100644
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -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>;
diff --git a/arch/mips/dts/ap121.dts b/arch/mips/dts/ap121.dts
index 4ca1c704ca..f30af50216 100644
--- a/arch/mips/dts/ap121.dts
+++ b/arch/mips/dts/ap121.dts
@@ -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>;
diff --git a/arch/mips/dts/ap143.dts b/arch/mips/dts/ap143.dts
index 6aedd87db9..82bf637410 100644
--- a/arch/mips/dts/ap143.dts
+++ b/arch/mips/dts/ap143.dts
@@ -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>;
diff --git a/arch/mips/dts/comtrend,ar-5315u.dts b/arch/mips/dts/comtrend,ar-5315u.dts
index eb60aaa8d5..28443b3b0f 100644
--- a/arch/mips/dts/comtrend,ar-5315u.dts
+++ b/arch/mips/dts/comtrend,ar-5315u.dts
@@ -110,7 +110,7 @@
status = "okay";
spi-flash at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/mips/dts/comtrend,ar-5387un.dts b/arch/mips/dts/comtrend,ar-5387un.dts
index 03e3851ab1..12ace64621 100644
--- a/arch/mips/dts/comtrend,ar-5387un.dts
+++ b/arch/mips/dts/comtrend,ar-5387un.dts
@@ -94,7 +94,7 @@
status = "okay";
spi-flash at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/mips/dts/gardena-smart-gateway-mt7688.dts b/arch/mips/dts/gardena-smart-gateway-mt7688.dts
index d8d88686bb..958027e885 100644
--- a/arch/mips/dts/gardena-smart-gateway-mt7688.dts
+++ b/arch/mips/dts/gardena-smart-gateway-mt7688.dts
@@ -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>;
};
diff --git a/arch/mips/dts/linkit-smart-7688.dts b/arch/mips/dts/linkit-smart-7688.dts
index c9db136f30..bb10402174 100644
--- a/arch/mips/dts/linkit-smart-7688.dts
+++ b/arch/mips/dts/linkit-smart-7688.dts
@@ -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>;
};
diff --git a/arch/mips/dts/luton_pcb091.dts b/arch/mips/dts/luton_pcb091.dts
index 74f9274c21..7b9a91f4a0 100644
--- a/arch/mips/dts/luton_pcb091.dts
+++ b/arch/mips/dts/luton_pcb091.dts
@@ -27,7 +27,7 @@
&spi0 {
status = "okay";
spi-flash at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
spi-max-frequency = <18000000>; /* input clock */
reg = <0>; /* CS0 */
spi-cs-high;
diff --git a/arch/mips/dts/mscc,ocelot_pcb.dtsi b/arch/mips/dts/mscc,ocelot_pcb.dtsi
index 90725d3b94..885b5643f7 100644
--- a/arch/mips/dts/mscc,ocelot_pcb.dtsi
+++ b/arch/mips/dts/mscc,ocelot_pcb.dtsi
@@ -29,7 +29,7 @@
pinctrl-names = "default";
spi-flash at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
spi-max-frequency = <18000000>; /* input clock */
reg = <0>; /* CS0 */
};
diff --git a/arch/mips/dts/netgear,cg3100d.dts b/arch/mips/dts/netgear,cg3100d.dts
index a3d4cd56a2..a42a0da2dd 100644
--- a/arch/mips/dts/netgear,cg3100d.dts
+++ b/arch/mips/dts/netgear,cg3100d.dts
@@ -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>;
diff --git a/arch/mips/dts/sagem,f at st1704.dts b/arch/mips/dts/sagem,f at st1704.dts
index ec6846dd9f..98ed353f20 100644
--- a/arch/mips/dts/sagem,f at st1704.dts
+++ b/arch/mips/dts/sagem,f at st1704.dts
@@ -59,7 +59,7 @@
status = "okay";
spi-flash at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/mips/dts/tplink_wdr4300.dts b/arch/mips/dts/tplink_wdr4300.dts
index 96cf0da5bf..2bcad6d201 100644
--- a/arch/mips/dts/tplink_wdr4300.dts
+++ b/arch/mips/dts/tplink_wdr4300.dts
@@ -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>;
diff --git a/arch/nds32/dts/ae3xx.dts b/arch/nds32/dts/ae3xx.dts
index b19ba988db..dd790d13b0 100644
--- a/arch/nds32/dts/ae3xx.dts
+++ b/arch/nds32/dts/ae3xx.dts
@@ -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;
diff --git a/arch/riscv/dts/ae350_32.dts b/arch/riscv/dts/ae350_32.dts
index 0679827313..15bff2b2d3 100644
--- a/arch/riscv/dts/ae350_32.dts
+++ b/arch/riscv/dts/ae350_32.dts
@@ -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;
diff --git a/arch/riscv/dts/ae350_64.dts b/arch/riscv/dts/ae350_64.dts
index e48c298645..7aec9a4dd9 100644
--- a/arch/riscv/dts/ae350_64.dts
+++ b/arch/riscv/dts/ae350_64.dts
@@ -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;
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 3790b4c520..9189da53f9 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -559,7 +559,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";
};
--
2.20.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 3/5] x86: dts: switch spi-flash to jedec, spi-nor compatible
2019-01-15 12:59 [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 1/5] mtd: sf_probe: add jedec, spi-nor compatible Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 2/5] dts: switch spi-flash to " Neil Armstrong
@ 2019-01-15 12:59 ` Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 4/5] mtd: sf_probe: remove spi-flash compatible Neil Armstrong
` (3 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Neil Armstrong @ 2019-01-15 12:59 UTC (permalink / raw
To: u-boot
The x86 code and DT uses "spi-flash" to detect a flash node, switch to
"jedec,spi-nor" in the DTS files and in fdtdec by switching the
GENERIC_SPI_FLASH value to to jedec,spi-nor.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---
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 +-
lib/fdtdec.c | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/x86/dts/bayleybay.dts b/arch/x86/dts/bayleybay.dts
index 291dc07ff6..d0168e88db 100644
--- a/arch/x86/dts/bayleybay.dts
+++ b/arch/x86/dts/bayleybay.dts
@@ -175,7 +175,7 @@
#size-cells = <1>;
reg = <0>;
compatible = "winbond,w25q64dw",
- "spi-flash";
+ "jedec,spi-nor";
memory-map = <0xff800000 0x00800000>;
rw-mrc-cache {
label = "rw-mrc-cache";
diff --git a/arch/x86/dts/baytrail_som-db5800-som-6867.dts b/arch/x86/dts/baytrail_som-db5800-som-6867.dts
index 4e8a761ce8..5abbc66ce9 100644
--- a/arch/x86/dts/baytrail_som-db5800-som-6867.dts
+++ b/arch/x86/dts/baytrail_som-db5800-som-6867.dts
@@ -199,7 +199,7 @@
#size-cells = <1>;
reg = <0>;
compatible = "macronix,mx25l6405d",
- "spi-flash";
+ "jedec,spi-nor";
memory-map = <0xff800000 0x00800000>;
rw-mrc-cache {
label = "rw-mrc-cache";
diff --git a/arch/x86/dts/cherryhill.dts b/arch/x86/dts/cherryhill.dts
index 39e2d2fa4b..37146fde2b 100644
--- a/arch/x86/dts/cherryhill.dts
+++ b/arch/x86/dts/cherryhill.dts
@@ -147,7 +147,7 @@
#address-cells = <1>;
#size-cells = <1>;
reg = <0>;
- compatible = "macronix,mx25u6435f", "spi-flash";
+ compatible = "macronix,mx25u6435f", "jedec,spi-nor";
memory-map = <0xff800000 0x00800000>;
rw-mrc-cache {
label = "rw-mrc-cache";
diff --git a/arch/x86/dts/chromebook_link.dts b/arch/x86/dts/chromebook_link.dts
index f9f0979730..fc9d156801 100644
--- a/arch/x86/dts/chromebook_link.dts
+++ b/arch/x86/dts/chromebook_link.dts
@@ -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";
diff --git a/arch/x86/dts/chromebook_samus.dts b/arch/x86/dts/chromebook_samus.dts
index b58936b4ac..0866a72dc8 100644
--- a/arch/x86/dts/chromebook_samus.dts
+++ b/arch/x86/dts/chromebook_samus.dts
@@ -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";
diff --git a/arch/x86/dts/chromebox_panther.dts b/arch/x86/dts/chromebox_panther.dts
index f56e482944..bcd4c4d9c1 100644
--- a/arch/x86/dts/chromebox_panther.dts
+++ b/arch/x86/dts/chromebox_panther.dts
@@ -47,7 +47,7 @@
#address-cells = <1>;
reg = <0>;
compatible = "winbond,w25q64",
- "spi-flash";
+ "jedec,spi-nor";
memory-map = <0xff800000 0x00800000>;
rw-mrc-cache {
label = "rw-mrc-cache";
diff --git a/arch/x86/dts/conga-qeval20-qa3-e3845.dts b/arch/x86/dts/conga-qeval20-qa3-e3845.dts
index 5884dbc277..70b8c04519 100644
--- a/arch/x86/dts/conga-qeval20-qa3-e3845.dts
+++ b/arch/x86/dts/conga-qeval20-qa3-e3845.dts
@@ -186,7 +186,7 @@
#size-cells = <1>;
reg = <0>;
compatible = "stmicro,n25q064a",
- "spi-flash";
+ "jedec,spi-nor";
memory-map = <0xff800000 0x00800000>;
rw-mrc-cache {
label = "rw-mrc-cache";
diff --git a/arch/x86/dts/cougarcanyon2.dts b/arch/x86/dts/cougarcanyon2.dts
index 9801790083..c6ba811e05 100644
--- a/arch/x86/dts/cougarcanyon2.dts
+++ b/arch/x86/dts/cougarcanyon2.dts
@@ -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>;
};
};
diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts
index 2ffcc5f27e..f5b1ac66bc 100644
--- a/arch/x86/dts/crownbay.dts
+++ b/arch/x86/dts/crownbay.dts
@@ -223,7 +223,7 @@
spi-flash at 0 {
reg = <0>;
compatible = "sst,25vf016b",
- "spi-flash";
+ "jedec,spi-nor";
memory-map = <0xffe00000 0x00200000>;
};
};
diff --git a/arch/x86/dts/dfi-bt700.dtsi b/arch/x86/dts/dfi-bt700.dtsi
index 51d33e772f..e9930cb043 100644
--- a/arch/x86/dts/dfi-bt700.dtsi
+++ b/arch/x86/dts/dfi-bt700.dtsi
@@ -197,7 +197,7 @@
#size-cells = <1>;
reg = <0>;
compatible = "stmicro,n25q064a",
- "spi-flash";
+ "jedec,spi-nor";
memory-map = <0xff800000 0x00800000>;
rw-mrc-cache {
label = "rw-mrc-cache";
diff --git a/arch/x86/dts/galileo.dts b/arch/x86/dts/galileo.dts
index 3a5d168268..5de4568679 100644
--- a/arch/x86/dts/galileo.dts
+++ b/arch/x86/dts/galileo.dts
@@ -139,7 +139,7 @@
#address-cells = <1>;
reg = <0>;
compatible = "winbond,w25q64",
- "spi-flash";
+ "jedec,spi-nor";
memory-map = <0xff800000 0x00800000>;
rw-mrc-cache {
label = "rw-mrc-cache";
diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts
index 6c65fb9611..f4cdb2c3cd 100644
--- a/arch/x86/dts/minnowmax.dts
+++ b/arch/x86/dts/minnowmax.dts
@@ -199,7 +199,7 @@
#size-cells = <1>;
reg = <0>;
compatible = "stmicro,n25q064a",
- "spi-flash";
+ "jedec,spi-nor";
memory-map = <0xff800000 0x00800000>;
rw-mrc-cache {
label = "rw-mrc-cache";
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 6f8ec0dbed..acb79bd80a 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -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"),
--
2.20.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 4/5] mtd: sf_probe: remove spi-flash compatible
2019-01-15 12:59 [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
` (2 preceding siblings ...)
2019-01-15 12:59 ` [U-Boot] [PATCH v3 3/5] x86: " Neil Armstrong
@ 2019-01-15 12:59 ` Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 5/5] doc: device-tree-bindings: switch from spi-flash to jedec, spi-nor Neil Armstrong
` (2 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Neil Armstrong @ 2019-01-15 12:59 UTC (permalink / raw
To: u-boot
Now 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.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---
drivers/mtd/spi/sf_probe.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 7a379914d8..aae39dd601 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -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" },
{ }
};
--
2.20.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 5/5] doc: device-tree-bindings: switch from spi-flash to jedec, spi-nor
2019-01-15 12:59 [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
` (3 preceding siblings ...)
2019-01-15 12:59 ` [U-Boot] [PATCH v3 4/5] mtd: sf_probe: remove spi-flash compatible Neil Armstrong
@ 2019-01-15 12:59 ` Neil Armstrong
[not found] ` <752D002CFF5D0F4FA35C0100F1D73F3FA406DB1B@ATCPCS16.andestech.com>
2019-02-08 10:19 ` Patrick DELAUNAY
2019-01-28 16:22 ` [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
2019-02-07 12:28 ` Jagan Teki
6 siblings, 2 replies; 14+ messages in thread
From: Neil Armstrong @ 2019-01-15 12:59 UTC (permalink / raw
To: u-boot
Since all DTS files has been switched to "jedec,spi-nor", remove
the "spi-flash" compatible from the bindings examples.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---
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(-)
diff --git a/doc/device-tree-bindings/pinctrl/atmel,at91-pio4-pinctrl.txt b/doc/device-tree-bindings/pinctrl/atmel,at91-pio4-pinctrl.txt
index a1b559668f..a376c6fba5 100644
--- a/doc/device-tree-bindings/pinctrl/atmel,at91-pio4-pinctrl.txt
+++ b/doc/device-tree-bindings/pinctrl/atmel,at91-pio4-pinctrl.txt
@@ -42,7 +42,7 @@ Example:
status = "okay";
spi_flash at 0 {
- compatible = "spi-flash";
+ compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
};
diff --git a/doc/device-tree-bindings/spi/spi-atcspi200.txt b/doc/device-tree-bindings/spi/spi-atcspi200.txt
index 9c0630b500..e67b3425f0 100644
--- a/doc/device-tree-bindings/spi/spi-atcspi200.txt
+++ b/doc/device-tree-bindings/spi/spi-atcspi200.txt
@@ -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;
diff --git a/doc/device-tree-bindings/spi/spi-stm32-qspi.txt b/doc/device-tree-bindings/spi/spi-stm32-qspi.txt
index 6c7da1d76c..cec3e1250c 100644
--- a/doc/device-tree-bindings/spi/spi-stm32-qspi.txt
+++ b/doc/device-tree-bindings/spi/spi-stm32-qspi.txt
@@ -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>;
--
2.20.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [uboot-snps-arc] [PATCH v3 2/5] dts: switch spi-flash to jedec, spi-nor compatible
2019-01-15 12:59 ` [U-Boot] [PATCH v3 2/5] dts: switch spi-flash to " Neil Armstrong
@ 2019-01-17 18:08 ` Eugeniy Paltsev
[not found] ` <752D002CFF5D0F4FA35C0100F1D73F3FA406DB05@ATCPCS16.andestech.com>
2019-02-08 10:15 ` Patrick DELAUNAY
2 siblings, 0 replies; 14+ messages in thread
From: Eugeniy Paltsev @ 2019-01-17 18:08 UTC (permalink / raw
To: u-boot
Hi Neil,
On Tue, 2019-01-15 at 13:59 +0100, Neil Armstrong wrote:
> There is no reason not to use the Linux "jedec,spi-nor" binding in U-Boot
> dts files. This compatible has been added in sf_probe, let use it.
>
> This patch switches to jedec,spi-nor when spi-flash is used in the DTS
> and DTSI files, and removed spi-flash when jedec,spi-nor is already
> present.
>
> The x86 dts are switched in a separate commit since it depends on a change
> in fdtdec.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> Acked-by: Stefan Roese <sr@denx.de>
> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> ---
For the ARC part:
> arch/arc/dts/axs10x_mb.dtsi | 2 +-
> arch/arc/dts/hsdk.dts | 2 +-
Reviewed-by: Evgeniy Paltsev <paltsev@synopsys.com>
> diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi
> index dfc03810ca..b5aacd5170 100644
> --- a/arch/arc/dts/axs10x_mb.dtsi
> +++ b/arch/arc/dts/axs10x_mb.dtsi
> @@ -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>;
> };
> diff --git a/arch/arc/dts/hsdk.dts b/arch/arc/dts/hsdk.dts
> index f024b96925..5e9ba054a4 100644
> --- a/arch/arc/dts/hsdk.dts
> +++ b/arch/arc/dts/hsdk.dts
> @@ -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>;
> };
>
--
Eugeniy Paltsev
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 2/5] dts: switch spi-flash to jedec, spi-nor compatible
[not found] ` <752D002CFF5D0F4FA35C0100F1D73F3FA406DB05@ATCPCS16.andestech.com>
@ 2019-01-22 3:41 ` Rick Chen
0 siblings, 0 replies; 14+ messages in thread
From: Rick Chen @ 2019-01-22 3:41 UTC (permalink / raw
To: u-boot
Hi Neil
> > From: Neil Armstrong [mailto:narmstrong at baylibre.com]
> > Sent: Tuesday, January 15, 2019 8:59 PM
> > To: jagan at openedev.com; u-boot at lists.denx.de;
> > simon.k.r.goldschmidt at gmail.com
> > Cc: Neil Armstrong; uboot-stm32 at st-md-mailman.stormreply.com;
> > uboot-snps-arc at synopsys.com; philipp.tomsich at theobroma-systems.com;
> > klaus.goger at theobroma-systems.com; monstr at monstr.eu;
> > macpaul at andestech.com; sjg at chromium.org; Rick Jian-Zhi Chen(陳建志);
> > bmeng.cn at gmail.com; trini at konsulko.com; Stefan Roese
> > Subject: [PATCH v3 2/5] dts: switch spi-flash to jedec,spi-nor compatible
> >
> > There is no reason not to use the Linux "jedec,spi-nor" binding in U-Boot
> > dts files. This compatible has been added in sf_probe, let use it.
> >
> > This patch switches to jedec,spi-nor when spi-flash is used in the DTS
> > and DTSI files, and removed spi-flash when jedec,spi-nor is already
> > present.
> >
> > The x86 dts are switched in a separate commit since it depends on a change
> > in fdtdec.
> >
> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> > Acked-by: Stefan Roese <sr@denx.de>
> > Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> > ---
for nds32 and riscv
> > arch/nds32/dts/ae3xx.dts | 2 +-
> > arch/riscv/dts/ae350_32.dts | 2 +-
> > arch/riscv/dts/ae350_64.dts | 2 +-
Reviewed-by: Rick Chen <rick@andestech.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 5/5] doc: device-tree-bindings: switch from spi-flash to jedec, spi-nor
[not found] ` <752D002CFF5D0F4FA35C0100F1D73F3FA406DB1B@ATCPCS16.andestech.com>
@ 2019-01-22 3:47 ` Rick Chen
0 siblings, 0 replies; 14+ messages in thread
From: Rick Chen @ 2019-01-22 3:47 UTC (permalink / raw
To: u-boot
Hi Neil
> > From: U-Boot [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Neil
> > Armstrong
> > Sent: Tuesday, January 15, 2019 8:59 PM
> > To: jagan at openedev.com; u-boot at lists.denx.de;
> > simon.k.r.goldschmidt at gmail.com
> > Cc: uboot-stm32 at st-md-mailman.stormreply.com; trini at konsulko.com
> > Subject: [U-Boot] [PATCH v3 5/5] doc: device-tree-bindings: switch from spi-flash
> > to jedec, spi-nor
> >
> > Since all DTS files has been switched to "jedec,spi-nor", remove the "spi-flash"
> > compatible from the bindings examples.
> >
> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> > Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> > ---
for spi-atcspi200
> > diff --git a/doc/device-tree-bindings/spi/spi-atcspi200.txt
> > b/doc/device-tree-bindings/spi/spi-atcspi200.txt
> > index 9c0630b500..e67b3425f0 100644
> > --- a/doc/device-tree-bindings/spi/spi-atcspi200.txt
> > +++ b/doc/device-tree-bindings/spi/spi-atcspi200.txt
> > @@ -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;
> > spi-tx-bus-width = <4>;
> > spi-rx-bus-width = <4>;
> > --
Reviewed-by: Rick Chen <rick@andestech.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding
2019-01-15 12:59 [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
` (4 preceding siblings ...)
2019-01-15 12:59 ` [U-Boot] [PATCH v3 5/5] doc: device-tree-bindings: switch from spi-flash to jedec, spi-nor Neil Armstrong
@ 2019-01-28 16:22 ` Neil Armstrong
2019-02-07 12:28 ` Jagan Teki
6 siblings, 0 replies; 14+ messages in thread
From: Neil Armstrong @ 2019-01-28 16:22 UTC (permalink / raw
To: u-boot
Hi Jagan, Tom,
On 15/01/2019 13:59, Neil Armstrong wrote:
> 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"
How this patchset could go in this release ?
Should Jagan take it ?
Thanks,
Neil
>
> Changes since v2:
> - collected tags
> - extracted x86 dts changed and merged it with the fdtdec change
> - updated for new boards
>
> Neil Armstrong (5):
> mtd: sf_probe: add jedec,spi-nor compatible
> dts: switch spi-flash to jedec,spi-nor compatible
> x86: dts: switch spi-flash to jedec,spi-nor compatible
> mtd: sf_probe: remove spi-flash compatible
> 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/luton_pcb091.dts | 2 +-
> arch/mips/dts/mscc,ocelot_pcb.dtsi | 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_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 +-
> 125 files changed, 156 insertions(+), 156 deletions(-)
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding
2019-01-15 12:59 [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
` (5 preceding siblings ...)
2019-01-28 16:22 ` [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
@ 2019-02-07 12:28 ` Jagan Teki
2019-02-07 20:13 ` Neil Armstrong
6 siblings, 1 reply; 14+ messages in thread
From: Jagan Teki @ 2019-02-07 12:28 UTC (permalink / raw
To: u-boot
On Tue, Jan 15, 2019 at 6:29 PM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> 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"
>
> Changes since v2:
> - collected tags
> - extracted x86 dts changed and merged it with the fdtdec change
> - updated for new boards
>
> Neil Armstrong (5):
> mtd: sf_probe: add jedec,spi-nor compatible
> dts: switch spi-flash to jedec,spi-nor compatible
> x86: dts: switch spi-flash to jedec,spi-nor compatible
> mtd: sf_probe: remove spi-flash compatible
> doc: device-tree-bindings: switch from spi-flash to jedec,spi-nor
Reviewed-by: Jagan Teki <jagan@openedev.com>
Please send v4 on top of u-boot-spi/master and skip the 1/5 (picked
this from Vignesh series)
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding
2019-02-07 12:28 ` Jagan Teki
@ 2019-02-07 20:13 ` Neil Armstrong
0 siblings, 0 replies; 14+ messages in thread
From: Neil Armstrong @ 2019-02-07 20:13 UTC (permalink / raw
To: u-boot
Le 07/02/2019 13:28, Jagan Teki a écrit :
> On Tue, Jan 15, 2019 at 6:29 PM Neil Armstrong <narmstrong@baylibre.com> wrote:
>>
>> 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"
>>
>> Changes since v2:
>> - collected tags
>> - extracted x86 dts changed and merged it with the fdtdec change
>> - updated for new boards
>>
>> Neil Armstrong (5):
>> mtd: sf_probe: add jedec,spi-nor compatible
>> dts: switch spi-flash to jedec,spi-nor compatible
>> x86: dts: switch spi-flash to jedec,spi-nor compatible
>> mtd: sf_probe: remove spi-flash compatible
>> doc: device-tree-bindings: switch from spi-flash to jedec,spi-nor
>
> Reviewed-by: Jagan Teki <jagan@openedev.com>
>
> Please send v4 on top of u-boot-spi/master and skip the 1/5 (picked
> this from Vignesh series)
>
OK, will re-spin.
Neil
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 2/5] dts: switch spi-flash to jedec, spi-nor compatible
2019-01-15 12:59 ` [U-Boot] [PATCH v3 2/5] dts: switch spi-flash to " Neil Armstrong
2019-01-17 18:08 ` [U-Boot] [uboot-snps-arc] " Eugeniy Paltsev
[not found] ` <752D002CFF5D0F4FA35C0100F1D73F3FA406DB05@ATCPCS16.andestech.com>
@ 2019-02-08 10:15 ` Patrick DELAUNAY
2 siblings, 0 replies; 14+ messages in thread
From: Patrick DELAUNAY @ 2019-02-08 10:15 UTC (permalink / raw
To: u-boot
Hi Neil,
> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Neil Armstrong
> Sent: mardi 15 janvier 2019 13:59
> To: jagan at openedev.com; u-boot at lists.denx.de;
> simon.k.r.goldschmidt at gmail.com
> Cc: trini at konsulko.com; uboot-snps-arc at synopsys.com; uboot-stm32 at st-md-
> mailman.stormreply.com; macpaul at andestech.com; Stefan Roese
> <sr@denx.de>
> Subject: [U-Boot] [PATCH v3 2/5] dts: switch spi-flash to jedec, spi-nor
> compatible
>
> There is no reason not to use the Linux "jedec,spi-nor" binding in U-Boot
> dts files. This compatible has been added in sf_probe, let use it.
>
> This patch switches to jedec,spi-nor when spi-flash is used in the DTS
> and DTSI files, and removed spi-flash when jedec,spi-nor is already
> present.
>
> The x86 dts are switched in a separate commit since it depends on a change
> in fdtdec.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> Acked-by: Stefan Roese <sr@denx.de>
> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> ---
For stm32
> arch/arm/dts/stm32f746-disco.dts | 2 +-
> arch/arm/dts/stm32f769-disco.dts | 2 +-
> arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 ++--
Reviewed-by: Patrick Delaunay <Patrick.delaunay@st.com>
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3 5/5] doc: device-tree-bindings: switch from spi-flash to jedec, spi-nor
2019-01-15 12:59 ` [U-Boot] [PATCH v3 5/5] doc: device-tree-bindings: switch from spi-flash to jedec, spi-nor Neil Armstrong
[not found] ` <752D002CFF5D0F4FA35C0100F1D73F3FA406DB1B@ATCPCS16.andestech.com>
@ 2019-02-08 10:19 ` Patrick DELAUNAY
1 sibling, 0 replies; 14+ messages in thread
From: Patrick DELAUNAY @ 2019-02-08 10:19 UTC (permalink / raw
To: u-boot
Hi Neil,
> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Neil Armstrong
> Sent: mardi 15 janvier 2019 13:59
> To: jagan at openedev.com; u-boot at lists.denx.de;
> simon.k.r.goldschmidt at gmail.com
> Cc: uboot-stm32 at st-md-mailman.stormreply.com; trini at konsulko.com
> Subject: [U-Boot] [PATCH v3 5/5] doc: device-tree-bindings: switch from spi-
> flash to jedec, spi-nor
>
> Since all DTS files has been switched to "jedec,spi-nor", remove the "spi-flash"
> compatible from the bindings examples.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> ---
For stm32 part,
> doc/device-tree-bindings/spi/spi-stm32-qspi.txt | 2 +-
Reviewed-by: Patrick Delaunay <Patrick.delaunay@st.com>
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Regard
Patrick
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-02-08 10:19 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-15 12:59 [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 1/5] mtd: sf_probe: add jedec, spi-nor compatible Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 2/5] dts: switch spi-flash to " Neil Armstrong
2019-01-17 18:08 ` [U-Boot] [uboot-snps-arc] " Eugeniy Paltsev
[not found] ` <752D002CFF5D0F4FA35C0100F1D73F3FA406DB05@ATCPCS16.andestech.com>
2019-01-22 3:41 ` [U-Boot] " Rick Chen
2019-02-08 10:15 ` Patrick DELAUNAY
2019-01-15 12:59 ` [U-Boot] [PATCH v3 3/5] x86: " Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 4/5] mtd: sf_probe: remove spi-flash compatible Neil Armstrong
2019-01-15 12:59 ` [U-Boot] [PATCH v3 5/5] doc: device-tree-bindings: switch from spi-flash to jedec, spi-nor Neil Armstrong
[not found] ` <752D002CFF5D0F4FA35C0100F1D73F3FA406DB1B@ATCPCS16.andestech.com>
2019-01-22 3:47 ` Rick Chen
2019-02-08 10:19 ` Patrick DELAUNAY
2019-01-28 16:22 ` [U-Boot] [PATCH v3 0/5] spi-flash: switch to "jedec, spi-nor" binding Neil Armstrong
2019-02-07 12:28 ` Jagan Teki
2019-02-07 20:13 ` Neil Armstrong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.