From 384307e3dc56a8be628e2a9f8fa0da9edfacd614 Mon Sep 17 00:00:00 2001
From: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
Date: Wed, 24 Jan 2024 12:51:43 +0100
Subject: [PATCH] soc: x86: raptor_lake: move and convert to HWMv2

Move and convert soc/x86/raptor_lake to HWMv2

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
---
 soc/{x86 => v2/intel}/raptor_lake/CMakeLists.txt          | 2 ++
 .../Kconfig.soc => v2/intel/raptor_lake/Kconfig}          | 4 ++--
 soc/{x86 => v2/intel}/raptor_lake/Kconfig.defconfig       | 3 ---
 soc/v2/intel/raptor_lake/Kconfig.soc                      | 8 ++++++++
 .../intel}/raptor_lake/doc/supported_features.txt         | 0
 soc/{x86 => v2/intel}/raptor_lake/linker.ld               | 0
 soc/{x86 => v2/intel}/raptor_lake/soc.h                   | 0
 soc/v2/intel/raptor_lake/soc.yml                          | 4 ++++
 soc/{x86 => v2/intel}/raptor_lake/soc_gpio.h              | 0
 9 files changed, 16 insertions(+), 5 deletions(-)
 rename soc/{x86 => v2/intel}/raptor_lake/CMakeLists.txt (83%)
 rename soc/{x86/raptor_lake/Kconfig.soc => v2/intel/raptor_lake/Kconfig} (68%)
 rename soc/{x86 => v2/intel}/raptor_lake/Kconfig.defconfig (88%)
 create mode 100644 soc/v2/intel/raptor_lake/Kconfig.soc
 rename soc/{x86 => v2/intel}/raptor_lake/doc/supported_features.txt (100%)
 rename soc/{x86 => v2/intel}/raptor_lake/linker.ld (100%)
 rename soc/{x86 => v2/intel}/raptor_lake/soc.h (100%)
 create mode 100644 soc/v2/intel/raptor_lake/soc.yml
 rename soc/{x86 => v2/intel}/raptor_lake/soc_gpio.h (100%)

diff --git a/soc/x86/raptor_lake/CMakeLists.txt b/soc/v2/intel/raptor_lake/CMakeLists.txt
similarity index 83%
rename from soc/x86/raptor_lake/CMakeLists.txt
rename to soc/v2/intel/raptor_lake/CMakeLists.txt
index 06c46752f81..b3d7da79222 100644
--- a/soc/x86/raptor_lake/CMakeLists.txt
+++ b/soc/v2/intel/raptor_lake/CMakeLists.txt
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
+zephyr_include_directories(.)
+
 zephyr_cc_option(-march=goldmont)
 
 set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/x86/raptor_lake/Kconfig.soc b/soc/v2/intel/raptor_lake/Kconfig
similarity index 68%
rename from soc/x86/raptor_lake/Kconfig.soc
rename to soc/v2/intel/raptor_lake/Kconfig
index b172bc44869..96ead4ae034 100644
--- a/soc/x86/raptor_lake/Kconfig.soc
+++ b/soc/v2/intel/raptor_lake/Kconfig
@@ -1,9 +1,9 @@
-# Copyright (c) 2022 Intel Corporation Inc.
+# Copyright (c) 2022-2024 Intel Corporation Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_RAPTOR_LAKE
-	bool "Intel Raptor Lake Soc"
 	select X86
+	select X86_64
 	select CPU_ATOM
 	select PCIE
 	select PCIE_MSI
diff --git a/soc/x86/raptor_lake/Kconfig.defconfig b/soc/v2/intel/raptor_lake/Kconfig.defconfig
similarity index 88%
rename from soc/x86/raptor_lake/Kconfig.defconfig
rename to soc/v2/intel/raptor_lake/Kconfig.defconfig
index f9b14da95d0..35761581eec 100644
--- a/soc/x86/raptor_lake/Kconfig.defconfig
+++ b/soc/v2/intel/raptor_lake/Kconfig.defconfig
@@ -5,9 +5,6 @@
 
 if SOC_RAPTOR_LAKE
 
-config SOC
-	default "raptor_lake"
-
 config PCIE_MMIO_CFG
 	default y
 
diff --git a/soc/v2/intel/raptor_lake/Kconfig.soc b/soc/v2/intel/raptor_lake/Kconfig.soc
new file mode 100644
index 00000000000..9aa2d7ee5e2
--- /dev/null
+++ b/soc/v2/intel/raptor_lake/Kconfig.soc
@@ -0,0 +1,8 @@
+# Copyright (c) 2022-2024 Intel Corporation Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_RAPTOR_LAKE
+	bool
+
+config SOC
+	default "raptor_lake" if SOC_RAPTOR_LAKE
diff --git a/soc/x86/raptor_lake/doc/supported_features.txt b/soc/v2/intel/raptor_lake/doc/supported_features.txt
similarity index 100%
rename from soc/x86/raptor_lake/doc/supported_features.txt
rename to soc/v2/intel/raptor_lake/doc/supported_features.txt
diff --git a/soc/x86/raptor_lake/linker.ld b/soc/v2/intel/raptor_lake/linker.ld
similarity index 100%
rename from soc/x86/raptor_lake/linker.ld
rename to soc/v2/intel/raptor_lake/linker.ld
diff --git a/soc/x86/raptor_lake/soc.h b/soc/v2/intel/raptor_lake/soc.h
similarity index 100%
rename from soc/x86/raptor_lake/soc.h
rename to soc/v2/intel/raptor_lake/soc.h
diff --git a/soc/v2/intel/raptor_lake/soc.yml b/soc/v2/intel/raptor_lake/soc.yml
new file mode 100644
index 00000000000..66e1e391143
--- /dev/null
+++ b/soc/v2/intel/raptor_lake/soc.yml
@@ -0,0 +1,4 @@
+vendor: intel
+comment: "Intel Raptor Lake SoC"
+socs:
+- name: raptor_lake
diff --git a/soc/x86/raptor_lake/soc_gpio.h b/soc/v2/intel/raptor_lake/soc_gpio.h
similarity index 100%
rename from soc/x86/raptor_lake/soc_gpio.h
rename to soc/v2/intel/raptor_lake/soc_gpio.h