zephyrproject-rtos · TonyHan11 · Oct 15, 2025 · Sep 18, 2025 · ArunMCHP · Oct 14, 2025
diff --git a/soc/microchip/sam/common/CMakeLists.txt → soc/microchip/sam/mpu_clock/CMakeLists.txt b/soc/microchip/sam/common/CMakeLists.txt → soc/microchip/sam/mpu_clock/CMakeLists.txt
diff --git a/soc/microchip/sam/common/clk-generated.c → soc/microchip/sam/mpu_clock/clk-generated.c b/soc/microchip/sam/common/clk-generated.c → soc/microchip/sam/mpu_clock/clk-generated.c
diff --git a/soc/microchip/sam/common/clk-main.c → soc/microchip/sam/mpu_clock/clk-main.c b/soc/microchip/sam/common/clk-main.c → soc/microchip/sam/mpu_clock/clk-main.c
diff --git a/soc/microchip/sam/common/clk-master.c → soc/microchip/sam/mpu_clock/clk-master.c b/soc/microchip/sam/common/clk-master.c → soc/microchip/sam/mpu_clock/clk-master.c
diff --git a/soc/microchip/sam/common/clk-peripheral.c → soc/microchip/sam/mpu_clock/clk-peripheral.c b/soc/microchip/sam/common/clk-peripheral.c → soc/microchip/sam/mpu_clock/clk-peripheral.c
diff --git a/soc/microchip/sam/common/clk-programmable.c → ...icrochip/sam/mpu_clock/clk-programmable.c b/soc/microchip/sam/common/clk-programmable.c → ...icrochip/sam/mpu_clock/clk-programmable.c
diff --git a/soc/microchip/sam/common/clk-sam9x60-pll.c → ...microchip/sam/mpu_clock/clk-sam9x60-pll.c b/soc/microchip/sam/common/clk-sam9x60-pll.c → ...microchip/sam/mpu_clock/clk-sam9x60-pll.c
diff --git a/soc/microchip/sam/common/clk-system.c → soc/microchip/sam/mpu_clock/clk-system.c b/soc/microchip/sam/common/clk-system.c → soc/microchip/sam/mpu_clock/clk-system.c
diff --git a/soc/microchip/sam/common/clk-utmi.c → soc/microchip/sam/mpu_clock/clk-utmi.c b/soc/microchip/sam/common/clk-utmi.c → soc/microchip/sam/mpu_clock/clk-utmi.c
diff --git a/soc/microchip/sam/common/pinctrl_soc.h → soc/microchip/sam/mpu_clock/pinctrl_soc.h b/soc/microchip/sam/common/pinctrl_soc.h → soc/microchip/sam/mpu_clock/pinctrl_soc.h
diff --git a/soc/microchip/sam/common/pmc.c → soc/microchip/sam/mpu_clock/pmc.c b/soc/microchip/sam/common/pmc.c → soc/microchip/sam/mpu_clock/pmc.c
diff --git a/soc/microchip/sam/common/pmc.h → soc/microchip/sam/mpu_clock/pmc.h b/soc/microchip/sam/common/pmc.h → soc/microchip/sam/mpu_clock/pmc.h
diff --git a/soc/microchip/sam/common/sama7g5.c → soc/microchip/sam/mpu_clock/sama7g5.c b/soc/microchip/sam/common/sama7g5.c → soc/microchip/sam/mpu_clock/sama7g5.c
diff --git a/soc/microchip/sam/sama7g5/CMakeLists.txt → soc/microchip/sam/sama7/CMakeLists.txt b/soc/microchip/sam/sama7g5/CMakeLists.txt → soc/microchip/sam/sama7/CMakeLists.txt
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_sources(soc.c)
-zephyr_include_directories(.)
+add_subdirectory(${SOC_SERIES})
+
+add_subdirectory(../mpu_clock ${CMAKE_BINARY_DIR}/mpu_clock)
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/microchip/sam/Kconfig → soc/microchip/sam/sama7/Kconfig b/soc/microchip/sam/Kconfig → soc/microchip/sam/sama7/Kconfig
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-config SOC_SERIES_SAMA7G5
-	select ARM
+config SOC_FAMILY_MICROCHIP_SAMA7
 	select MICROCHIP_SAM
+	select ARM
 	select CPU_CORTEX_A7
