dts: arm: silabs: Move efr32mg24 to xg24 directory

asmellby · kartben · commit 96df30829e35 · 2025-05-16T19:02:25.000+02:00
Introduce subdirectory for xg24 socs.

Signed-off-by: Aksel Skauge Mellbye &lt;aksel.mellbye@silabs.com&gt;
diff --git a/boards/seeed/xiao_mg24/xiao_mg24.dts b/boards/seeed/xiao_mg24/xiao_mg24.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <silabs/efr32mg24b220f1536im48.dtsi>
+#include <silabs/xg24/efr32mg24b220f1536im48.dtsi>
 #include "xiao_mg24-pinctrl.dtsi"
 #include "seeed_xiao_connector.dtsi"
 
diff --git a/boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b.dts b/boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <silabs/efr32mg24b310f1536im48.dtsi>
+#include <silabs/xg24/efr32mg24b310f1536im48.dtsi>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <zephyr/dt-bindings/regulator/silabs_dcdc.h>
 #include "xg24_dk2601b-pinctrl.dtsi"
diff --git a/boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a.dts b/boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <silabs/efr32mg24b210f1536im48.dtsi>
+#include <silabs/xg24/efr32mg24b210f1536im48.dtsi>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <zephyr/dt-bindings/regulator/silabs_dcdc.h>
 #include "xg24_ek2703a-pinctrl.dtsi"
diff --git a/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.dts b/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <silabs/efr32mg24b220f1536im48.dtsi>
+#include <silabs/xg24/efr32mg24b220f1536im48.dtsi>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <zephyr/dt-bindings/regulator/silabs_dcdc.h>
 #include "xg24_rb4187c-pinctrl.dtsi"
diff --git a/boards/sparkfun/thing_plus_matter_mgm240p/sparkfun_thing_plus_matter_mgm240p.dts b/boards/sparkfun/thing_plus_matter_mgm240p/sparkfun_thing_plus_matter_mgm240p.dts
@@ -6,7 +6,7 @@
  */
 
 /dts-v1/;
-#include <silabs/efr32mg24b020f1536im40.dtsi>
+#include <silabs/xg24/efr32mg24b020f1536im40.dtsi>
 #include "sparkfun_thing_plus_matter_mgm240p-pinctrl.dtsi"
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <zephyr/dt-bindings/regulator/silabs_dcdc.h>
diff --git a/dts/arm/silabs/xg24/efr32mg24.dtsi b/dts/arm/silabs/xg24/efr32mg24.dtsi
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <silabs/xg24/efr32xg24.dtsi>
diff --git a/dts/arm/silabs/xg24/efr32mg24b020f1536im40.dtsi b/dts/arm/silabs/xg24/efr32mg24b020f1536im40.dtsi
@@ -5,17 +5,16 @@
  */
 
 #include <mem.h>
-#include <silabs/efr32mg24.dtsi>
+#include <silabs/xg24/efr32mg24.dtsi>
 
 / {
 	sram0: memory@20000000 {
 		reg = <0x20000000 DT_SIZE_K(256)>;
 	};
 
 	soc {
-		compatible = "silabs,efr32mg24b020f1536im40",
-					"silabs,efr32mg24", "silabs,efr32",
-					"simple-bus";
+		compatible = "silabs,efr32mg24b020f1536im40", "silabs,efr32mg24", "silabs,xg24",
+			     "silabs,efr32", "simple-bus";
 	};
 };
 
diff --git a/dts/arm/silabs/xg24/efr32mg24b210f1536im48.dtsi b/dts/arm/silabs/xg24/efr32mg24b210f1536im48.dtsi
@@ -5,18 +5,16 @@
  */
 
 #include <mem.h>
-#include <silabs/efr32mg24.dtsi>
+#include <silabs/xg24/efr32mg24.dtsi>
 
 / {
 	sram0: memory@20000000 {
 		reg = <0x20000000 DT_SIZE_K(256)>;
 	};
 
 	soc {
-		compatible = "silabs,efr32mg24b210f1536im48",
-					 "silabs,efr32mg24",
-					 "silabs,efr32",
-					 "simple-bus";
+		compatible = "silabs,efr32mg24b210f1536im48", "silabs,efr32mg24", "silabs,xg24",
+			     "silabs,efr32", "simple-bus";
 	};
 };
 
