samd2x: separate RAM/Flash sizes by model.

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ò <[email protected]>
zephyrproject-rtos · Sep 10, 2023 · 1b57a45 · 1b57a45
1 parent bc695c6
commit 1b57a45
Show file tree

Hide file tree

Showing 18 changed files with 98 additions and 4 deletions.
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
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <atmel/samd21.dtsi>
+#include <atmel/samd2xx18.dtsi>
 #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
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <atmel/samd21.dtsi>
+#include <atmel/samd2xx18.dtsi>
 #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
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <atmel/samd21.dtsi>
+#include <atmel/samd2xx18.dtsi>
 #include "adafruit_trinket_m0-pinctrl.dtsi"
 
 / {

diff --git a/boards/arm/arduino_mkrzero/arduino_mkrzero.dts b/boards/arm/arduino_mkrzero/arduino_mkrzero.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <atmel/samd21.dtsi>
+#include <atmel/samd2xx18.dtsi>
 #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
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <atmel/samd21.dtsi>
+#include <atmel/samd2xx18.dtsi>
 #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
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <atmel/samd21.dtsi>
+#include <atmel/samd2xx18.dtsi>
 #include "arduino_zero-pinctrl.dtsi"
 
 / {

diff --git a/boards/arm/atsamd20_xpro/atsamd20_xpro.dts b/boards/arm/atsamd20_xpro/atsamd20_xpro.dts
@@ -7,6 +7,7 @@
 /dts-v1/;
 #include <freq.h>
 #include <atmel/samd20.dtsi>
+#include <atmel/samd2xx18.dtsi>
 #include "atsamd20_xpro-pinctrl.dtsi"
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 

diff --git a/boards/arm/atsamd21_xpro/atsamd21_xpro.dts b/boards/arm/atsamd21_xpro/atsamd21_xpro.dts
@@ -7,6 +7,7 @@
 /dts-v1/;
 #include <freq.h>
 #include <atmel/samd21.dtsi>
+#include <atmel/samd2xx18.dtsi>
 #include "atsamd21_xpro-pinctrl.dtsi"
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 

diff --git a/boards/arm/atsamr21_xpro/atsamr21_xpro.dts b/boards/arm/atsamr21_xpro/atsamr21_xpro.dts
@@ -5,6 +5,7 @@
  */
 
 /dts-v1/;
+#include <mem.h>
 #include <atmel/samr21.dtsi>
 #include "atsamr21_xpro-pinctrl.dtsi"
 #include <zephyr/dt-bindings/input/input-event-codes.h>
@@ -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
@@ -6,7 +6,9 @@
 
 /dts-v1/;
 #include <freq.h>
+#include <mem.h>
 #include <atmel/samd20.dtsi>
+#include <atmel/samd2xx16.dtsi>
 #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 = <DT_SIZE_K(64-16) DT_SIZE_K(16)>;
 		};
 	};
 };

diff --git a/boards/arm/seeeduino_xiao/seeeduino_xiao.dts b/boards/arm/seeeduino_xiao/seeeduino_xiao.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <atmel/samd21.dtsi>
+#include <atmel/samd2xx18.dtsi>
 #include "seeeduino_xiao-pinctrl.dtsi"
 #include "seeed_xiao_connector.dtsi"
 

diff --git a/boards/arm/serpente/serpente.dts b/boards/arm/serpente/serpente.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <atmel/samd21.dtsi>
+#include <atmel/samd2xx18.dtsi>
 #include "serpente-pinctrl.dtsi"
 
 / {

diff --git 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
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023, Meta Platforms, Inc. and its affiliates.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+
+&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
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023, Meta Platforms, Inc. and its affiliates.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+
+&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
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023, Meta Platforms, Inc. and its affiliates.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+
+&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
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023, Meta Platforms, Inc. and its affiliates.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+
+&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
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023, Meta Platforms, Inc. and its affiliates.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+
+&sram0 {
+	reg = <0x20000000 DT_SIZE_K(32)>;
+};
+
+&flash0 {
+	reg = <0 DT_SIZE_K(256)>;
+};