soc: microchip: sam: reorganize directory structure for sama7g5 series #97515

TonyHan11 · 2025-10-14T06:35:01Z

Update directory structure with following hierarchy for MPU devices:

  Product Architecture
    |__ SOC Series
          |__ Product Group

Add SAMA7G5 series System-in-Package (SiP) MPUs
Update makefiles, Kconfig symbols and header files accordingly

NhMchp · 2025-10-14T07:10:19Z

@TonyHan11, Compliance and twister are failing

soc/microchip/sam/sama7/Kconfig

ArunMCHP · 2025-10-14T09:23:54Z

soc/microchip/sam/sama7/Kconfig

 #

-config SOC_SERIES_SAMA7G5
+config SOC_ARCH_SAMA7


Suggested change

config SOC_ARCH_SAMA7

config SOC_FAMILY_MICROCHIP_SAMA7

ArunMCHP · 2025-10-14T09:26:03Z

soc/microchip/sam/sama7/sama7g5/CMakeLists.txt

 zephyr_sources(soc.c)
 zephyr_include_directories(.)

+add_subdirectory(../../common ${CMAKE_BINARY_DIR}/common)


This common folder can be renamed to appropriate name ((e.g,) mpu-clock), since it is not common for MCU families under soc/microchip/sam.

ArunMCHP · 2025-10-14T09:27:33Z

soc/microchip/sam/sama7/sama7g5/Kconfig

 config SOC_SERIES_SAMA7G5
 	bool
-	select SOC_FAMILY_MICROCHIP_SAM
+	select SOC_ARCH_SAMA7


Suggested change

select SOC_ARCH_SAMA7

select SOC_FAMILY_MICROCHIP_SAMA7

ArunMCHP · 2025-10-14T09:30:09Z

soc/microchip/sam/sama7/sama7g5/soc.yml

+# SPDX-License-Identifier: Apache-2.0
+
+family:
+- name: microchip_sam


Move soc.yml under sama7 directory.
soc/microchip/sam/sama7/soc.yml

ArunMCHP · 2025-10-14T09:30:29Z

soc/microchip/sam/sama7/sama7g5/soc.yml

+# SPDX-License-Identifier: Apache-2.0
+
+family:
+- name: microchip_sam


Suggested change

- name: microchip_sam

- name: microchip_sama7

Updated, thanks.

ArunMCHP · 2025-10-14T09:32:29Z

soc/microchip/sam/sama7/sama7g5/CMakeLists.txt

 zephyr_include_directories(.)

+add_subdirectory(../../common ${CMAKE_BINARY_DIR}/common)
+zephyr_include_directories(../../common)


Rename common folder

ArunMCHP · 2025-10-14T09:37:53Z

soc/microchip/sam/sama7/Kconfig

@@ -1,10 +1,12 @@
 # Copyright (C) 2025 Microchip Technology Inc. and its subsidiaries
 #
 # SPDX-License-Identifier: Apache-2.0


Add Kconfig.soc file under soc/microhcip/sam/sama7 directory and create symbol SOC_FAMILY_MICROCHIP_SAMA7, Then this symbol can be selected by all sama7 series SoCs

config SOC_FAMILY_MICROCHIP_SAMA7 bool config SOC_FAMILY default "microchip_sama7" if SOC_FAMILY_MICROCHIP_SAMA7

nordicjm

See changes in #97533 and fix PR

Rename soc/microchip/sam/common to soc/microchip/sam/mpu_clock Replace 'common' to 'mpu_clock' in soc/microchip/sam/CMakeLists.txt Signed-off-by: Tony Han <[email protected]>

Update directory structure with following hierarchy for MPU devices: Product Architecture |__ SOC Series |__ Product Group Add SAMA7G5 series System-in-Package (SiP) MPUs. Update makefiles, Kconfig symbols and header files accordingly. Signed-off-by: Tony Han <[email protected]>

sonarqubecloud · 2025-10-15T06:31:30Z

Quality Gate passed

