adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 8

atmel: sam: flash: Add flash pages property

Browse source 
This commit adds layput page cells to the atmel sam flash
controller and the flash node. These allow for describing
the actual flash page layout of each soc, allowing the
flash driver to fully utilize the capabilities of the
flash.

With this update, we unlock the following capabilties:
  - utilize 2048 erase block size for small sectors
  - utilize 16384 erase block size for large sectors

Signed-off-by: Bjarki Arge Andreasen <bjarkix123@gmail.com>
This commit is contained in:
Bjarki Arge Andreasen 2023-10-21 22:01:17 +02:00 committed by Fabio Baltieri
parent 193ad777f4
commit 6f28ea08a5
30 changed files with 161 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dts/arm/atmel/sam4e.dtsi
View file

@ -79,15 +79,16 @@
compatible = "atmel,sam-flash-controller";
reg = <0x400e0a00 0x200>;
clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
status = "okay";
#address-cells = <1>;
#size-cells = <1>;
#erase-block-cells = <2>;
flash0: flash@400000 {
compatible = "soc-nv-flash";
write-block-size = <16>;
erase-block-size = <8192>;
compatible = "atmel,sam-flash", "soc-nv-flash";
write-block-size = <8>;
erase-block-size = <4096>;
};
};

1
dts/arm/atmel/sam4e16c.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(1024)>;
erase-blocks = <&eefc 8 2048>, <&eefc 252 4096>;
};
};

1
dts/arm/atmel/sam4e16e.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(1024)>;
erase-blocks = <&eefc 8 2048>, <&eefc 252 4096>;
};
};

1
dts/arm/atmel/sam4e8c.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(512)>;
erase-blocks = <&eefc 8 2048>, <&eefc 124 4096>;
};
};

1
dts/arm/atmel/sam4e8e.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(512)>;
erase-blocks = <&eefc 8 2048>, <&eefc 124 4096>;
};
};

8
dts/arm/atmel/sam4s.dtsi
View file

@ -66,12 +66,12 @@
#address-cells = <1>;
#size-cells = <1>;
#erase-block-cells = <2>;
flash0: flash@400000 {
compatible = "soc-nv-flash";
write-block-size = <16>;
erase-block-size = <8192>;
compatible = "atmel,sam-flash", "soc-nv-flash";
write-block-size = <8>;
erase-block-size = <4096>;
};
};

1
dts/arm/atmel/sam4s16b.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(1024)>;
erase-blocks = <&eefc 8 2048>, <&eefc 252 4096>;
};
};

1
dts/arm/atmel/sam4s16c.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(1024)>;
erase-blocks = <&eefc 8 2048>, <&eefc 252 4096>;
};
};

1
dts/arm/atmel/sam4s2a.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(128)>;
erase-blocks = <&eefc 8 2048>, <&eefc 28 4096>;
};
};

1
dts/arm/atmel/sam4s2b.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(128)>;
erase-blocks = <&eefc 8 2048>, <&eefc 28 4096>;
};
};

1
dts/arm/atmel/sam4s2c.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(128)>;
erase-blocks = <&eefc 8 2048>, <&eefc 28 4096>;
};
};

1
dts/arm/atmel/sam4s4a.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(256)>;
erase-blocks = <&eefc 8 2048>, <&eefc 60 4096>;
};
};

1
dts/arm/atmel/sam4s4b.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(356)>;
erase-blocks = <&eefc 8 2048>, <&eefc 60 4096>;
};
};

1
dts/arm/atmel/sam4s4c.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(256)>;
erase-blocks = <&eefc 8 2048>, <&eefc 60 4096>;
};
};

1
dts/arm/atmel/sam4s8b.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(512)>;
erase-blocks = <&eefc 8 2048>, <&eefc 124 4096>;
};
};

1
dts/arm/atmel/sam4s8c.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(512)>;
erase-blocks = <&eefc 8 2048>, <&eefc 124 4096>;
};
};

1
dts/arm/atmel/sam4sa16c.dtsi
View file

@ -12,6 +12,7 @@
flash-controller@400e0a00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(1024)>;
erase-blocks = <&eefc 8 2048>, <&eefc 252 4096>;
};
};

5
dts/arm/atmel/same70.dtsi
View file

@ -71,14 +71,13 @@
#address-cells = <1>;
#size-cells = <1>;
#erase-block-cells = <2>;
flash0: flash@400000 {
compatible = "soc-nv-flash";
compatible = "atmel,sam-flash", "soc-nv-flash";
write-block-size = <16>;
erase-block-size = <8192>;
};
};
wdt: watchdog@400e1850 {

1
dts/arm/atmel/same70q19.dtsi
View file

@ -17,6 +17,7 @@
flash-controller@400e0c00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(512)>;
erase-blocks = <&eefc 8 2048>, <&eefc 62 8192>;
};
};
};

1
dts/arm/atmel/same70q19b.dtsi
View file

@ -17,6 +17,7 @@
flash-controller@400e0c00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(512)>;
erase-blocks = <&eefc 8 2048>, <&eefc 62 8192>;
};
};
};

1
dts/arm/atmel/same70q21.dtsi
View file

@ -17,6 +17,7 @@
flash-controller@400e0c00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(2048)>;
erase-blocks = <&eefc 8 2048>, <&eefc 252 8192>;
};
};
};

1
dts/arm/atmel/same70q21b.dtsi
View file

@ -18,6 +18,7 @@
flash-controller@400e0c00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(2048)>;
erase-blocks = <&eefc 8 2048>, <&eefc 252 8192>;
};
};
};

1
dts/arm/atmel/samv71x19.dtsi
View file

@ -16,6 +16,7 @@
flash-controller@400e0c00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(512)>;
erase-blocks = <&eefc 8 2048>, <&eefc 62 8192>;
};
};
};

1
dts/arm/atmel/samv71x19b.dtsi
View file

@ -17,6 +17,7 @@
flash-controller@400e0c00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(512)>;
erase-blocks = <&eefc 8 2048>, <&eefc 62 8192>;
};
};
};

1
dts/arm/atmel/samv71x20.dtsi
View file

@ -16,6 +16,7 @@
flash-controller@400e0c00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(1024)>;
erase-blocks = <&eefc 8 2048>, <&eefc 126 8192>;
};
};
};

1
dts/arm/atmel/samv71x20b.dtsi
View file

@ -17,6 +17,7 @@
flash-controller@400e0c00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(1024)>;
erase-blocks = <&eefc 8 2048>, <&eefc 126 8192>;
};
};
};

1
dts/arm/atmel/samv71x21.dtsi
View file

@ -16,6 +16,7 @@
flash-controller@400e0c00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(2048)>;
erase-blocks = <&eefc 8 2048>, <&eefc 252 8192>;
};
};
};

1
dts/arm/atmel/samv71x21b.dtsi
View file

@ -17,6 +17,7 @@
flash-controller@400e0c00 {
flash0: flash@400000 {
reg = <0x00400000 DT_SIZE_K(2048)>;
erase-blocks = <&eefc 8 2048>, <&eefc 252 8192>;
};
};
};

8
dts/bindings/flash_controller/atmel,sam-flash-controller.yaml
View file

@ -10,3 +10,11 @@ include: flash-controller.yaml
properties:
clocks:
required: true
"#erase-block-cells":
type: int
const: 2
erase-block-cells:
- pages-count
- pages-size

117
dts/bindings/mtd/atmel,sam-flash.yaml Normal file
View file

@ -0,0 +1,117 @@
# Copyright (c) 2023 Bjarki Arge Andreasen
# SPDX-License-Identifier: Apache-2.0
description: |
This binding describes the Atmel SAM flash area layout.
The Atmel SAM flash area varies in write-block-size, memory area,
and the layout of erase-blocks.
E.g. the flash area layout of the ATSAM4E16C:
|--------------------|
| 8 Kbytes | erase block size = 2048
|--------------------|
| 8 Kbytes | erase block size = 2048
|--------------------|
| 48 Kbytes | erase block size = 4096
|--------------------|
| 64 Kbytes | erase block size = 4096
|--------------------|
| ... |
The ATSAM4E16C has a flash area which is 1000Kbytes
(1024 * 1024 bytes) with a write-block-size of 8 bytes. The first
16 Kbytes can be erased in blocks of 2048 bytes
(8 blocks of 2048 bytes), the remaining flash area is erasable
in blocks of 4096 bytes (252 blocks of 4096 bytes).
This flash area layout would described as:
/ {
soc {
eefc: flash-controller@400e0a00 {
compatible = "atmel,sam-flash-controller";
reg = <0x400e0a00 0x200>;
clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
status = "okay";
#address-cells = <1>;
#size-cells = <1>;
#erase-block-cells = <2>;
flash0: flash@400000 {
compatible = "atmel,sam-flash", "soc-nv-flash";
reg = <0x400000 0x100000>;
write-block-size = <8>;
erase-block-size = <4096>;
erase-blocks = <&eefc 8 2048>, <&eefc 252 4096>;
};
};
};
Notes:
The flash area layout node flash0 should have both this
compatible, "atmel,sam-flash", and the "soc-nv-flash"
compatible. The latter is used from mcuboot and other
modules to identify the flash area.
If partitions are used, remember that their addresses are
offsets relative to the flash area address. E.g. using
mcuboot and a allocating a storage partition:
&flash0 {
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
boot_partition: partition@0 {
label = "mcuboot";
reg = <0x0 0x10000>;
};
slot0_partition: partition@10000 {
label = "slot0";
reg = <0x10000 0x70000>;
};
slot1_partition: partition@80000 {
label = "slot1";
reg = <0x80000 0x70000>;
};
storage_partition: partition@f0000 {
label = "storage";
reg = <0xf0000 0x100000>;
};
};
};
compatible: "atmel,sam-flash"
include: base.yaml
properties:
write-block-size:
type: int
description: |
The flash controller is limited by hardware to writing blocks of
this size, aligned to this size, in bytes, to previously erased
flash, within the flash memory area.
erase-block-size:
type: int
description: |
The flash controller is limited by hardware to erase whole
blocks of flash at a time. This property describes the largest
erase block size in erase-blocks.
erase-blocks:
type: phandle-array
required: true
description: |
The flash controller is limited by hardware to erase whole
blocks of flash at a time. This propery describes the layout of
the erase-blocks, which can vary in size within the flash memory
area.