-	select SOC_EARLY_INIT_HOOK
+	select MMU
diff --git a/soc/microchip/sam/Kconfig.defconfig → soc/microchip/sam/sama7/Kconfig.defconfig b/soc/microchip/sam/Kconfig.defconfig → soc/microchip/sam/sama7/Kconfig.defconfig
@@ -3,15 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if SOC_FAMILY_MICROCHIP_SAM
+if SOC_FAMILY_MICROCHIP_SAMA7
 
-rsource "*/Kconfig.defconfig"
-
-config CLOCK_CONTROL
+configdefault SOC_EARLY_INIT_HOOK
 	default y
 
-config MFD
+configdefault CLOCK_CONTROL
 	default y
-	depends on DT_HAS_MICROCHIP_SAM_FLEXCOM_ENABLED
 
-endif # SOC_FAMILY_MICROCHIP_SAM
+endif # SOC_FAMILY_MICROCHIP_SAMA7
+
+rsource "*/Kconfig.defconfig"
diff --git a/soc/microchip/sam/Kconfig.soc → soc/microchip/sam/sama7/Kconfig.soc b/soc/microchip/sam/Kconfig.soc → soc/microchip/sam/sama7/Kconfig.soc
@@ -3,10 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-config SOC_FAMILY_MICROCHIP_SAM
+config SOC_FAMILY_MICROCHIP_SAMA7
 	bool
+	help
+	  Enable support for Microchip SAMA7 Cortex-A Microprocessors.
 
 config SOC_FAMILY
-	default "microchip_sam" if SOC_FAMILY_MICROCHIP_SAM
+	default "microchip_sama7" if SOC_FAMILY_MICROCHIP_SAMA7
 
 rsource "*/Kconfig.soc"
diff --git a/soc/microchip/sam/CMakeLists.txt → ...icrochip/sam/sama7/sama7g5/CMakeLists.txt b/soc/microchip/sam/CMakeLists.txt → ...icrochip/sam/sama7/sama7g5/CMakeLists.txt
@@ -3,5 +3,5 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_subdirectory(common)
-add_subdirectory(${SOC_SERIES})
+zephyr_sources(soc.c)
+zephyr_include_directories(.)
diff --git a/soc/microchip/sam/sama7g5/Kconfig.defconfig → ...ochip/sam/sama7/sama7g5/Kconfig.defconfig b/soc/microchip/sam/sama7g5/Kconfig.defconfig → ...ochip/sam/sama7/sama7g5/Kconfig.defconfig
@@ -5,13 +5,10 @@
 
 if SOC_SERIES_SAMA7G5
 
-config NUM_IRQS
+configdefault NUM_IRQS
 	default 187
 
-config SYS_CLOCK_HW_CYCLES_PER_SEC
+configdefault SYS_CLOCK_HW_CYCLES_PER_SEC
 	default $(dt_node_int_prop_int,/soc/timer@e1800000,clock-frequency)
 
-config MMU
-	default y
-
 endif # SOC_SERIES_SAMA7G5
diff --git a/soc/microchip/sam/sama7g5/Kconfig.soc → soc/microchip/sam/sama7/sama7g5/Kconfig.soc b/soc/microchip/sam/sama7g5/Kconfig.soc → soc/microchip/sam/sama7/sama7g5/Kconfig.soc
@@ -5,11 +5,11 @@
 
 config SOC_SERIES_SAMA7G5
 	bool
-	select SOC_FAMILY_MICROCHIP_SAM
+	select SOC_FAMILY_MICROCHIP_SAMA7
 	help
-	  Enable support for Microchip SAM Microprocessors.
+	  Enable support for Microchip SAMA7G5 Cortex-A Microprocessors.
 
 config SOC_SERIES
 	default "sama7g5" if SOC_SERIES_SAMA7G5
 
