From f83ad78261895fd09f7cbddacce721140778748c Mon Sep 17 00:00:00 2001 From: "Peter A. Bigot" Date: Sun, 27 Oct 2019 09:06:40 -0500 Subject: [PATCH] dts: jedec,spi-nor: require size property The SPI NOR driver requires that the size (in bits) be provided in the devicetree node. Update the binding to make the property required, and update all nodes based on the memory chip identified. Signed-off-by: Peter A. Bigot --- boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts | 1 + boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts | 1 + boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts | 1 + boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts | 1 + boards/riscv/hifive1/hifive1.dts | 1 + boards/riscv/hifive1_revb/hifive1_revb.dts | 1 + boards/riscv/qemu_riscv32/qemu_riscv32.dts | 1 + boards/riscv/qemu_riscv64/qemu_riscv64.dts | 1 + dts/arm/nxp/nxp_rt1064.dtsi | 1 + dts/bindings/mtd/jedec,spi-nor.yaml | 2 +- 10 files changed, 10 insertions(+), 1 deletion(-) diff --git a/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts b/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts index 8f6262e5d52..3eaf0813fbf 100644 --- a/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts +++ b/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts @@ -53,6 +53,7 @@ arduino_serial: &uart4 {}; reg = <0x402a8000 0x4000>, <0x60000000 0x1000000>; at25sf128a: at25sf128a@0 { compatible = "adesto,at25sf128a", "jedec,spi-nor"; + size = <134217728>; label = "AT25SF128A"; reg = <0>; spi-max-frequency = <133000000>; diff --git a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts index bb46a60de7f..d5c63cacf0d 100644 --- a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts +++ b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts @@ -61,6 +61,7 @@ arduino_serial: &uart2 {}; reg = <0x402a8000 0x4000>, <0x60000000 0x800000>; is25wp064: is25wp064@0 { compatible = "issi,is25wp064", "jedec,spi-nor"; + size = <67108864>; label = "IS25WP064"; reg = <0>; spi-max-frequency = <133000000>; diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts index ebf5d33eaad..a6672d068d9 100644 --- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts +++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts @@ -12,6 +12,7 @@ reg = <0x402a8000 0x4000>, <0x60000000 0x800000>; is25wp064: is25wp064@0 { compatible = "issi,is25wp064", "jedec,spi-nor"; + size = <67108864>; label = "IS25WP064"; reg = <0>; spi-max-frequency = <133000000>; diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts index 087953e2639..918088ef0c8 100644 --- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts +++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts @@ -68,6 +68,7 @@ arduino_serial: &uart3 {}; reg = <0x402a8000 0x4000>, <0x60000000 0x800000>; is25wp064: is25wp064@0 { compatible = "issi,is25wp064", "jedec,spi-nor"; + size = <67108864>; label = "IS25WP064"; reg = <0>; spi-max-frequency = <133000000>; diff --git a/boards/riscv/hifive1/hifive1.dts b/boards/riscv/hifive1/hifive1.dts index a6a43a6af60..9ef07c17915 100644 --- a/boards/riscv/hifive1/hifive1.dts +++ b/boards/riscv/hifive1/hifive1.dts @@ -63,6 +63,7 @@ reg = <0x10014000 0x1000 0x20400000 0xc00000>; flash0: flash@0 { compatible = "issi,is25lp128", "jedec,spi-nor"; + size = <134217728>; label = "FLASH0"; jedec-id = [96 60 18]; reg = <0>; diff --git a/boards/riscv/hifive1_revb/hifive1_revb.dts b/boards/riscv/hifive1_revb/hifive1_revb.dts index f46fba3aa90..a2eabc6247c 100644 --- a/boards/riscv/hifive1_revb/hifive1_revb.dts +++ b/boards/riscv/hifive1_revb/hifive1_revb.dts @@ -61,6 +61,7 @@ reg = <0x10014000 0x1000 0x20010000 0x3c0900>; flash0: flash@0 { compatible = "issi,is25lp128", "jedec,spi-nor"; + size = <134217728>; label = "FLASH0"; jedec-id = [96 60 18]; reg = <0>; diff --git a/boards/riscv/qemu_riscv32/qemu_riscv32.dts b/boards/riscv/qemu_riscv32/qemu_riscv32.dts index a6411c96934..75b97b89c96 100644 --- a/boards/riscv/qemu_riscv32/qemu_riscv32.dts +++ b/boards/riscv/qemu_riscv32/qemu_riscv32.dts @@ -39,6 +39,7 @@ reg = <0x10014000 0x1000 0x20400000 0xc00000>; flash0: flash@0 { compatible = "issi,is25lp128", "jedec,spi-nor"; + size = <134217728>; label = "FLASH0"; jedec-id = [96 60 18]; reg = <0>; diff --git a/boards/riscv/qemu_riscv64/qemu_riscv64.dts b/boards/riscv/qemu_riscv64/qemu_riscv64.dts index a323e542985..3e4668f3619 100644 --- a/boards/riscv/qemu_riscv64/qemu_riscv64.dts +++ b/boards/riscv/qemu_riscv64/qemu_riscv64.dts @@ -43,6 +43,7 @@ reg = <0x10014000 0x1000 0x20400000 0xc00000>; flash0: flash@0 { compatible = "issi,is25lp128", "jedec,spi-nor"; + size = <134217728>; label = "FLASH0"; jedec-id = [96 60 18]; reg = <0>; diff --git a/dts/arm/nxp/nxp_rt1064.dtsi b/dts/arm/nxp/nxp_rt1064.dtsi index a22f9a75abf..e2748d4a0ee 100644 --- a/dts/arm/nxp/nxp_rt1064.dtsi +++ b/dts/arm/nxp/nxp_rt1064.dtsi @@ -11,6 +11,7 @@ /* WINBOND */ w25q32jvwj0: w25q32jvwj@0 { compatible = "winbond,w25q32jvwj", "jedec,spi-nor"; + size = <33554432>; label = "W25Q32JVWJ0"; reg = <0>; spi-max-frequency = <133000000>; diff --git a/dts/bindings/mtd/jedec,spi-nor.yaml b/dts/bindings/mtd/jedec,spi-nor.yaml index 837d2014e4c..85c8adfcdfd 100644 --- a/dts/bindings/mtd/jedec,spi-nor.yaml +++ b/dts/bindings/mtd/jedec,spi-nor.yaml @@ -23,7 +23,7 @@ properties: size: type: int - required: false + required: true description: flash capacity in bits wp-gpios: