From 1b57a4500823ba857bb6704bd84c87dfb80cb42c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sun, 10 Sep 2023 11:45:28 +0100 Subject: [PATCH] samd2x: separate RAM/Flash sizes by model. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This creates separate dtsi files for the various memory density codes of SAM D20 and D21 families (they are the same where the specific size exists.) All of the boards with the exclusion of EV11L78A use the same density model of 18 (32KiB RAM and 256KiB flash) which is what the samd2x.dtsi include specified for all of them previously. Signed-off-by: Diego Elio Pettenò --- .../adafruit_feather_m0_basic_proto.dts | 1 + .../adafruit_feather_m0_lora.dts | 1 + .../adafruit_trinket_m0/adafruit_trinket_m0.dts | 1 + boards/arm/arduino_mkrzero/arduino_mkrzero.dts | 1 + .../arduino_nano_33_iot/arduino_nano_33_iot.dts | 1 + boards/arm/arduino_zero/arduino_zero.dts | 1 + boards/arm/atsamd20_xpro/atsamd20_xpro.dts | 1 + boards/arm/atsamd21_xpro/atsamd21_xpro.dts | 1 + boards/arm/atsamr21_xpro/atsamr21_xpro.dts | 9 +++++++++ boards/arm/ev11l78a/ev11l78a.dts | 6 ++++-- boards/arm/seeeduino_xiao/seeeduino_xiao.dts | 1 + boards/arm/serpente/serpente.dts | 1 + dts/arm/atmel/samd2x.dtsi | 2 -- dts/arm/atmel/samd2xx14.dtsi | 15 +++++++++++++++ dts/arm/atmel/samd2xx15.dtsi | 15 +++++++++++++++ dts/arm/atmel/samd2xx16.dtsi | 15 +++++++++++++++ dts/arm/atmel/samd2xx17.dtsi | 15 +++++++++++++++ dts/arm/atmel/samd2xx18.dtsi | 15 +++++++++++++++ 18 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 dts/arm/atmel/samd2xx14.dtsi create mode 100644 dts/arm/atmel/samd2xx15.dtsi create mode 100644 dts/arm/atmel/samd2xx16.dtsi create mode 100644 dts/arm/atmel/samd2xx17.dtsi create mode 100644 dts/arm/atmel/samd2xx18.dtsi diff --git a/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts b/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts index df83c6d6ddddd0..23046b3922199a 100644 --- a/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts +++ b/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include "adafruit_feather_m0_basic_proto-pinctrl.dtsi" #include "feather_connector.dtsi" diff --git a/boards/arm/adafruit_feather_m0_lora/adafruit_feather_m0_lora.dts b/boards/arm/adafruit_feather_m0_lora/adafruit_feather_m0_lora.dts index ac62ebca4f4ebc..a1d5fd9915ad3c 100644 --- a/boards/arm/adafruit_feather_m0_lora/adafruit_feather_m0_lora.dts +++ b/boards/arm/adafruit_feather_m0_lora/adafruit_feather_m0_lora.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include "adafruit_feather_m0_lora-pinctrl.dtsi" #include "feather_connector.dtsi" diff --git a/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0.dts b/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0.dts index ce128b6807b61a..f2e750993b3648 100644 --- a/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0.dts +++ b/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include "adafruit_trinket_m0-pinctrl.dtsi" / { diff --git a/boards/arm/arduino_mkrzero/arduino_mkrzero.dts b/boards/arm/arduino_mkrzero/arduino_mkrzero.dts index 657aca978a136d..02d4bbb867769f 100644 --- a/boards/arm/arduino_mkrzero/arduino_mkrzero.dts +++ b/boards/arm/arduino_mkrzero/arduino_mkrzero.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include "arduino_mkrzero-pinctrl.dtsi" #include "arduino_mkr_connector.dtsi" diff --git a/boards/arm/arduino_nano_33_iot/arduino_nano_33_iot.dts b/boards/arm/arduino_nano_33_iot/arduino_nano_33_iot.dts index 732084dab3e164..6a8ae3f04a55dd 100644 --- a/boards/arm/arduino_nano_33_iot/arduino_nano_33_iot.dts +++ b/boards/arm/arduino_nano_33_iot/arduino_nano_33_iot.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include "arduino_nano_33_iot-pinctrl.dtsi" #include "arduino_nano_r3_connector.dtsi" diff --git a/boards/arm/arduino_zero/arduino_zero.dts b/boards/arm/arduino_zero/arduino_zero.dts index 4eff1db0e85683..e8b7c40c44e7b3 100644 --- a/boards/arm/arduino_zero/arduino_zero.dts +++ b/boards/arm/arduino_zero/arduino_zero.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include "arduino_zero-pinctrl.dtsi" / { diff --git a/boards/arm/atsamd20_xpro/atsamd20_xpro.dts b/boards/arm/atsamd20_xpro/atsamd20_xpro.dts index ade715cd77cd8f..f8075ef8a962ea 100644 --- a/boards/arm/atsamd20_xpro/atsamd20_xpro.dts +++ b/boards/arm/atsamd20_xpro/atsamd20_xpro.dts @@ -7,6 +7,7 @@ /dts-v1/; #include #include +#include #include "atsamd20_xpro-pinctrl.dtsi" #include diff --git a/boards/arm/atsamd21_xpro/atsamd21_xpro.dts b/boards/arm/atsamd21_xpro/atsamd21_xpro.dts index b51712589e4131..8e93470c07782b 100644 --- a/boards/arm/atsamd21_xpro/atsamd21_xpro.dts +++ b/boards/arm/atsamd21_xpro/atsamd21_xpro.dts @@ -7,6 +7,7 @@ /dts-v1/; #include #include +#include #include "atsamd21_xpro-pinctrl.dtsi" #include diff --git a/boards/arm/atsamr21_xpro/atsamr21_xpro.dts b/boards/arm/atsamr21_xpro/atsamr21_xpro.dts index a94621730ebc2d..06282b14e4befb 100644 --- a/boards/arm/atsamr21_xpro/atsamr21_xpro.dts +++ b/boards/arm/atsamr21_xpro/atsamr21_xpro.dts @@ -5,6 +5,7 @@ */ /dts-v1/; +#include #include #include "atsamr21_xpro-pinctrl.dtsi" #include @@ -104,6 +105,14 @@ clock-frequency = <48000000>; }; +&sram0 { + reg = <0x20000000 DT_SIZE_K(32)>; +}; + +&flash0 { + reg = <0 DT_SIZE_K(256)>; +}; + &tcc0 { status = "okay"; compatible = "atmel,sam0-tcc-pwm"; diff --git a/boards/arm/ev11l78a/ev11l78a.dts b/boards/arm/ev11l78a/ev11l78a.dts index 0096fe9651d663..2139b46f08e623 100644 --- a/boards/arm/ev11l78a/ev11l78a.dts +++ b/boards/arm/ev11l78a/ev11l78a.dts @@ -6,7 +6,9 @@ /dts-v1/; #include +#include #include +#include #include "ev11l78a-pinctrl.dtsi" / { @@ -94,9 +96,9 @@ * Storage partition will be used by FCB/LittleFS/NVS * if enabled. */ - storage_partition: partition@3c000 { + storage_partition: partition@c000 { label = "storage"; - reg = <0x0003c000 0x00004000>; + reg = ; }; }; }; diff --git a/boards/arm/seeeduino_xiao/seeeduino_xiao.dts b/boards/arm/seeeduino_xiao/seeeduino_xiao.dts index a0bc69a48140f6..1eadd4ed70fe6f 100644 --- a/boards/arm/seeeduino_xiao/seeeduino_xiao.dts +++ b/boards/arm/seeeduino_xiao/seeeduino_xiao.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include "seeeduino_xiao-pinctrl.dtsi" #include "seeed_xiao_connector.dtsi" diff --git a/boards/arm/serpente/serpente.dts b/boards/arm/serpente/serpente.dts index 3237920aa5ea84..13e1a46ae49d7c 100644 --- a/boards/arm/serpente/serpente.dts +++ b/boards/arm/serpente/serpente.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include "serpente-pinctrl.dtsi" / { diff --git a/dts/arm/atmel/samd2x.dtsi b/dts/arm/atmel/samd2x.dtsi index feae5b3ccb966a..c247daffc1a516 100644 --- a/dts/arm/atmel/samd2x.dtsi +++ b/dts/arm/atmel/samd2x.dtsi @@ -33,7 +33,6 @@ sram0: memory@20000000 { compatible = "mmio-sram"; - reg = <0x20000000 0x8000>; }; id: device_id@80a00c { @@ -71,7 +70,6 @@ flash0: flash@0 { compatible = "soc-nv-flash"; - reg = <0 0x40000>; write-block-size = <4>; }; }; diff --git a/dts/arm/atmel/samd2xx14.dtsi b/dts/arm/atmel/samd2xx14.dtsi new file mode 100644 index 00000000000000..8e345dda9a5118 --- /dev/null +++ b/dts/arm/atmel/samd2xx14.dtsi @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2023, Meta Platforms, Inc. and its affiliates. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram0 { + reg = <0x20000000 DT_SIZE_K(2)>; +}; + +&flash0 { + reg = <0 DT_SIZE_K(16)>; +}; diff --git a/dts/arm/atmel/samd2xx15.dtsi b/dts/arm/atmel/samd2xx15.dtsi new file mode 100644 index 00000000000000..88bfa454b14a71 --- /dev/null +++ b/dts/arm/atmel/samd2xx15.dtsi @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2023, Meta Platforms, Inc. and its affiliates. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram0 { + reg = <0x20000000 DT_SIZE_K(4)>; +}; + +&flash0 { + reg = <0 DT_SIZE_K(32)>; +}; diff --git a/dts/arm/atmel/samd2xx16.dtsi b/dts/arm/atmel/samd2xx16.dtsi new file mode 100644 index 00000000000000..484c06315ce82b --- /dev/null +++ b/dts/arm/atmel/samd2xx16.dtsi @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2023, Meta Platforms, Inc. and its affiliates. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram0 { + reg = <0x20000000 DT_SIZE_K(8)>; +}; + +&flash0 { + reg = <0 DT_SIZE_K(64)>; +}; diff --git a/dts/arm/atmel/samd2xx17.dtsi b/dts/arm/atmel/samd2xx17.dtsi new file mode 100644 index 00000000000000..19b8b2607cf843 --- /dev/null +++ b/dts/arm/atmel/samd2xx17.dtsi @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2023, Meta Platforms, Inc. and its affiliates. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram0 { + reg = <0x20000000 DT_SIZE_K(16)>; +}; + +&flash0 { + reg = <0 DT_SIZE_K(128)>; +}; diff --git a/dts/arm/atmel/samd2xx18.dtsi b/dts/arm/atmel/samd2xx18.dtsi new file mode 100644 index 00000000000000..2abbffa6ee7e6c --- /dev/null +++ b/dts/arm/atmel/samd2xx18.dtsi @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2023, Meta Platforms, Inc. and its affiliates. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram0 { + reg = <0x20000000 DT_SIZE_K(32)>; +}; + +&flash0 { + reg = <0 DT_SIZE_K(256)>; +};