From 8eeb5c992e832e7b0db041ad338588649ab06741 Mon Sep 17 00:00:00 2001
From: Carlo Caione <ccaione@baylibre.com>
Date: Fri, 9 Jun 2023 10:40:43 +0200
Subject: [PATCH] riscv: Move directory to *-privileged

Because the spec is "privileged" not "privilege".

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
---
 CODEOWNERS                                                | 8 ++++----
 MAINTAINERS.yml                                           | 2 +-
 include/zephyr/arch/riscv/arch.h                          | 2 +-
 .../{riscv-privilege => riscv-privileged}/asm_inline.h    | 2 +-
 .../asm_inline_gcc.h                                      | 0
 soc/riscv/litex-vexriscv/CMakeLists.txt                   | 4 ++--
 soc/riscv/litex-vexriscv/soc.h                            | 2 +-
 .../{riscv-privilege => riscv-privileged}/CMakeLists.txt  | 0
 soc/riscv/{riscv-privilege => riscv-privileged}/Kconfig   | 4 ++--
 .../Kconfig.defconfig                                     | 2 +-
 .../{riscv-privilege => riscv-privileged}/Kconfig.soc     | 2 +-
 .../andes_v5/CMakeLists.txt                               | 0
 .../andes_v5/Kconfig.defconfig.ae350                      | 0
 .../andes_v5/Kconfig.defconfig.series                     | 2 +-
 .../andes_v5/Kconfig.series                               | 0
 .../andes_v5/Kconfig.soc                                  | 0
 .../andes_v5/ae350/linker.ld                              | 0
 .../andes_v5/ae350/soc.h                                  | 0
 .../andes_v5/l2_cache.c                                   | 0
 .../andes_v5/linker.ld                                    | 0
 .../{riscv-privilege => riscv-privileged}/andes_v5/pma.c  | 0
 .../andes_v5/soc_context.h                                | 0
 .../andes_v5/soc_irq.S                                    | 0
 .../andes_v5/soc_offsets.h                                | 0
 .../andes_v5/soc_v5.h                                     | 0
 .../andes_v5/start.S                                      | 0
 .../common/CMakeLists.txt                                 | 0
 .../{riscv-privilege => riscv-privileged}/common/idle.c   | 0
 .../common/nuclei/nuclei_csr.h                            | 0
 .../common/soc_common.h                                   | 0
 .../common/soc_common_irq.c                               | 0
 .../common/soc_irq.S                                      | 0
 .../{riscv-privilege => riscv-privileged}/common/vector.S | 0
 .../gd32vf103/CMakeLists.txt                              | 0
 .../gd32vf103/Kconfig.defconfig.gd32vf103                 | 0
 .../gd32vf103/Kconfig.defconfig.series                    | 2 +-
 .../gd32vf103/Kconfig.series                              | 0
 .../gd32vf103/Kconfig.soc                                 | 0
 .../gd32vf103/entry.S                                     | 0
 .../gd32vf103/gd32_regs.h                                 | 0
 .../gd32vf103/linker.ld                                   | 0
 .../gd32vf103/pinctrl_soc.h                               | 0
 .../{riscv-privilege => riscv-privileged}/gd32vf103/soc.c | 0
 .../{riscv-privilege => riscv-privileged}/gd32vf103/soc.h | 0
 .../miv/CMakeLists.txt                                    | 0
 .../miv/Kconfig.defconfig.series                          | 0
 .../miv/Kconfig.series                                    | 0
 .../{riscv-privilege => riscv-privileged}/miv/Kconfig.soc | 0
 .../{riscv-privilege => riscv-privileged}/miv/linker.ld   | 0
 soc/riscv/{riscv-privilege => riscv-privileged}/miv/soc.h | 0
 .../mpfs/CMakeLists.txt                                   | 0
 .../mpfs/Kconfig.defconfig.series                         | 0
 .../mpfs/Kconfig.series                                   | 0
 .../mpfs/Kconfig.soc                                      | 0
 .../{riscv-privilege => riscv-privileged}/mpfs/linker.ld  | 0
 .../{riscv-privilege => riscv-privileged}/mpfs/soc.h      | 0
 .../neorv32/CMakeLists.txt                                | 0
 .../neorv32/Kconfig.defconfig.series                      | 0
 .../neorv32/Kconfig.series                                | 0
 .../neorv32/Kconfig.soc                                   | 0
 .../neorv32/linker.ld                                     | 0
 .../{riscv-privilege => riscv-privileged}/neorv32/reset.S | 0
 .../{riscv-privilege => riscv-privileged}/neorv32/soc.c   | 0
 .../{riscv-privilege => riscv-privileged}/neorv32/soc.h   | 0
 .../neorv32/soc_irq.S                                     | 0
 .../niosv/CMakeLists.txt                                  | 0
 .../niosv/Kconfig.defconfig.series                        | 0
 .../niosv/Kconfig.series                                  | 0
 .../niosv/Kconfig.soc                                     | 0
 .../{riscv-privilege => riscv-privileged}/niosv/linker.ld | 0
 .../{riscv-privilege => riscv-privileged}/niosv/soc.h     | 0
 .../opentitan/CMakeLists.txt                              | 0
 .../opentitan/Kconfig.defconfig.series                    | 0
 .../opentitan/Kconfig.series                              | 0
 .../opentitan/Kconfig.soc                                 | 0
 .../opentitan/linker.ld                                   | 0
 .../opentitan/rom_header.S                                | 0
 .../opentitan/rom_header.ld                               | 0
 .../{riscv-privilege => riscv-privileged}/opentitan/soc.c | 0
 .../{riscv-privilege => riscv-privileged}/opentitan/soc.h | 0
 .../sifive-freedom/CMakeLists.txt                         | 0
 .../sifive-freedom/Kconfig.defconfig.series               | 0
 .../sifive-freedom/Kconfig.series                         | 0
 .../sifive-freedom/Kconfig.soc                            | 0
 .../sifive-freedom/fe310_clock.c                          | 0
 .../sifive-freedom/fe310_prci.h                           | 0
 .../sifive-freedom/fu540_clock.c                          | 0
 .../sifive-freedom/fu540_prci.h                           | 0
 .../sifive-freedom/fu740_clock.c                          | 0
 .../sifive-freedom/fu740_prci.h                           | 0
 .../sifive-freedom/linker.ld                              | 0
 .../sifive-freedom/pinctrl_soc.h                          | 0
 .../sifive-freedom/soc.h                                  | 0
 .../starfive_jh71xx/CMakeLists.txt                        | 0
 .../starfive_jh71xx/Kconfig.defconfig.series              | 0
 .../starfive_jh71xx/Kconfig.series                        | 0
 .../starfive_jh71xx/Kconfig.soc                           | 0
 .../starfive_jh71xx/linker.ld                             | 0
 .../starfive_jh71xx/soc.h                                 | 0
 .../telink_b91/CMakeLists.txt                             | 0
 .../telink_b91/Kconfig.defconfig.series                   | 0
 .../telink_b91/Kconfig.series                             | 0
 .../telink_b91/Kconfig.soc                                | 0
 .../telink_b91/init.ld                                    | 0
 .../telink_b91/linker.ld                                  | 0
 .../telink_b91/pinctrl_soc.h                              | 0
 .../telink_b91/soc.c                                      | 0
 .../telink_b91/soc.h                                      | 0
 .../telink_b91/soc_context.h                              | 0
 .../telink_b91/soc_irq.S                                  | 0
 .../telink_b91/soc_offsets.h                              | 0
 .../telink_b91/start.S                                    | 0
 .../virt/CMakeLists.txt                                   | 0
 .../virt/Kconfig.defconfig.series                         | 0
 .../virt/Kconfig.series                                   | 0
 .../virt/Kconfig.soc                                      | 0
 .../{riscv-privilege => riscv-privileged}/virt/linker.ld  | 0
 .../{riscv-privilege => riscv-privileged}/virt/soc.c      | 0
 .../{riscv-privilege => riscv-privileged}/virt/soc.h      | 0
 119 files changed, 16 insertions(+), 16 deletions(-)
 rename include/zephyr/arch/riscv/{riscv-privilege => riscv-privileged}/asm_inline.h (89%)
 rename include/zephyr/arch/riscv/{riscv-privilege => riscv-privileged}/asm_inline_gcc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/Kconfig (92%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/Kconfig.defconfig (73%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/Kconfig.soc (76%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/Kconfig.defconfig.ae350 (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/Kconfig.defconfig.series (92%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/ae350/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/ae350/soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/l2_cache.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/pma.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/soc_context.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/soc_irq.S (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/soc_offsets.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/soc_v5.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/andes_v5/start.S (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/common/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/common/idle.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/common/nuclei/nuclei_csr.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/common/soc_common.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/common/soc_common_irq.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/common/soc_irq.S (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/common/vector.S (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/Kconfig.defconfig.gd32vf103 (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/Kconfig.defconfig.series (72%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/entry.S (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/gd32_regs.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/pinctrl_soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/soc.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/gd32vf103/soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/miv/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/miv/Kconfig.defconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/miv/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/miv/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/miv/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/miv/soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/mpfs/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/mpfs/Kconfig.defconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/mpfs/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/mpfs/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/mpfs/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/mpfs/soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/neorv32/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/neorv32/Kconfig.defconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/neorv32/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/neorv32/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/neorv32/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/neorv32/reset.S (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/neorv32/soc.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/neorv32/soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/neorv32/soc_irq.S (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/niosv/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/niosv/Kconfig.defconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/niosv/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/niosv/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/niosv/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/niosv/soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/opentitan/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/opentitan/Kconfig.defconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/opentitan/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/opentitan/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/opentitan/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/opentitan/rom_header.S (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/opentitan/rom_header.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/opentitan/soc.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/opentitan/soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/Kconfig.defconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/fe310_clock.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/fe310_prci.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/fu540_clock.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/fu540_prci.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/fu740_clock.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/fu740_prci.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/pinctrl_soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/sifive-freedom/soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/starfive_jh71xx/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/starfive_jh71xx/Kconfig.defconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/starfive_jh71xx/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/starfive_jh71xx/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/starfive_jh71xx/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/starfive_jh71xx/soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/Kconfig.defconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/init.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/pinctrl_soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/soc.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/soc.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/soc_context.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/soc_irq.S (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/soc_offsets.h (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/telink_b91/start.S (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/virt/CMakeLists.txt (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/virt/Kconfig.defconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/virt/Kconfig.series (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/virt/Kconfig.soc (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/virt/linker.ld (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/virt/soc.c (100%)
 rename soc/riscv/{riscv-privilege => riscv-privileged}/virt/soc.h (100%)

diff --git a/CODEOWNERS b/CODEOWNERS
index 7da0fe19cdc..2cc376dc5f0 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -80,10 +80,10 @@
 /soc/posix/                               @aescolar @daor-oti
 /soc/riscv/                               @kgugala @pgielda
 /soc/riscv/openisa*/                      @dleach02
-/soc/riscv/riscv-privilege/andes_v5/      @cwshu @kevinwang821020 @jimmyzhe
-/soc/riscv/riscv-privilege/neorv32/       @henrikbrixandersen
-/soc/riscv/riscv-privilege/gd32vf103/     @soburi
-/soc/riscv/riscv-privilege/niosv/         @sweeaun
+/soc/riscv/riscv-privileged/andes_v5/      @cwshu @kevinwang821020 @jimmyzhe
+/soc/riscv/riscv-privileged/neorv32/       @henrikbrixandersen
+/soc/riscv/riscv-privileged/gd32vf103/     @soburi
+/soc/riscv/riscv-privileged/niosv/         @sweeaun
 /soc/x86/                                 @dcpleung @nashif @aasthagr
 /arch/xtensa/                             @dcpleung @andyross @nashif
 /soc/xtensa/                              @dcpleung @andyross @nashif
diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index bb68a4cc3ab..254908afffb 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -2106,7 +2106,7 @@ GD32 Platforms:
     - dts/*/gigadevice/
     - dts/bindings/*/*gd32*
     - soc/arm/gigadevice/
-    - soc/riscv/riscv-privilege/gd32vf103/
+    - soc/riscv/riscv-privileged/gd32vf103/
     - scripts/west_commands/*/*gd32*
   labels:
     - "platform: GD32"
diff --git a/include/zephyr/arch/riscv/arch.h b/include/zephyr/arch/riscv/arch.h
index 7bc1d8bc49a..29f854f3ff8 100644
--- a/include/zephyr/arch/riscv/arch.h
+++ b/include/zephyr/arch/riscv/arch.h
@@ -301,7 +301,7 @@ static inline uint64_t arch_k_cycle_get_64(void)
 #endif /*_ASMLANGUAGE */
 
 #if defined(CONFIG_SOC_FAMILY_RISCV_PRIVILEGED)
-#include <zephyr/arch/riscv/riscv-privilege/asm_inline.h>
+#include <zephyr/arch/riscv/riscv-privileged/asm_inline.h>
 #endif
 
 
diff --git a/include/zephyr/arch/riscv/riscv-privilege/asm_inline.h b/include/zephyr/arch/riscv/riscv-privileged/asm_inline.h
similarity index 89%
rename from include/zephyr/arch/riscv/riscv-privilege/asm_inline.h
rename to include/zephyr/arch/riscv/riscv-privileged/asm_inline.h
index 106054b649a..6ba9f9fb966 100644
--- a/include/zephyr/arch/riscv/riscv-privilege/asm_inline.h
+++ b/include/zephyr/arch/riscv/riscv-privileged/asm_inline.h
@@ -14,7 +14,7 @@
  */
 
 #if defined(__GNUC__)
-#include <zephyr/arch/riscv/riscv-privilege/asm_inline_gcc.h>
+#include <zephyr/arch/riscv/riscv-privileged/asm_inline_gcc.h>
 #else
 #error "Supports only GNU C compiler"
 #endif
diff --git a/include/zephyr/arch/riscv/riscv-privilege/asm_inline_gcc.h b/include/zephyr/arch/riscv/riscv-privileged/asm_inline_gcc.h
similarity index 100%
rename from include/zephyr/arch/riscv/riscv-privilege/asm_inline_gcc.h
rename to include/zephyr/arch/riscv/riscv-privileged/asm_inline_gcc.h
diff --git a/soc/riscv/litex-vexriscv/CMakeLists.txt b/soc/riscv/litex-vexriscv/CMakeLists.txt
index 3be6a867a67..34d6046ab68 100644
--- a/soc/riscv/litex-vexriscv/CMakeLists.txt
+++ b/soc/riscv/litex-vexriscv/CMakeLists.txt
@@ -5,6 +5,6 @@
 #
 
 zephyr_sources(
-    ../riscv-privilege/common/soc_irq.S
-    ../riscv-privilege/common/vector.S
+    ../riscv-privileged/common/soc_irq.S
+    ../riscv-privileged/common/vector.S
 )
diff --git a/soc/riscv/litex-vexriscv/soc.h b/soc/riscv/litex-vexriscv/soc.h
index 6f80ba07f8a..d9b1f19c46f 100644
--- a/soc/riscv/litex-vexriscv/soc.h
+++ b/soc/riscv/litex-vexriscv/soc.h
@@ -7,7 +7,7 @@
 #ifndef __RISCV32_LITEX_VEXRISCV_SOC_H_
 #define __RISCV32_LITEX_VEXRISCV_SOC_H_
 
-#include "../riscv-privilege/common/soc_common.h"
+#include "../riscv-privileged/common/soc_common.h"
 #include <zephyr/devicetree.h>
 #include <zephyr/arch/common/sys_io.h>
 
diff --git a/soc/riscv/riscv-privilege/CMakeLists.txt b/soc/riscv/riscv-privileged/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/CMakeLists.txt
rename to soc/riscv/riscv-privileged/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/Kconfig b/soc/riscv/riscv-privileged/Kconfig
similarity index 92%
rename from soc/riscv/riscv-privilege/Kconfig
rename to soc/riscv/riscv-privileged/Kconfig
index 151b9690e3d..9d3b9f4a356 100644
--- a/soc/riscv/riscv-privilege/Kconfig
+++ b/soc/riscv/riscv-privileged/Kconfig
@@ -13,7 +13,7 @@ config SOC_FAMILY_RISCV_PRIVILEGED
 
 config SOC_FAMILY
 	string
-	default "riscv-privilege"
+	default "riscv-privileged"
 	depends on SOC_FAMILY_RISCV_PRIVILEGED
 
 config RISCV_HAS_PLIC
@@ -34,4 +34,4 @@ config RISCV_MTVEC_VECTORED_MODE
 	help
 	  Should the SOC use mtvec in vectored mode
 
-source "soc/riscv/riscv-privilege/*/Kconfig.soc"
+source "soc/riscv/riscv-privileged/*/Kconfig.soc"
diff --git a/soc/riscv/riscv-privilege/Kconfig.defconfig b/soc/riscv/riscv-privileged/Kconfig.defconfig
similarity index 73%
rename from soc/riscv/riscv-privilege/Kconfig.defconfig
rename to soc/riscv/riscv-privileged/Kconfig.defconfig
index d8815302bef..6793d72a385 100644
--- a/soc/riscv/riscv-privilege/Kconfig.defconfig
+++ b/soc/riscv/riscv-privileged/Kconfig.defconfig
@@ -3,4 +3,4 @@
 # Copyright (c) 2017 Jean-Paul Etienne <fractalclone@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
-source "soc/riscv/riscv-privilege/*/Kconfig.defconfig.series"
+source "soc/riscv/riscv-privileged/*/Kconfig.defconfig.series"
diff --git a/soc/riscv/riscv-privilege/Kconfig.soc b/soc/riscv/riscv-privileged/Kconfig.soc
similarity index 76%
rename from soc/riscv/riscv-privilege/Kconfig.soc
rename to soc/riscv/riscv-privileged/Kconfig.soc
index 5d0bad94b6a..14d141223e0 100644
--- a/soc/riscv/riscv-privilege/Kconfig.soc
+++ b/soc/riscv/riscv-privileged/Kconfig.soc
@@ -3,4 +3,4 @@
 # Copyright (c) 2017 Jean-Paul Etienne <fractalclone@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
-source "soc/riscv/riscv-privilege/*/Kconfig.series"
+source "soc/riscv/riscv-privileged/*/Kconfig.series"
diff --git a/soc/riscv/riscv-privilege/andes_v5/CMakeLists.txt b/soc/riscv/riscv-privileged/andes_v5/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/CMakeLists.txt
rename to soc/riscv/riscv-privileged/andes_v5/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/andes_v5/Kconfig.defconfig.ae350 b/soc/riscv/riscv-privileged/andes_v5/Kconfig.defconfig.ae350
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/Kconfig.defconfig.ae350
rename to soc/riscv/riscv-privileged/andes_v5/Kconfig.defconfig.ae350
diff --git a/soc/riscv/riscv-privilege/andes_v5/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/andes_v5/Kconfig.defconfig.series
similarity index 92%
rename from soc/riscv/riscv-privilege/andes_v5/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/andes_v5/Kconfig.defconfig.series
index 043f008320b..c6436807825 100644
--- a/soc/riscv/riscv-privilege/andes_v5/Kconfig.defconfig.series
+++ b/soc/riscv/riscv-privileged/andes_v5/Kconfig.defconfig.series
@@ -6,7 +6,7 @@ if SOC_SERIES_RISCV_ANDES_V5
 # Kconfig picks the first default with a satisfied condition.
 # SoC defaults should be parsed before SoC Series defaults, because SoCs usually
 # overrides SoC Series values.
-source "soc/riscv/riscv-privilege/andes_v5/Kconfig.defconfig.ae*"
+source "soc/riscv/riscv-privileged/andes_v5/Kconfig.defconfig.ae*"
 
 config SOC_SERIES
 	default "andes_v5"
diff --git a/soc/riscv/riscv-privilege/andes_v5/Kconfig.series b/soc/riscv/riscv-privileged/andes_v5/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/Kconfig.series
rename to soc/riscv/riscv-privileged/andes_v5/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/andes_v5/Kconfig.soc b/soc/riscv/riscv-privileged/andes_v5/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/Kconfig.soc
rename to soc/riscv/riscv-privileged/andes_v5/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/andes_v5/ae350/linker.ld b/soc/riscv/riscv-privileged/andes_v5/ae350/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/ae350/linker.ld
rename to soc/riscv/riscv-privileged/andes_v5/ae350/linker.ld
diff --git a/soc/riscv/riscv-privilege/andes_v5/ae350/soc.h b/soc/riscv/riscv-privileged/andes_v5/ae350/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/ae350/soc.h
rename to soc/riscv/riscv-privileged/andes_v5/ae350/soc.h
diff --git a/soc/riscv/riscv-privilege/andes_v5/l2_cache.c b/soc/riscv/riscv-privileged/andes_v5/l2_cache.c
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/l2_cache.c
rename to soc/riscv/riscv-privileged/andes_v5/l2_cache.c
diff --git a/soc/riscv/riscv-privilege/andes_v5/linker.ld b/soc/riscv/riscv-privileged/andes_v5/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/linker.ld
rename to soc/riscv/riscv-privileged/andes_v5/linker.ld
diff --git a/soc/riscv/riscv-privilege/andes_v5/pma.c b/soc/riscv/riscv-privileged/andes_v5/pma.c
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/pma.c
rename to soc/riscv/riscv-privileged/andes_v5/pma.c
diff --git a/soc/riscv/riscv-privilege/andes_v5/soc_context.h b/soc/riscv/riscv-privileged/andes_v5/soc_context.h
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/soc_context.h
rename to soc/riscv/riscv-privileged/andes_v5/soc_context.h
diff --git a/soc/riscv/riscv-privilege/andes_v5/soc_irq.S b/soc/riscv/riscv-privileged/andes_v5/soc_irq.S
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/soc_irq.S
rename to soc/riscv/riscv-privileged/andes_v5/soc_irq.S
diff --git a/soc/riscv/riscv-privilege/andes_v5/soc_offsets.h b/soc/riscv/riscv-privileged/andes_v5/soc_offsets.h
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/soc_offsets.h
rename to soc/riscv/riscv-privileged/andes_v5/soc_offsets.h
diff --git a/soc/riscv/riscv-privilege/andes_v5/soc_v5.h b/soc/riscv/riscv-privileged/andes_v5/soc_v5.h
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/soc_v5.h
rename to soc/riscv/riscv-privileged/andes_v5/soc_v5.h
diff --git a/soc/riscv/riscv-privilege/andes_v5/start.S b/soc/riscv/riscv-privileged/andes_v5/start.S
similarity index 100%
rename from soc/riscv/riscv-privilege/andes_v5/start.S
rename to soc/riscv/riscv-privileged/andes_v5/start.S
diff --git a/soc/riscv/riscv-privilege/common/CMakeLists.txt b/soc/riscv/riscv-privileged/common/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/common/CMakeLists.txt
rename to soc/riscv/riscv-privileged/common/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/common/idle.c b/soc/riscv/riscv-privileged/common/idle.c
similarity index 100%
rename from soc/riscv/riscv-privilege/common/idle.c
rename to soc/riscv/riscv-privileged/common/idle.c
diff --git a/soc/riscv/riscv-privilege/common/nuclei/nuclei_csr.h b/soc/riscv/riscv-privileged/common/nuclei/nuclei_csr.h
similarity index 100%
rename from soc/riscv/riscv-privilege/common/nuclei/nuclei_csr.h
rename to soc/riscv/riscv-privileged/common/nuclei/nuclei_csr.h
diff --git a/soc/riscv/riscv-privilege/common/soc_common.h b/soc/riscv/riscv-privileged/common/soc_common.h
similarity index 100%
rename from soc/riscv/riscv-privilege/common/soc_common.h
rename to soc/riscv/riscv-privileged/common/soc_common.h
diff --git a/soc/riscv/riscv-privilege/common/soc_common_irq.c b/soc/riscv/riscv-privileged/common/soc_common_irq.c
similarity index 100%
rename from soc/riscv/riscv-privilege/common/soc_common_irq.c
rename to soc/riscv/riscv-privileged/common/soc_common_irq.c
diff --git a/soc/riscv/riscv-privilege/common/soc_irq.S b/soc/riscv/riscv-privileged/common/soc_irq.S
similarity index 100%
rename from soc/riscv/riscv-privilege/common/soc_irq.S
rename to soc/riscv/riscv-privileged/common/soc_irq.S
diff --git a/soc/riscv/riscv-privilege/common/vector.S b/soc/riscv/riscv-privileged/common/vector.S
similarity index 100%
rename from soc/riscv/riscv-privilege/common/vector.S
rename to soc/riscv/riscv-privileged/common/vector.S
diff --git a/soc/riscv/riscv-privilege/gd32vf103/CMakeLists.txt b/soc/riscv/riscv-privileged/gd32vf103/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/gd32vf103/CMakeLists.txt
rename to soc/riscv/riscv-privileged/gd32vf103/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/gd32vf103/Kconfig.defconfig.gd32vf103 b/soc/riscv/riscv-privileged/gd32vf103/Kconfig.defconfig.gd32vf103
similarity index 100%
rename from soc/riscv/riscv-privilege/gd32vf103/Kconfig.defconfig.gd32vf103
rename to soc/riscv/riscv-privileged/gd32vf103/Kconfig.defconfig.gd32vf103
diff --git a/soc/riscv/riscv-privilege/gd32vf103/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/gd32vf103/Kconfig.defconfig.series
similarity index 72%
rename from soc/riscv/riscv-privilege/gd32vf103/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/gd32vf103/Kconfig.defconfig.series
index 309b7ecc0e1..061b53b2514 100644
--- a/soc/riscv/riscv-privilege/gd32vf103/Kconfig.defconfig.series
+++ b/soc/riscv/riscv-privileged/gd32vf103/Kconfig.defconfig.series
@@ -3,7 +3,7 @@
 
 if SOC_SERIES_GD32VF103
 
-source "soc/riscv/riscv-privilege/gd32vf103/Kconfig.defconfig.gd32vf103*"
+source "soc/riscv/riscv-privileged/gd32vf103/Kconfig.defconfig.gd32vf103*"
 
 config SOC_SERIES
 	default "gd32vf103"
diff --git a/soc/riscv/riscv-privilege/gd32vf103/Kconfig.series b/soc/riscv/riscv-privileged/gd32vf103/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/gd32vf103/Kconfig.series
rename to soc/riscv/riscv-privileged/gd32vf103/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/gd32vf103/Kconfig.soc b/soc/riscv/riscv-privileged/gd32vf103/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/gd32vf103/Kconfig.soc
rename to soc/riscv/riscv-privileged/gd32vf103/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/gd32vf103/entry.S b/soc/riscv/riscv-privileged/gd32vf103/entry.S
similarity index 100%
rename from soc/riscv/riscv-privilege/gd32vf103/entry.S
rename to soc/riscv/riscv-privileged/gd32vf103/entry.S
diff --git a/soc/riscv/riscv-privilege/gd32vf103/gd32_regs.h b/soc/riscv/riscv-privileged/gd32vf103/gd32_regs.h
similarity index 100%
rename from soc/riscv/riscv-privilege/gd32vf103/gd32_regs.h
rename to soc/riscv/riscv-privileged/gd32vf103/gd32_regs.h
diff --git a/soc/riscv/riscv-privilege/gd32vf103/linker.ld b/soc/riscv/riscv-privileged/gd32vf103/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/gd32vf103/linker.ld
rename to soc/riscv/riscv-privileged/gd32vf103/linker.ld
diff --git a/soc/riscv/riscv-privilege/gd32vf103/pinctrl_soc.h b/soc/riscv/riscv-privileged/gd32vf103/pinctrl_soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/gd32vf103/pinctrl_soc.h
rename to soc/riscv/riscv-privileged/gd32vf103/pinctrl_soc.h
diff --git a/soc/riscv/riscv-privilege/gd32vf103/soc.c b/soc/riscv/riscv-privileged/gd32vf103/soc.c
similarity index 100%
rename from soc/riscv/riscv-privilege/gd32vf103/soc.c
rename to soc/riscv/riscv-privileged/gd32vf103/soc.c
diff --git a/soc/riscv/riscv-privilege/gd32vf103/soc.h b/soc/riscv/riscv-privileged/gd32vf103/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/gd32vf103/soc.h
rename to soc/riscv/riscv-privileged/gd32vf103/soc.h
diff --git a/soc/riscv/riscv-privilege/miv/CMakeLists.txt b/soc/riscv/riscv-privileged/miv/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/miv/CMakeLists.txt
rename to soc/riscv/riscv-privileged/miv/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/miv/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/miv/Kconfig.defconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/miv/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/miv/Kconfig.defconfig.series
diff --git a/soc/riscv/riscv-privilege/miv/Kconfig.series b/soc/riscv/riscv-privileged/miv/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/miv/Kconfig.series
rename to soc/riscv/riscv-privileged/miv/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/miv/Kconfig.soc b/soc/riscv/riscv-privileged/miv/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/miv/Kconfig.soc
rename to soc/riscv/riscv-privileged/miv/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/miv/linker.ld b/soc/riscv/riscv-privileged/miv/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/miv/linker.ld
rename to soc/riscv/riscv-privileged/miv/linker.ld
diff --git a/soc/riscv/riscv-privilege/miv/soc.h b/soc/riscv/riscv-privileged/miv/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/miv/soc.h
rename to soc/riscv/riscv-privileged/miv/soc.h
diff --git a/soc/riscv/riscv-privilege/mpfs/CMakeLists.txt b/soc/riscv/riscv-privileged/mpfs/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/mpfs/CMakeLists.txt
rename to soc/riscv/riscv-privileged/mpfs/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/mpfs/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/mpfs/Kconfig.defconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/mpfs/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/mpfs/Kconfig.defconfig.series
diff --git a/soc/riscv/riscv-privilege/mpfs/Kconfig.series b/soc/riscv/riscv-privileged/mpfs/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/mpfs/Kconfig.series
rename to soc/riscv/riscv-privileged/mpfs/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/mpfs/Kconfig.soc b/soc/riscv/riscv-privileged/mpfs/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/mpfs/Kconfig.soc
rename to soc/riscv/riscv-privileged/mpfs/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/mpfs/linker.ld b/soc/riscv/riscv-privileged/mpfs/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/mpfs/linker.ld
rename to soc/riscv/riscv-privileged/mpfs/linker.ld
diff --git a/soc/riscv/riscv-privilege/mpfs/soc.h b/soc/riscv/riscv-privileged/mpfs/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/mpfs/soc.h
rename to soc/riscv/riscv-privileged/mpfs/soc.h
diff --git a/soc/riscv/riscv-privilege/neorv32/CMakeLists.txt b/soc/riscv/riscv-privileged/neorv32/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/neorv32/CMakeLists.txt
rename to soc/riscv/riscv-privileged/neorv32/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/neorv32/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/neorv32/Kconfig.defconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/neorv32/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/neorv32/Kconfig.defconfig.series
diff --git a/soc/riscv/riscv-privilege/neorv32/Kconfig.series b/soc/riscv/riscv-privileged/neorv32/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/neorv32/Kconfig.series
rename to soc/riscv/riscv-privileged/neorv32/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/neorv32/Kconfig.soc b/soc/riscv/riscv-privileged/neorv32/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/neorv32/Kconfig.soc
rename to soc/riscv/riscv-privileged/neorv32/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/neorv32/linker.ld b/soc/riscv/riscv-privileged/neorv32/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/neorv32/linker.ld
rename to soc/riscv/riscv-privileged/neorv32/linker.ld
diff --git a/soc/riscv/riscv-privilege/neorv32/reset.S b/soc/riscv/riscv-privileged/neorv32/reset.S
similarity index 100%
rename from soc/riscv/riscv-privilege/neorv32/reset.S
rename to soc/riscv/riscv-privileged/neorv32/reset.S
diff --git a/soc/riscv/riscv-privilege/neorv32/soc.c b/soc/riscv/riscv-privileged/neorv32/soc.c
similarity index 100%
rename from soc/riscv/riscv-privilege/neorv32/soc.c
rename to soc/riscv/riscv-privileged/neorv32/soc.c
diff --git a/soc/riscv/riscv-privilege/neorv32/soc.h b/soc/riscv/riscv-privileged/neorv32/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/neorv32/soc.h
rename to soc/riscv/riscv-privileged/neorv32/soc.h
diff --git a/soc/riscv/riscv-privilege/neorv32/soc_irq.S b/soc/riscv/riscv-privileged/neorv32/soc_irq.S
similarity index 100%
rename from soc/riscv/riscv-privilege/neorv32/soc_irq.S
rename to soc/riscv/riscv-privileged/neorv32/soc_irq.S
diff --git a/soc/riscv/riscv-privilege/niosv/CMakeLists.txt b/soc/riscv/riscv-privileged/niosv/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/niosv/CMakeLists.txt
rename to soc/riscv/riscv-privileged/niosv/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/niosv/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/niosv/Kconfig.defconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/niosv/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/niosv/Kconfig.defconfig.series
diff --git a/soc/riscv/riscv-privilege/niosv/Kconfig.series b/soc/riscv/riscv-privileged/niosv/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/niosv/Kconfig.series
rename to soc/riscv/riscv-privileged/niosv/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/niosv/Kconfig.soc b/soc/riscv/riscv-privileged/niosv/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/niosv/Kconfig.soc
rename to soc/riscv/riscv-privileged/niosv/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/niosv/linker.ld b/soc/riscv/riscv-privileged/niosv/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/niosv/linker.ld
rename to soc/riscv/riscv-privileged/niosv/linker.ld
diff --git a/soc/riscv/riscv-privilege/niosv/soc.h b/soc/riscv/riscv-privileged/niosv/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/niosv/soc.h
rename to soc/riscv/riscv-privileged/niosv/soc.h
diff --git a/soc/riscv/riscv-privilege/opentitan/CMakeLists.txt b/soc/riscv/riscv-privileged/opentitan/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/opentitan/CMakeLists.txt
rename to soc/riscv/riscv-privileged/opentitan/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/opentitan/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/opentitan/Kconfig.defconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/opentitan/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/opentitan/Kconfig.defconfig.series
diff --git a/soc/riscv/riscv-privilege/opentitan/Kconfig.series b/soc/riscv/riscv-privileged/opentitan/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/opentitan/Kconfig.series
rename to soc/riscv/riscv-privileged/opentitan/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/opentitan/Kconfig.soc b/soc/riscv/riscv-privileged/opentitan/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/opentitan/Kconfig.soc
rename to soc/riscv/riscv-privileged/opentitan/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/opentitan/linker.ld b/soc/riscv/riscv-privileged/opentitan/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/opentitan/linker.ld
rename to soc/riscv/riscv-privileged/opentitan/linker.ld
diff --git a/soc/riscv/riscv-privilege/opentitan/rom_header.S b/soc/riscv/riscv-privileged/opentitan/rom_header.S
similarity index 100%
rename from soc/riscv/riscv-privilege/opentitan/rom_header.S
rename to soc/riscv/riscv-privileged/opentitan/rom_header.S
diff --git a/soc/riscv/riscv-privilege/opentitan/rom_header.ld b/soc/riscv/riscv-privileged/opentitan/rom_header.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/opentitan/rom_header.ld
rename to soc/riscv/riscv-privileged/opentitan/rom_header.ld
diff --git a/soc/riscv/riscv-privilege/opentitan/soc.c b/soc/riscv/riscv-privileged/opentitan/soc.c
similarity index 100%
rename from soc/riscv/riscv-privilege/opentitan/soc.c
rename to soc/riscv/riscv-privileged/opentitan/soc.c
diff --git a/soc/riscv/riscv-privilege/opentitan/soc.h b/soc/riscv/riscv-privileged/opentitan/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/opentitan/soc.h
rename to soc/riscv/riscv-privileged/opentitan/soc.h
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/CMakeLists.txt b/soc/riscv/riscv-privileged/sifive-freedom/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/CMakeLists.txt
rename to soc/riscv/riscv-privileged/sifive-freedom/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/sifive-freedom/Kconfig.defconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/sifive-freedom/Kconfig.defconfig.series
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series b/soc/riscv/riscv-privileged/sifive-freedom/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series
rename to soc/riscv/riscv-privileged/sifive-freedom/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc b/soc/riscv/riscv-privileged/sifive-freedom/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc
rename to soc/riscv/riscv-privileged/sifive-freedom/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/fe310_clock.c b/soc/riscv/riscv-privileged/sifive-freedom/fe310_clock.c
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/fe310_clock.c
rename to soc/riscv/riscv-privileged/sifive-freedom/fe310_clock.c
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/fe310_prci.h b/soc/riscv/riscv-privileged/sifive-freedom/fe310_prci.h
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/fe310_prci.h
rename to soc/riscv/riscv-privileged/sifive-freedom/fe310_prci.h
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/fu540_clock.c b/soc/riscv/riscv-privileged/sifive-freedom/fu540_clock.c
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/fu540_clock.c
rename to soc/riscv/riscv-privileged/sifive-freedom/fu540_clock.c
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/fu540_prci.h b/soc/riscv/riscv-privileged/sifive-freedom/fu540_prci.h
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/fu540_prci.h
rename to soc/riscv/riscv-privileged/sifive-freedom/fu540_prci.h
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/fu740_clock.c b/soc/riscv/riscv-privileged/sifive-freedom/fu740_clock.c
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/fu740_clock.c
rename to soc/riscv/riscv-privileged/sifive-freedom/fu740_clock.c
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/fu740_prci.h b/soc/riscv/riscv-privileged/sifive-freedom/fu740_prci.h
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/fu740_prci.h
rename to soc/riscv/riscv-privileged/sifive-freedom/fu740_prci.h
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/linker.ld b/soc/riscv/riscv-privileged/sifive-freedom/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/linker.ld
rename to soc/riscv/riscv-privileged/sifive-freedom/linker.ld
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/pinctrl_soc.h b/soc/riscv/riscv-privileged/sifive-freedom/pinctrl_soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/pinctrl_soc.h
rename to soc/riscv/riscv-privileged/sifive-freedom/pinctrl_soc.h
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/soc.h b/soc/riscv/riscv-privileged/sifive-freedom/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/sifive-freedom/soc.h
rename to soc/riscv/riscv-privileged/sifive-freedom/soc.h
diff --git a/soc/riscv/riscv-privilege/starfive_jh71xx/CMakeLists.txt b/soc/riscv/riscv-privileged/starfive_jh71xx/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/starfive_jh71xx/CMakeLists.txt
rename to soc/riscv/riscv-privileged/starfive_jh71xx/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/starfive_jh71xx/Kconfig.defconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/starfive_jh71xx/Kconfig.defconfig.series
diff --git a/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.series b/soc/riscv/riscv-privileged/starfive_jh71xx/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.series
rename to soc/riscv/riscv-privileged/starfive_jh71xx/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.soc b/soc/riscv/riscv-privileged/starfive_jh71xx/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.soc
rename to soc/riscv/riscv-privileged/starfive_jh71xx/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/starfive_jh71xx/linker.ld b/soc/riscv/riscv-privileged/starfive_jh71xx/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/starfive_jh71xx/linker.ld
rename to soc/riscv/riscv-privileged/starfive_jh71xx/linker.ld
diff --git a/soc/riscv/riscv-privilege/starfive_jh71xx/soc.h b/soc/riscv/riscv-privileged/starfive_jh71xx/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/starfive_jh71xx/soc.h
rename to soc/riscv/riscv-privileged/starfive_jh71xx/soc.h
diff --git a/soc/riscv/riscv-privilege/telink_b91/CMakeLists.txt b/soc/riscv/riscv-privileged/telink_b91/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/CMakeLists.txt
rename to soc/riscv/riscv-privileged/telink_b91/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/telink_b91/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/telink_b91/Kconfig.defconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/telink_b91/Kconfig.defconfig.series
diff --git a/soc/riscv/riscv-privilege/telink_b91/Kconfig.series b/soc/riscv/riscv-privileged/telink_b91/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/Kconfig.series
rename to soc/riscv/riscv-privileged/telink_b91/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/telink_b91/Kconfig.soc b/soc/riscv/riscv-privileged/telink_b91/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/Kconfig.soc
rename to soc/riscv/riscv-privileged/telink_b91/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/telink_b91/init.ld b/soc/riscv/riscv-privileged/telink_b91/init.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/init.ld
rename to soc/riscv/riscv-privileged/telink_b91/init.ld
diff --git a/soc/riscv/riscv-privilege/telink_b91/linker.ld b/soc/riscv/riscv-privileged/telink_b91/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/linker.ld
rename to soc/riscv/riscv-privileged/telink_b91/linker.ld
diff --git a/soc/riscv/riscv-privilege/telink_b91/pinctrl_soc.h b/soc/riscv/riscv-privileged/telink_b91/pinctrl_soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/pinctrl_soc.h
rename to soc/riscv/riscv-privileged/telink_b91/pinctrl_soc.h
diff --git a/soc/riscv/riscv-privilege/telink_b91/soc.c b/soc/riscv/riscv-privileged/telink_b91/soc.c
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/soc.c
rename to soc/riscv/riscv-privileged/telink_b91/soc.c
diff --git a/soc/riscv/riscv-privilege/telink_b91/soc.h b/soc/riscv/riscv-privileged/telink_b91/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/soc.h
rename to soc/riscv/riscv-privileged/telink_b91/soc.h
diff --git a/soc/riscv/riscv-privilege/telink_b91/soc_context.h b/soc/riscv/riscv-privileged/telink_b91/soc_context.h
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/soc_context.h
rename to soc/riscv/riscv-privileged/telink_b91/soc_context.h
diff --git a/soc/riscv/riscv-privilege/telink_b91/soc_irq.S b/soc/riscv/riscv-privileged/telink_b91/soc_irq.S
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/soc_irq.S
rename to soc/riscv/riscv-privileged/telink_b91/soc_irq.S
diff --git a/soc/riscv/riscv-privilege/telink_b91/soc_offsets.h b/soc/riscv/riscv-privileged/telink_b91/soc_offsets.h
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/soc_offsets.h
rename to soc/riscv/riscv-privileged/telink_b91/soc_offsets.h
diff --git a/soc/riscv/riscv-privilege/telink_b91/start.S b/soc/riscv/riscv-privileged/telink_b91/start.S
similarity index 100%
rename from soc/riscv/riscv-privilege/telink_b91/start.S
rename to soc/riscv/riscv-privileged/telink_b91/start.S
diff --git a/soc/riscv/riscv-privilege/virt/CMakeLists.txt b/soc/riscv/riscv-privileged/virt/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privilege/virt/CMakeLists.txt
rename to soc/riscv/riscv-privileged/virt/CMakeLists.txt
diff --git a/soc/riscv/riscv-privilege/virt/Kconfig.defconfig.series b/soc/riscv/riscv-privileged/virt/Kconfig.defconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/virt/Kconfig.defconfig.series
rename to soc/riscv/riscv-privileged/virt/Kconfig.defconfig.series
diff --git a/soc/riscv/riscv-privilege/virt/Kconfig.series b/soc/riscv/riscv-privileged/virt/Kconfig.series
similarity index 100%
rename from soc/riscv/riscv-privilege/virt/Kconfig.series
rename to soc/riscv/riscv-privileged/virt/Kconfig.series
diff --git a/soc/riscv/riscv-privilege/virt/Kconfig.soc b/soc/riscv/riscv-privileged/virt/Kconfig.soc
similarity index 100%
rename from soc/riscv/riscv-privilege/virt/Kconfig.soc
rename to soc/riscv/riscv-privileged/virt/Kconfig.soc
diff --git a/soc/riscv/riscv-privilege/virt/linker.ld b/soc/riscv/riscv-privileged/virt/linker.ld
similarity index 100%
rename from soc/riscv/riscv-privilege/virt/linker.ld
rename to soc/riscv/riscv-privileged/virt/linker.ld
diff --git a/soc/riscv/riscv-privilege/virt/soc.c b/soc/riscv/riscv-privileged/virt/soc.c
similarity index 100%
rename from soc/riscv/riscv-privilege/virt/soc.c
rename to soc/riscv/riscv-privileged/virt/soc.c
diff --git a/soc/riscv/riscv-privilege/virt/soc.h b/soc/riscv/riscv-privileged/virt/soc.h
similarity index 100%
rename from soc/riscv/riscv-privilege/virt/soc.h
rename to soc/riscv/riscv-privileged/virt/soc.h