-rsource "Kconfig.soc.sam*"
+rsource "*/Kconfig.soc*"
-rsource "*/Kconfig.soc*"
+config SOC_SAMA7G54
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D1G
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D1GN0
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D1GN2
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D2G
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D2GN4
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D4G
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC
+	default "sama7g54" if SOC_SAMA7G54
+	default "sama7g54d1g" if SOC_SAMA7G54D1G
+	default "sama7g54d1gn0" if SOC_SAMA7G54D1GN0
+	default "sama7g54d1gn2" if SOC_SAMA7G54D1GN2
+	default "sama7g54d2g" if SOC_SAMA7G54D2G
+	default "sama7g54d2gn4" if SOC_SAMA7G54D2GN4
+	default "sama7g54d4g" if SOC_SAMA7G54D4G
-rsource "*/Kconfig.soc*"
+config SOC_SAMA7G54
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D1G
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D1GN0
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D1GN2
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D2G
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D2GN4
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D4G
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC
+	default "sama7g54" if SOC_SAMA7G54
+	default "sama7g54d1g" if SOC_SAMA7G54D1G
+	default "sama7g54d1gn0" if SOC_SAMA7G54D1GN0
+	default "sama7g54d1gn2" if SOC_SAMA7G54D1GN2
+	default "sama7g54d2g" if SOC_SAMA7G54D2G
+	default "sama7g54d2gn4" if SOC_SAMA7G54D2GN4
+	default "sama7g54d4g" if SOC_SAMA7G54D4G
diff --git a/soc/microchip/sam/sama7/sama7g5/sama7g54/Kconfig.soc b/soc/microchip/sam/sama7/sama7g5/sama7g54/Kconfig.soc
@@ -0,0 +1,41 @@
+# Copyright (C) 2025 Microchip Technology Inc. and its subsidiaries
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config SOC_SAMA7G54
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D1G
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D1GN0
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D1GN2
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D2G
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D2GN4
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC_SAMA7G54D4G
+	bool
+	select SOC_SERIES_SAMA7G5
+
+config SOC
+	default "sama7g54" if SOC_SAMA7G54
+	default "sama7g54d1g" if SOC_SAMA7G54D1G
+	default "sama7g54d1gn0" if SOC_SAMA7G54D1GN0
+	default "sama7g54d1gn2" if SOC_SAMA7G54D1GN2
+	default "sama7g54d2g" if SOC_SAMA7G54D2G
+	default "sama7g54d2gn4" if SOC_SAMA7G54D2GN4
+	default "sama7g54d4g" if SOC_SAMA7G54D4G
diff --git a/soc/microchip/sam/sama7g5/soc.c → soc/microchip/sam/sama7/sama7g5/soc.c b/soc/microchip/sam/sama7g5/soc.c → soc/microchip/sam/sama7/sama7g5/soc.c
diff --git a/soc/microchip/sam/sama7/sama7g5/soc.h b/soc/microchip/sam/sama7/sama7g5/soc.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Microchip Technology Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef SOC_MICROCHIP_SAMA7G5_SOC_H_
+#define SOC_MICROCHIP_SAMA7G5_SOC_H_
+
+#ifndef _ASMLANGUAGE
+
+#include <zephyr/types.h>
+
+#if defined(CONFIG_SOC_SAMA7G54)
+  #include <sama7g54.h>
+#elif defined(CONFIG_SOC_SAMA7G54D1G)
+  #include <sama7g54d1g.h>
+#elif defined(CONFIG_SOC_SAMA7G54D1GN0)
+  #include <sama7g54d1gn0.h>
+#elif defined(CONFIG_SOC_SAMA7G54D1GN2)
+  #include <sama7g54d1gn2.h>
+#elif defined(CONFIG_SOC_SAMA7G54D2G)
+  #include <sama7g54d2g.h>
+#elif defined(CONFIG_SOC_SAMA7G54D2GN4)
+  #include <sama7g54d2gn4.h>
+#elif defined(CONFIG_SOC_SAMA7G54D4G)
+  #include <sama7g54d4g.h>
+#else
+  #error Library does not support the specified device
+#endif
+
+#endif /* _ASMLANGUAGE */
+
+#endif /* SOC_MICROCHIP_SAMA7G5_SOC_H_ */
diff --git a/soc/microchip/sam/sama7/soc.yml b/soc/microchip/sam/sama7/soc.yml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Microchip Technology Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+family:
+- name: microchip_sama7
+  series:
+  - name: sama7g5
+    socs:
+    - name: sama7g54
+    - name: sama7g54d1g
+    - name: sama7g54d1gn0
+    - name: sama7g54d1gn2
+    - name: sama7g54d2g
+    - name: sama7g54d2gn4
+    - name: sama7g54d4g
diff --git a/soc/microchip/sam/sama7g5/Kconfig.soc.sama7g54 b/soc/microchip/sam/sama7g5/Kconfig.soc.sama7g54
diff --git a/soc/microchip/sam/sama7g5/soc.h b/soc/microchip/sam/sama7g5/soc.h
diff --git a/soc/microchip/sam/soc.yml b/soc/microchip/sam/soc.yml