diff --git a/arch/nios2/CMakeLists.txt b/arch/nios2/CMakeLists.txt
index babd8a2b9d0..ec9eb1ccec8 100644
--- a/arch/nios2/CMakeLists.txt
+++ b/arch/nios2/CMakeLists.txt
@@ -32,5 +32,4 @@ else()
 zephyr_cc_option(-mno-hw-div)
 endif()
 
-add_subdirectory(soc/${SOC_PATH})
 add_subdirectory(core)
diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index 38e338d0219..5daa04b3a86 100644
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -7,7 +7,7 @@
 choice
 	prompt "Nios II configuration selection"
 	depends on NIOS2
-	source "arch/nios2/soc/*/Kconfig.soc"
+	source "soc/nios2/*/Kconfig.soc"
 endchoice
 
 menu "Nios II Options"
@@ -17,7 +17,7 @@ menu "Nios II Options"
 # overriden (by defining symbols in multiple locations)
 #
 # (No SoC-specific Kconfig files as of writing, hence the optional source.)
-osource "arch/nios2/soc/*/Kconfig"
+osource "soc/nios2/*/Kconfig"
 
 config ARCH
 	string
diff --git a/boards/nios2/altera_max10/board.cmake b/boards/nios2/altera_max10/board.cmake
index f0e39d0ca1b..2c41da423e7 100644
--- a/boards/nios2/altera_max10/board.cmake
+++ b/boards/nios2/altera_max10/board.cmake
@@ -1,2 +1,2 @@
-board_runner_args(nios2 "--cpu-sof=${ZEPHYR_BASE}/arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sof")
+board_runner_args(nios2 "--cpu-sof=${ZEPHYR_BASE}/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof")
 include(${ZEPHYR_BASE}/boards/common/nios2.board.cmake)
diff --git a/boards/nios2/altera_max10/doc/board.rst b/boards/nios2/altera_max10/doc/board.rst
index 4980acd668d..0688b5b4471 100644
--- a/boards/nios2/altera_max10/doc/board.rst
+++ b/boards/nios2/altera_max10/doc/board.rst
@@ -94,11 +94,11 @@ Reference CPU
 =============
 
 A reference CPU design of a Nios II/f core is included in the Zephyr tree
-in the :file:`arch/nios2/soc/nios2f-zephyr/cpu` directory.
+in the :file:`soc/nios2/nios2f-zephyr/cpu` directory.
 
 Flash this CPU using the ``nios2-configure-sof`` SDK tool with the FPGA
 configuration file
-:file:`arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sof`:
+:file:`soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof`:
 
 .. code-block:: console
 
diff --git a/arch/nios2/soc/nios2-qemu/CMakeLists.txt b/soc/nios2/nios2-qemu/CMakeLists.txt
similarity index 100%
rename from arch/nios2/soc/nios2-qemu/CMakeLists.txt
rename to soc/nios2/nios2-qemu/CMakeLists.txt
diff --git a/arch/nios2/soc/nios2-qemu/Kconfig.defconfig b/soc/nios2/nios2-qemu/Kconfig.defconfig
similarity index 100%
rename from arch/nios2/soc/nios2-qemu/Kconfig.defconfig
rename to soc/nios2/nios2-qemu/Kconfig.defconfig
diff --git a/arch/nios2/soc/nios2-qemu/Kconfig.soc b/soc/nios2/nios2-qemu/Kconfig.soc
similarity index 100%
rename from arch/nios2/soc/nios2-qemu/Kconfig.soc
rename to soc/nios2/nios2-qemu/Kconfig.soc
diff --git a/arch/nios2/soc/nios2-qemu/dts.fixup b/soc/nios2/nios2-qemu/dts.fixup
similarity index 100%
rename from arch/nios2/soc/nios2-qemu/dts.fixup
rename to soc/nios2/nios2-qemu/dts.fixup
diff --git a/arch/nios2/soc/nios2-qemu/include/layout.h b/soc/nios2/nios2-qemu/include/layout.h
similarity index 100%
rename from arch/nios2/soc/nios2-qemu/include/layout.h
rename to soc/nios2/nios2-qemu/include/layout.h
diff --git a/arch/nios2/soc/nios2-qemu/include/linker.h b/soc/nios2/nios2-qemu/include/linker.h
similarity index 100%
rename from arch/nios2/soc/nios2-qemu/include/linker.h
rename to soc/nios2/nios2-qemu/include/linker.h
diff --git a/arch/nios2/soc/nios2-qemu/include/system.h b/soc/nios2/nios2-qemu/include/system.h
similarity index 100%
rename from arch/nios2/soc/nios2-qemu/include/system.h
rename to soc/nios2/nios2-qemu/include/system.h
diff --git a/arch/nios2/soc/nios2-qemu/linker.ld b/soc/nios2/nios2-qemu/linker.ld
similarity index 100%
rename from arch/nios2/soc/nios2-qemu/linker.ld
rename to soc/nios2/nios2-qemu/linker.ld
diff --git a/arch/nios2/soc/nios2f-zephyr/CMakeLists.txt b/soc/nios2/nios2f-zephyr/CMakeLists.txt
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/CMakeLists.txt
rename to soc/nios2/nios2f-zephyr/CMakeLists.txt
diff --git a/arch/nios2/soc/nios2f-zephyr/Kconfig.defconfig b/soc/nios2/nios2f-zephyr/Kconfig.defconfig
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/Kconfig.defconfig
rename to soc/nios2/nios2f-zephyr/Kconfig.defconfig
diff --git a/arch/nios2/soc/nios2f-zephyr/Kconfig.soc b/soc/nios2/nios2f-zephyr/Kconfig.soc
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/Kconfig.soc
rename to soc/nios2/nios2f-zephyr/Kconfig.soc
diff --git a/arch/nios2/soc/nios2f-zephyr/cpu/README b/soc/nios2/nios2f-zephyr/cpu/README
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/cpu/README
rename to soc/nios2/nios2f-zephyr/cpu/README
diff --git a/arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qpf b/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qpf
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qpf
rename to soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qpf
diff --git a/arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qsf b/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsf
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qsf
rename to soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsf
diff --git a/arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qsys b/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsys
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qsys
rename to soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsys
diff --git a/arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sof b/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sof
rename to soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof
diff --git a/arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sopcinfo b/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sopcinfo
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sopcinfo
rename to soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sopcinfo
diff --git a/arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da_top.v b/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da_top.v
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da_top.v
rename to soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da_top.v
diff --git a/arch/nios2/soc/nios2f-zephyr/cpu/ghrd_timing.sdc b/soc/nios2/nios2f-zephyr/cpu/ghrd_timing.sdc
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/cpu/ghrd_timing.sdc
rename to soc/nios2/nios2f-zephyr/cpu/ghrd_timing.sdc
diff --git a/arch/nios2/soc/nios2f-zephyr/dts.fixup b/soc/nios2/nios2f-zephyr/dts.fixup
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/dts.fixup
rename to soc/nios2/nios2f-zephyr/dts.fixup
diff --git a/arch/nios2/soc/nios2f-zephyr/include/layout.h b/soc/nios2/nios2f-zephyr/include/layout.h
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/include/layout.h
rename to soc/nios2/nios2f-zephyr/include/layout.h
diff --git a/arch/nios2/soc/nios2f-zephyr/include/linker.h b/soc/nios2/nios2f-zephyr/include/linker.h
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/include/linker.h
rename to soc/nios2/nios2f-zephyr/include/linker.h
diff --git a/arch/nios2/soc/nios2f-zephyr/include/system.h b/soc/nios2/nios2f-zephyr/include/system.h
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/include/system.h
rename to soc/nios2/nios2f-zephyr/include/system.h
diff --git a/arch/nios2/soc/nios2f-zephyr/linker.ld b/soc/nios2/nios2f-zephyr/linker.ld
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/linker.ld
rename to soc/nios2/nios2f-zephyr/linker.ld
diff --git a/arch/nios2/soc/nios2f-zephyr/soc.h b/soc/nios2/nios2f-zephyr/soc.h
similarity index 100%
rename from arch/nios2/soc/nios2f-zephyr/soc.h
rename to soc/nios2/nios2f-zephyr/soc.h