Skip to content
Permalink
Browse files

dts/spi-nor: use bytestring for JEDEC ID

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>
  • Loading branch information...
pabigot authored and galak committed Jul 22, 2019
1 parent c59bac3 commit fa10a9640b3acd79f9cf7e150f540c2ef1cb2459
@@ -132,7 +132,7 @@
reg = <0>;
spi-max-frequency = <80000000>;
label = "MX25R64";
jedec-id = <0xc2 0x28 0x17>;
jedec-id = [c2 28 17];
size = <67108864>;
wp-gpios = <&gpio0 22 0>;
hold-gpios = <&gpio0 23 0>;
@@ -57,7 +57,7 @@ arduino_serial: &uart4 {};
reg = <0>;
spi-max-frequency = <133000000>;
status = "okay";
jedec-id = <0x1f 0x89 0x01>;
jedec-id = [1f 89 01];
};
};

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

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

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

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

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

@@ -64,7 +64,7 @@
flash0: flash@0 {
compatible = "issi,is25lp128", "jedec,spi-nor";
label = "FLASH0";
jedec-id = <0x96 0x60 0x18>;
jedec-id = [96 60 18];
reg = <0>;
spi-max-frequency = <133000000>;
};
@@ -62,7 +62,7 @@
flash0: flash@0 {
compatible = "issi,is25lp128", "jedec,spi-nor";
label = "FLASH0";
jedec-id = <0x96 0x60 0x18>;
jedec-id = [96 60 18];
reg = <0>;
spi-max-frequency = <133000000>;
};
@@ -40,7 +40,7 @@
flash0: flash@0 {
compatible = "issi,is25lp128", "jedec,spi-nor";
label = "FLASH0";
jedec-id = <0x96 0x60 0x18>;
jedec-id = [96 60 18];
reg = <0>;
// Dummy entry
spi-max-frequency = <0>;
@@ -53,7 +53,7 @@
reg = <0>;
spi-max-frequency = <2000000>;
label = "MX25UM512";
jedec-id = <0xc2 0x80 0x3a>;
jedec-id = [c2 80 3a];
size = <0x2000000>;
};
};
@@ -396,11 +396,7 @@ static const struct flash_driver_api spi_nor_api = {
};

static const struct spi_nor_config flash_id = {
.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,
},
.id = DT_INST_0_JEDEC_SPI_NOR_JEDEC_ID,
#ifdef DT_INST_0_JEDEC_SPI_NOR_HAS_BE32K
.has_be32k = true,
#endif /* DT_INST_0_JEDEC_SPI_NOR_HAS_BE32K */
@@ -15,6 +15,6 @@
reg = <0>;
spi-max-frequency = <133000000>;
status = "okay";
jedec-id = <0xef 0x40 0x16>;
jedec-id = [ef 40 16];
};
};
@@ -17,7 +17,7 @@ properties:
constraint: "jedec,spi-nor"

jedec-id:
type: array
type: uint8-array
category: required
description: JEDEC ID as manufacturer ID, memory type, memory density

0 comments on commit fa10a96

Please sign in to comment.
You can’t perform that action at this time.