michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts/spi-nor: use bytestring for JEDEC ID

Browse source 
This was always intended to be a bytestring rather than an array, but
full support was missing.  Since that has been addressed switch it to
the preferred format.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
This commit is contained in:
Peter A. Bigot 2019-07-22 05:42:00 -05:00 • committed by Kumar Gala
commit fa10a9640b
16 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/bl654_dvk/bl654_dvk.dts
View file

@ -132,7 +132,7 @@
reg = <0>; reg = <0>;
spi-max-frequency = <80000000>; spi-max-frequency = <80000000>;
label = "MX25R64"; label = "MX25R64";
jedec-id = <0xc2 0x28 0x17>; jedec-id = [c2 28 17];
size = <67108864>; size = <67108864>;
wp-gpios = <&gpio0 22 0>; wp-gpios = <&gpio0 22 0>;
hold-gpios = <&gpio0 23 0>; hold-gpios = <&gpio0 23 0>;

2
boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts
View file

@ -57,7 +57,7 @@ arduino_serial: &uart4 {};
reg = <0>; reg = <0>;
spi-max-frequency = <133000000>; spi-max-frequency = <133000000>;
status = "okay"; status = "okay";
jedec-id = <0x1f 0x89 0x01>; jedec-id = [1f 89 01];
}; };
}; };

2
boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts
View file

@ -65,7 +65,7 @@ arduino_serial: &uart2 {};
reg = <0>; reg = <0>;
spi-max-frequency = <133000000>; spi-max-frequency = <133000000>;
status = "okay"; status = "okay";
jedec-id = <0x9d 0x70 0x17>; jedec-id = [9d 70 17];
}; };
}; };

2
boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts
View file

@ -16,6 +16,6 @@
reg = <0>; reg = <0>;
spi-max-frequency = <133000000>; spi-max-frequency = <133000000>;
status = "okay"; status = "okay";
jedec-id = <0x9d 0x70 0x17>; jedec-id = [9d 70 17];
}; };
}; };

2
boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
View file

@ -71,7 +71,7 @@ arduino_serial: &uart3 {};
reg = <0>; reg = <0>;
spi-max-frequency = <133000000>; spi-max-frequency = <133000000>;
status = "okay"; status = "okay";
jedec-id = <0x9d 0x70 0x17>; jedec-id = [9d 70 17];
}; };
}; };

2
boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts
View file

@ -181,7 +181,7 @@ arduino_i2c: &i2c0 {
reg = <0>; reg = <0>;
spi-max-frequency = <80000000>; spi-max-frequency = <80000000>;
label = "MX25R64"; label = "MX25R64";
jedec-id = <0xc2 0x28 0x17>; jedec-id = [c2 28 17];
size = <67108864>; size = <67108864>;
has-be32k; has-be32k;
wp-gpios = <&gpio0 22 0>; wp-gpios = <&gpio0 22 0>;

2
boards/arm/particle_argon/dts/mesh_feather.dtsi
View file

@ -140,7 +140,7 @@
hold-gpios = <&gpio0 23 0>; hold-gpios = <&gpio0 23 0>;
size = <0x2000000>; size = <0x2000000>;
has-be32k; has-be32k;
jedec-id = <0xc2 0x20 0x16>; jedec-id = [c2 20 16];
}; };
}; };

2
boards/arm/particle_boron/dts/mesh_feather.dtsi
View file

@ -140,7 +140,7 @@
hold-gpios = <&gpio0 23 0>; hold-gpios = <&gpio0 23 0>;
size = <0x2000000>; size = <0x2000000>;
has-be32k; has-be32k;
jedec-id = <0xc2 0x20 0x16>; jedec-id = [c2 20 16];
}; };
}; };

2
boards/arm/particle_xenon/dts/mesh_feather.dtsi
View file

@ -140,7 +140,7 @@
hold-gpios = <&gpio0 23 0>; hold-gpios = <&gpio0 23 0>;
size = <0x2000000>; size = <0x2000000>;
has-be32k; has-be32k;
jedec-id = <0xc2 0x20 0x16>; jedec-id = [c2 20 16];
}; };
}; };

2
boards/riscv32/hifive1/hifive1.dts
View file

@ -64,7 +64,7 @@
flash0: flash@0 { flash0: flash@0 {
compatible = "issi,is25lp128", "jedec,spi-nor"; compatible = "issi,is25lp128", "jedec,spi-nor";
label = "FLASH0"; label = "FLASH0";
jedec-id = <0x96 0x60 0x18>; jedec-id = [96 60 18];
reg = <0>; reg = <0>;
spi-max-frequency = <133000000>; spi-max-frequency = <133000000>;
}; };

2
boards/riscv32/hifive1_revb/hifive1_revb.dts
View file

@ -62,7 +62,7 @@
flash0: flash@0 { flash0: flash@0 {
compatible = "issi,is25lp128", "jedec,spi-nor"; compatible = "issi,is25lp128", "jedec,spi-nor";
label = "FLASH0"; label = "FLASH0";
jedec-id = <0x96 0x60 0x18>; jedec-id = [96 60 18];
reg = <0>; reg = <0>;
spi-max-frequency = <133000000>; spi-max-frequency = <133000000>;
}; };

2
boards/riscv32/qemu_riscv32/qemu_riscv32.dts
View file

@ -40,7 +40,7 @@
flash0: flash@0 { flash0: flash@0 {
compatible = "issi,is25lp128", "jedec,spi-nor"; compatible = "issi,is25lp128", "jedec,spi-nor";
label = "FLASH0"; label = "FLASH0";
jedec-id = <0x96 0x60 0x18>; jedec-id = [96 60 18];
reg = <0>; reg = <0>;
// Dummy entry // Dummy entry
spi-max-frequency = <0>; spi-max-frequency = <0>;

2
boards/xtensa/intel_s1000_crb/intel_s1000_crb.dts
View file

@ -53,7 +53,7 @@
reg = <0>; reg = <0>;
spi-max-frequency = <2000000>; spi-max-frequency = <2000000>;
label = "MX25UM512"; label = "MX25UM512";
jedec-id = <0xc2 0x80 0x3a>; jedec-id = [c2 80 3a];
size = <0x2000000>; size = <0x2000000>;
}; };
}; };

6
drivers/flash/spi_nor.c
View file

@ -396,11 +396,7 @@ static const struct flash_driver_api spi_nor_api = {
}; };
static const struct spi_nor_config flash_id = { static const struct spi_nor_config flash_id = {
.id = { .id = DT_INST_0_JEDEC_SPI_NOR_JEDEC_ID,
DT_INST_0_JEDEC_SPI_NOR_JEDEC_ID_0,
DT_INST_0_JEDEC_SPI_NOR_JEDEC_ID_1,
DT_INST_0_JEDEC_SPI_NOR_JEDEC_ID_2,
},
#ifdef DT_INST_0_JEDEC_SPI_NOR_HAS_BE32K #ifdef DT_INST_0_JEDEC_SPI_NOR_HAS_BE32K
.has_be32k = true, .has_be32k = true,
#endif /* DT_INST_0_JEDEC_SPI_NOR_HAS_BE32K */ #endif /* DT_INST_0_JEDEC_SPI_NOR_HAS_BE32K */

2
dts/arm/nxp/nxp_rt1064.dtsi
View file

@ -15,6 +15,6 @@
reg = <0>; reg = <0>;
spi-max-frequency = <133000000>; spi-max-frequency = <133000000>;
status = "okay"; status = "okay";
jedec-id = <0xef 0x40 0x16>; jedec-id = [ef 40 16];
}; };
}; };

2
dts/bindings/mtd/jedec,spi-nor.yaml
View file

@ -17,7 +17,7 @@ properties:
constraint: "jedec,spi-nor" constraint: "jedec,spi-nor"
jedec-id: jedec-id:
type: array type: uint8-array
category: required category: required
description: JEDEC ID as manufacturer ID, memory type, memory density description: JEDEC ID as manufacturer ID, memory type, memory density