Issues
8 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

TonyHan11 · 2025-10-15T07:03:17Z

Hi @JarmouniA, @ArunMCHP, @nordicjm,

Thank you for your comments. Commits updated with the following changes:

replace SOC_ARCH_SAMA7 with SOC_FAMILY_MICROCHIP_SAMA7
rename the folder soc/microchip/sam/common with soc/microchip/sam/mpu_clock
move soc.yml from soc/microchip/sam/sama7/sama7g5 to soc/microchip/sam/sama7
update the Kconfig and makefiles accordingly

ArunMCHP · 2025-10-15T09:44:12Z

soc/microchip/sam/sama7/sama7g5/Kconfig.soc

 	default "sama7g5" if SOC_SERIES_SAMA7G5

-rsource "Kconfig.soc.sam*"
+rsource "*/Kconfig.soc*"


Suggested change

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

ArunMCHP · 2025-10-15T09:46:08Z

soc/microchip/sam/sama7/sama7g5/sama7g54/Kconfig.soc

@@ -0,0 +1,41 @@
+# Copyright (C) 2025 Microchip Technology Inc. and its subsidiaries


You can remove this file and folder by adding these contents in sama7/sama7g5/Kconfig.soc

NhMchp

'mpu_clock' directory inside 'soc/microchip/sam' doesn't seems to be the correct approach. You should consider moving it to the clock driver. Another point is, the directory also has pinctrl files. So the name 'mpu_clock' also in incorrect. If other reviewers agree to keep this content, you can consider a new name 'mpu_common'.

JarmouniA · 2025-10-15T11:13:26Z

you can consider a new name 'mpu_common'.

Or just leave the original name, common.

zephyrbot added platform: Microchip SAM Microchip SAM Platform (formerly Atmel SAM) area: Boards/SoCs labels Oct 14, 2025

zephyrbot requested review from nandojve, pdgendt and stephanosio October 14, 2025 06:36

zephyrbot assigned nandojve Oct 14, 2025

NhMchp requested review from ArunMCHP and NhMchp October 14, 2025 07:08

NhMchp added this to the v4.3.0 milestone Oct 14, 2025

JarmouniA reviewed Oct 14, 2025

View reviewed changes

soc/microchip/sam/sama7/Kconfig Outdated Show resolved Hide resolved

JarmouniA requested a review from nordicjm October 14, 2025 09:19

ArunMCHP reviewed Oct 14, 2025

View reviewed changes

ArunMCHP suggested changes Oct 14, 2025

View reviewed changes

nordicjm requested changes Oct 14, 2025

View reviewed changes

soc: microchip: sam: rename the folder for mpu clocks

fdb09e5

Rename soc/microchip/sam/common to soc/microchip/sam/mpu_clock Replace 'common' to 'mpu_clock' in soc/microchip/sam/CMakeLists.txt Signed-off-by: Tony Han <[email protected]>

TonyHan11 force-pushed the sama7g5_reorg branch from 8f6bca9 to 879db8c Compare October 15, 2025 05:56

TonyHan11 force-pushed the sama7g5_reorg branch from 879db8c to 1ce3802 Compare October 15, 2025 05:59

ArunMCHP reviewed Oct 15, 2025

View reviewed changes

NhMchp reviewed Oct 15, 2025

View reviewed changes

-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

		@@ -0,0 +1,41 @@
		# Copyright (C) 2025 Microchip Technology Inc. and its subsidiaries

soc: microchip: sam: reorganize directory structure for sama7g5 series #97515

Are you sure you want to change the base?

soc: microchip: sam: reorganize directory structure for sama7g5 series #97515

Conversation

TonyHan11 commented Oct 14, 2025

Uh oh!

NhMchp commented Oct 14, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nordicjm left a comment

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Oct 15, 2025

Quality Gate passed

Uh oh!

TonyHan11 commented Oct 15, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NhMchp left a comment

Choose a reason for hiding this comment

Uh oh!

JarmouniA commented Oct 15, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants