soc: smartbond: Port to HWMv2

Ports the smartbond SoC configuration to hardware model version 2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

drivers/clock_control/Kconfig.smartbond

@@ -5,6 +5,6 @@
 
 config CLOCK_CONTROL_SMARTBOND
 	bool "Smartbond Clock Control"
-	depends on SOC_FAMILY_SMARTBOND
+	depends on SOC_FAMILY_RENESAS_SMARTBOND
 	help
 	  Enable driver for Clock Control subsystem found in SmartBond

drivers/hwinfo/Kconfig

@@ -152,7 +152,7 @@ config HWINFO_SAM0
 config HWINFO_SMARTBOND
 	bool "Smartbond device reset cause"
 	default y
-	depends on SOC_FAMILY_SMARTBOND
+	depends on SOC_FAMILY_RENESAS_SMARTBOND
 	help
 	  Enable Smartbond reset cause hwinfo driver.
 

soc/renesas/smartbond/Kconfig

@@ -1,9 +1,8 @@
 # Copyright (c) 2022 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_DA14699
+if SOC_FAMILY_RENESAS_SMARTBOND
 
-config SOC
-	default "da14699"
+rsource "*/Kconfig"
 
-endif # SOC_DA14699
+endif # SOC_FAMILY_RENESAS_SMARTBOND

soc/renesas/smartbond/Kconfig.defconfig

@@ -0,0 +1,11 @@
+# Copyright (c) 2022 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_FAMILY_RENESAS_SMARTBOND
+
+rsource "*/Kconfig.defconfig"
+
+config PINCTRL
+	default y
+
+endif # SOC_FAMILY_RENESAS_SMARTBOND

soc/renesas/smartbond/Kconfig.soc

@@ -0,0 +1,10 @@
+# Copyright (c) 2022 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_FAMILY_RENESAS_SMARTBOND
+	bool
+
+config SOC_FAMILY
+	default "renesas_smartbond" if SOC_FAMILY_RENESAS_SMARTBOND
+
+rsource "*/Kconfig.soc"

soc/renesas/smartbond/da1469x/CMakeLists.txt

@@ -7,5 +7,6 @@ zephyr_linker_sources(
 )
 zephyr_library()
 zephyr_library_sources(soc.c)
+zephyr_include_directories(.)
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

soc/renesas/smartbond/da1469x/Kconfig

@@ -2,16 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_DA1469X
-	bool "Renesas SmartBond(tm) DA1469x series MCU"
 	select ARM
 	select CPU_CORTEX_M33
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select ARMV8_M_DSP
-	select SOC_FAMILY_SMARTBOND
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select CLOCK_CONTROL
 	select CLOCK_CONTROL_SMARTBOND
-	help
-	  Enable support for Renesas SmartBond(tm) DA1469x MCU series

soc/renesas/smartbond/da1469x/Kconfig.defconfig

@@ -3,11 +3,6 @@
 
 if SOC_SERIES_DA1469X
 
-source "soc/soc_legacy/arm/renesas_smartbond/da1469x/Kconfig.defconfig.da1469*"
-
-config SOC_SERIES
-	default "da1469x"
-
 config NUM_IRQS
 	default 40
 

soc/renesas/smartbond/da1469x/Kconfig.soc

@@ -0,0 +1,27 @@
+# Copyright (c) 2022 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_DA1469X
+	bool
+	select SOC_FAMILY_RENESAS_SMARTBOND
+	help
+	  Renesas SmartBond(tm) DA1469x series MCU
+
+config SOC_DA14695
+	bool
+	select SOC_SERIES_DA1469X
+	help
+	  DA14695
+
+config SOC_DA14699
+	bool
+	select SOC_SERIES_DA1469X
+	help
+	  DA14699
+
+config SOC_SERIES
+	default "da1469x" if SOC_SERIES_DA1469X
+
+config SOC
+	default "da14695" if SOC_DA14695
+	default "da14699" if SOC_DA14699

soc/renesas/smartbond/soc.yml

@@ -0,0 +1,7 @@
+family:
+  - name: renesas_smartbond
+    series:
+      - name: da1469x
+        socs:
+          - name: da14695
+          - name: da14699

soc/soc_legacy/arm/renesas_smartbond/Kconfig

@@ -1,19 +0,0 @@
-# Copyright (c) 2022 Renesas Electronics Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_FAMILY_SMARTBOND
-	bool
-	select ARM
-	select CPU_CORTEX_M33
-	select CPU_HAS_FPU
-	select CPU_HAS_ARM_MPU
-	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
-
-if SOC_FAMILY_SMARTBOND
-config SOC_FAMILY
-	string
-	default "renesas_smartbond"
-
-source "soc/soc_legacy/arm/renesas_smartbond/*/Kconfig.soc"
-
-endif # SOC_FAMILY_SMARTBOND

soc/soc_legacy/arm/renesas_smartbond/Kconfig.defconfig

@@ -1,11 +0,0 @@
-# Copyright (c) 2022 Renesas Electronics Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_FAMILY_SMARTBOND
-
-source "soc/soc_legacy/arm/renesas_smartbond/*/Kconfig.defconfig.series"
-
-config PINCTRL
-	default y
-
-endif # SOC_FAMILY_SMARTBOND

soc/soc_legacy/arm/renesas_smartbond/Kconfig.soc

@@ -1,4 +0,0 @@
-# Copyright (c) 2022 Renesas Electronics Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-source "soc/soc_legacy/arm/renesas_smartbond/*/Kconfig.series"

soc/soc_legacy/arm/renesas_smartbond/da1469x/Kconfig.defconfig.da14695

@@ -1,9 +0,0 @@
-# Copyright (c) 2023 Renesas Electronics Corporation and/or its affiliates
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_DA14695
-
-config SOC
-	default "da14695"
-
-endif # SOC_DA14695

soc/soc_legacy/arm/renesas_smartbond/da1469x/Kconfig.soc

@@ -1,14 +0,0 @@
-# Copyright (c) 2022-2023 Renesas Electronics Corporation and/or its affiliates
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-	prompt "Renesas SmartBond(tm) DA1469x MCU selection"
-	depends on SOC_SERIES_DA1469X
-
-config SOC_DA14699
-	bool "DA14699"
-
-config SOC_DA14695
-	bool "DA14695"
-
-endchoice