soc: microchip: sam: sama7: add sama7g54 (System-in-Package) SIP SoCs
Add SAMA7G5 series System-in-Package (SiP) MPUs to Kconfig.soc and
soc.yml, update the header files for them too.
Signed-off-by: Tony Han <tony.han@microchip.com>
diff --git a/soc/microchip/sam/sama7/sama7g5/Kconfig.soc b/soc/microchip/sam/sama7/sama7g5/Kconfig.soc
index 46fd219..1edf0d2 100644
--- a/soc/microchip/sam/sama7/sama7g5/Kconfig.soc
+++ b/soc/microchip/sam/sama7/sama7g5/Kconfig.soc
@@ -12,4 +12,39 @@
config SOC_SERIES
default "sama7g5" if SOC_SERIES_SAMA7G5
-rsource "Kconfig.soc.sam*"
+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/Kconfig.soc.sama7g54 b/soc/microchip/sam/sama7/sama7g5/Kconfig.soc.sama7g54
deleted file mode 100644
index 43568c5..0000000
--- a/soc/microchip/sam/sama7/sama7g5/Kconfig.soc.sama7g54
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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
- default "sama7g54" if SOC_SAMA7G54
diff --git a/soc/microchip/sam/sama7/sama7g5/soc.h b/soc/microchip/sam/sama7/sama7g5/soc.h
index 6e90018..76dd45c 100644
--- a/soc/microchip/sam/sama7/sama7g5/soc.h
+++ b/soc/microchip/sam/sama7/sama7g5/soc.h
@@ -7,11 +7,29 @@
#ifndef __SAMA7G5_SOC__H_
#define __SAMA7G5_SOC__H_
-#ifdef CONFIG_SOC_SAMA7G54
- #define __SAMA7G54__
+#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
-#include "sam.h"
+#endif /* _ASMLANGUAGE */
/* number of clocks registered */
#define SOC_NUM_CLOCK_PLL_FRAC 7
diff --git a/soc/microchip/sam/sama7/soc.yml b/soc/microchip/sam/sama7/soc.yml
index fe7450e..a408ab1 100644
--- a/soc/microchip/sam/sama7/soc.yml
+++ b/soc/microchip/sam/sama7/soc.yml
@@ -15,3 +15,9 @@
- name: sama7g5
socs:
- name: sama7g54
+ - name: sama7g54d1g
+ - name: sama7g54d1gn0
+ - name: sama7g54d1gn2
+ - name: sama7g54d2g
+ - name: sama7g54d2gn4
+ - name: sama7g54d4g