diff --git a/dts/arm/silabs/xg24/efr32mg24b220f1536im48.dtsi b/dts/arm/silabs/xg24/efr32mg24b220f1536im48.dtsi
@@ -5,17 +5,16 @@
  */
 
 #include <mem.h>
-#include <silabs/efr32mg24.dtsi>
+#include <silabs/xg24/efr32mg24.dtsi>
 
 / {
 	sram0: memory@20000000 {
 		reg = <0x20000000 DT_SIZE_K(256)>;
 	};
 
 	soc {
-		compatible = "silabs,efr32mg24b220f1536im48",
-					 "silabs,efr32mg24", "silabs,efr32",
-					 "simple-bus";
+		compatible = "silabs,efr32mg24b220f1536im48", "silabs,efr32mg24", "silabs,xg24",
+			     "silabs,efr32", "simple-bus";
 	};
 };
 
diff --git a/dts/arm/silabs/xg24/efr32mg24b310f1536im48.dtsi b/dts/arm/silabs/xg24/efr32mg24b310f1536im48.dtsi
@@ -5,17 +5,16 @@
  */
 
 #include <mem.h>
-#include <silabs/efr32mg24.dtsi>
+#include <silabs/xg24/efr32mg24.dtsi>
 
 / {
 	sram0: memory@20000000 {
 		reg = <0x20000000 DT_SIZE_K(256)>;
 	};
 
 	soc {
-		compatible = "silabs,efr32mg24b310f1536im48",
-					 "silabs,efr32mg24", "silabs,efr32",
-					 "simple-bus";
+		compatible = "silabs,efr32mg24b310f1536im48", "silabs,efr32mg24", "silabs,xg24",
+			     "silabs,efr32", "simple-bus";
 	};
 };
 
diff --git a/dts/arm/silabs/xg24/efr32xg24.dtsi b/dts/arm/silabs/xg24/efr32xg24.dtsi
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <silabs/xg24/xg24.dtsi>
+
+/ {
+	soc {
+		radio: radio@b0000000 {
+			compatible = "silabs,series2-radio";
+			reg = <0xb0000000 0x1000000>;
+			interrupts = <30 1>, <31 1>, <32 1>, <33 1>, <34 1>, <35 1>,
+				     <36 1>, <37 1>, <38 1>, <39 1>, <70 1>, <71 1>;
+			interrupt-names = "agc", "bufc", "frc_pri", "frc", "modem", "protimer",
+					  "rac_rsm", "rac_seq", "hostmailbox", "synth",
+					  "rfeca0", "rfeca1";
+			pa-initial-power-dbm = <10>;
+			pa-ramp-time-us = <10>;
+			pa-voltage-mv = <3300>;
+			pa-2p4ghz = "highest";
+
+			bt_hci_silabs: bt_hci_silabs {
+				compatible = "silabs,bt-hci-efr32";
+				status = "disabled";
+			};
+		};
+	};
+};
diff --git a/dts/arm/silabs/xg24/xg24.dtsi b/dts/arm/silabs/xg24/xg24.dtsi
@@ -450,25 +450,6 @@
 			clocks = <&cmu CLOCK_ACMP0 CLOCK_BRANCH_EM01GRPACLK>;
 			status = "disabled";
 		};
-
-		radio: radio@b0000000 {
-			compatible = "silabs,series2-radio";
-			reg = <0xb0000000 0x1000000>;
-			interrupts = <30 1>, <31 1>, <32 1>, <33 1>, <34 1>, <35 1>,
-				     <36 1>, <37 1>, <38 1>, <39 1>, <70 1>, <71 1>;
-			interrupt-names = "agc", "bufc", "frc_pri", "frc", "modem", "protimer",
-					  "rac_rsm", "rac_seq", "hostmailbox", "synth",
-					  "rfeca0", "rfeca1";
-			pa-initial-power-dbm = <10>;
-			pa-ramp-time-us = <10>;
-			pa-voltage-mv = <3300>;
-			pa-2p4ghz = "highest";
-
-			bt_hci_silabs: bt_hci_silabs {
-				compatible = "silabs,bt-hci-efr32";
-				status = "disabled";
-			};
-		};
 	};
 };
 
