From b3d8fc5e824f568a4ce570957efafb02d5e1f8cc Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 9 Jan 2024 09:45:11 +0100
Subject: [PATCH] soc: arm: gigadevice: s/gigadevice/gd_gd32

Gigadevice was inconsistent with the convention established by other SoC
families, that is, use <vnd_prefix>_<family>. For example, ST STM32 uses
st_stm32. Note that GD32VF103, under soc/riscv, has already been
adjusted.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
---
 MAINTAINERS.yml                                               | 3 +--
 soc/arm/{gigadevice => gd_gd32}/CMakeLists.txt                | 0
 soc/arm/{gigadevice => gd_gd32}/Kconfig                       | 4 ++--
 soc/arm/{gigadevice => gd_gd32}/Kconfig.defconfig             | 2 +-
 soc/arm/{gigadevice => gd_gd32}/Kconfig.soc                   | 2 +-
 soc/arm/{gigadevice => gd_gd32}/common/CMakeLists.txt         | 0
 soc/arm/{gigadevice => gd_gd32}/common/pinctrl_soc.h          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32a50x/CMakeLists.txt       | 0
 .../gd32a50x/Kconfig.defconfig.gd32a503                       | 0
 .../{gigadevice => gd_gd32}/gd32a50x/Kconfig.defconfig.series | 2 +-
 soc/arm/{gigadevice => gd_gd32}/gd32a50x/Kconfig.series       | 0
 soc/arm/{gigadevice => gd_gd32}/gd32a50x/Kconfig.soc          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32a50x/gd32_regs.h          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32a50x/soc.c                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32a50x/soc.h                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32e10x/CMakeLists.txt       | 0
 .../gd32e10x/Kconfig.defconfig.gd32e103                       | 0
 .../{gigadevice => gd_gd32}/gd32e10x/Kconfig.defconfig.series | 2 +-
 soc/arm/{gigadevice => gd_gd32}/gd32e10x/Kconfig.series       | 0
 soc/arm/{gigadevice => gd_gd32}/gd32e10x/Kconfig.soc          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32e10x/gd32_regs.h          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32e10x/soc.c                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32e10x/soc.h                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32e50x/CMakeLists.txt       | 0
 .../gd32e50x/Kconfig.defconfig.gd32e507                       | 0
 .../{gigadevice => gd_gd32}/gd32e50x/Kconfig.defconfig.series | 2 +-
 soc/arm/{gigadevice => gd_gd32}/gd32e50x/Kconfig.series       | 0
 soc/arm/{gigadevice => gd_gd32}/gd32e50x/Kconfig.soc          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32e50x/gd32_regs.h          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32e50x/soc.c                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32e50x/soc.h                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f3x0/CMakeLists.txt       | 0
 .../gd32f3x0/Kconfig.defconfig.gd32f350                       | 0
 .../{gigadevice => gd_gd32}/gd32f3x0/Kconfig.defconfig.series | 2 +-
 soc/arm/{gigadevice => gd_gd32}/gd32f3x0/Kconfig.series       | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f3x0/Kconfig.soc          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f3x0/gd32_regs.h          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f3x0/soc.c                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f3x0/soc.h                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f403/CMakeLists.txt       | 0
 .../gd32f403/Kconfig.defconfig.gd32f403                       | 0
 .../{gigadevice => gd_gd32}/gd32f403/Kconfig.defconfig.series | 2 +-
 soc/arm/{gigadevice => gd_gd32}/gd32f403/Kconfig.series       | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f403/Kconfig.soc          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f403/gd32_regs.h          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f403/soc.c                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f403/soc.h                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f4xx/CMakeLists.txt       | 0
 .../gd32f4xx/Kconfig.defconfig.gd32f405                       | 0
 .../gd32f4xx/Kconfig.defconfig.gd32f407                       | 0
 .../gd32f4xx/Kconfig.defconfig.gd32f450                       | 0
 .../gd32f4xx/Kconfig.defconfig.gd32f470                       | 0
 .../{gigadevice => gd_gd32}/gd32f4xx/Kconfig.defconfig.series | 2 +-
 soc/arm/{gigadevice => gd_gd32}/gd32f4xx/Kconfig.series       | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f4xx/Kconfig.soc          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f4xx/gd32_regs.h          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f4xx/soc.c                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32f4xx/soc.h                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32l23x/CMakeLists.txt       | 0
 .../gd32l23x/Kconfig.defconfig.gd32l233                       | 0
 .../{gigadevice => gd_gd32}/gd32l23x/Kconfig.defconfig.series | 2 +-
 soc/arm/{gigadevice => gd_gd32}/gd32l23x/Kconfig.series       | 0
 soc/arm/{gigadevice => gd_gd32}/gd32l23x/Kconfig.soc          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32l23x/gd32_regs.h          | 0
 soc/arm/{gigadevice => gd_gd32}/gd32l23x/soc.c                | 0
 soc/arm/{gigadevice => gd_gd32}/gd32l23x/soc.h                | 0
 66 files changed, 12 insertions(+), 13 deletions(-)
 rename soc/arm/{gigadevice => gd_gd32}/CMakeLists.txt (100%)
 rename soc/arm/{gigadevice => gd_gd32}/Kconfig (85%)
 rename soc/arm/{gigadevice => gd_gd32}/Kconfig.defconfig (79%)
 rename soc/arm/{gigadevice => gd_gd32}/Kconfig.soc (63%)
 rename soc/arm/{gigadevice => gd_gd32}/common/CMakeLists.txt (100%)
 rename soc/arm/{gigadevice => gd_gd32}/common/pinctrl_soc.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32a50x/CMakeLists.txt (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32a50x/Kconfig.defconfig.gd32a503 (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32a50x/Kconfig.defconfig.series (75%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32a50x/Kconfig.series (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32a50x/Kconfig.soc (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32a50x/gd32_regs.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32a50x/soc.c (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32a50x/soc.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e10x/CMakeLists.txt (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e10x/Kconfig.defconfig.gd32e103 (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e10x/Kconfig.defconfig.series (75%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e10x/Kconfig.series (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e10x/Kconfig.soc (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e10x/gd32_regs.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e10x/soc.c (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e10x/soc.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e50x/CMakeLists.txt (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e50x/Kconfig.defconfig.gd32e507 (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e50x/Kconfig.defconfig.series (74%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e50x/Kconfig.series (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e50x/Kconfig.soc (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e50x/gd32_regs.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e50x/soc.c (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32e50x/soc.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f3x0/CMakeLists.txt (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f3x0/Kconfig.defconfig.gd32f350 (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f3x0/Kconfig.defconfig.series (73%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f3x0/Kconfig.series (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f3x0/Kconfig.soc (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f3x0/gd32_regs.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f3x0/soc.c (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f3x0/soc.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f403/CMakeLists.txt (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f403/Kconfig.defconfig.gd32f403 (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f403/Kconfig.defconfig.series (72%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f403/Kconfig.series (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f403/Kconfig.soc (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f403/gd32_regs.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f403/soc.c (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f403/soc.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/CMakeLists.txt (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/Kconfig.defconfig.gd32f405 (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/Kconfig.defconfig.gd32f407 (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/Kconfig.defconfig.gd32f450 (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/Kconfig.defconfig.gd32f470 (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/Kconfig.defconfig.series (74%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/Kconfig.series (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/Kconfig.soc (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/gd32_regs.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/soc.c (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32f4xx/soc.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32l23x/CMakeLists.txt (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32l23x/Kconfig.defconfig.gd32l233 (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32l23x/Kconfig.defconfig.series (73%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32l23x/Kconfig.series (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32l23x/Kconfig.soc (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32l23x/gd32_regs.h (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32l23x/soc.c (100%)
 rename soc/arm/{gigadevice => gd_gd32}/gd32l23x/soc.h (100%)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 9cee672506f..cab33e30ca8 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -2996,8 +2996,7 @@ GD32 Platforms:
     - drivers/*/*gd32*
     - dts/*/gigadevice/
     - dts/bindings/*/*gd32*
-    - soc/arm/gigadevice/
-    - soc/riscv/gd_gd32/
+    - soc/*/gd_gd32/
     - scripts/west_commands/*/*gd32*
   labels:
     - "platform: GD32"
diff --git a/soc/arm/gigadevice/CMakeLists.txt b/soc/arm/gd_gd32/CMakeLists.txt
similarity index 100%
rename from soc/arm/gigadevice/CMakeLists.txt
rename to soc/arm/gd_gd32/CMakeLists.txt
diff --git a/soc/arm/gigadevice/Kconfig b/soc/arm/gd_gd32/Kconfig
similarity index 85%
rename from soc/arm/gigadevice/Kconfig
rename to soc/arm/gd_gd32/Kconfig
index 1facd4ceeda..69f21b210d0 100644
--- a/soc/arm/gigadevice/Kconfig
+++ b/soc/arm/gd_gd32/Kconfig
@@ -9,7 +9,7 @@ config SOC_FAMILY_GD32
 
 config SOC_FAMILY
 	string
-	default "gigadevice"
+	default "gd_gd32"
 	depends on SOC_FAMILY_GD32
 
 config SOC_FAMILY_GD32_ARM
@@ -18,6 +18,6 @@ config SOC_FAMILY_GD32_ARM
 
 if SOC_FAMILY_GD32_ARM
 
-source "soc/arm/gigadevice/*/Kconfig.soc"
+source "soc/arm/gd_gd32/*/Kconfig.soc"
 
 endif # SOC_FAMILY_GD32_ARM
diff --git a/soc/arm/gigadevice/Kconfig.defconfig b/soc/arm/gd_gd32/Kconfig.defconfig
similarity index 79%
rename from soc/arm/gigadevice/Kconfig.defconfig
rename to soc/arm/gd_gd32/Kconfig.defconfig
index 1aa25966163..b6fae5d43ec 100644
--- a/soc/arm/gigadevice/Kconfig.defconfig
+++ b/soc/arm/gd_gd32/Kconfig.defconfig
@@ -3,7 +3,7 @@
 
 if SOC_FAMILY_GD32
 
-source "soc/arm/gigadevice/*/Kconfig.defconfig.series"
+source "soc/arm/gd_gd32/*/Kconfig.defconfig.series"
 
 config PINCTRL
 	default y
diff --git a/soc/arm/gigadevice/Kconfig.soc b/soc/arm/gd_gd32/Kconfig.soc
similarity index 63%
rename from soc/arm/gigadevice/Kconfig.soc
rename to soc/arm/gd_gd32/Kconfig.soc
index 897238ff3fb..20a2f4c8cb4 100644
--- a/soc/arm/gigadevice/Kconfig.soc
+++ b/soc/arm/gd_gd32/Kconfig.soc
@@ -1,4 +1,4 @@
 # Copyright (c) 2021, ATL Electronics
 # SPDX-License-Identifier: Apache-2.0
 
-source "soc/arm/gigadevice/*/Kconfig.series"
+source "soc/arm/gd_gd32/*/Kconfig.series"
diff --git a/soc/arm/gigadevice/common/CMakeLists.txt b/soc/arm/gd_gd32/common/CMakeLists.txt
similarity index 100%
rename from soc/arm/gigadevice/common/CMakeLists.txt
rename to soc/arm/gd_gd32/common/CMakeLists.txt
diff --git a/soc/arm/gigadevice/common/pinctrl_soc.h b/soc/arm/gd_gd32/common/pinctrl_soc.h
similarity index 100%
rename from soc/arm/gigadevice/common/pinctrl_soc.h
rename to soc/arm/gd_gd32/common/pinctrl_soc.h
diff --git a/soc/arm/gigadevice/gd32a50x/CMakeLists.txt b/soc/arm/gd_gd32/gd32a50x/CMakeLists.txt
similarity index 100%
rename from soc/arm/gigadevice/gd32a50x/CMakeLists.txt
rename to soc/arm/gd_gd32/gd32a50x/CMakeLists.txt
diff --git a/soc/arm/gigadevice/gd32a50x/Kconfig.defconfig.gd32a503 b/soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.gd32a503
similarity index 100%
rename from soc/arm/gigadevice/gd32a50x/Kconfig.defconfig.gd32a503
rename to soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.gd32a503
diff --git a/soc/arm/gigadevice/gd32a50x/Kconfig.defconfig.series b/soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.series
similarity index 75%
rename from soc/arm/gigadevice/gd32a50x/Kconfig.defconfig.series
rename to soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.series
index d9e48ae18c2..0b250325c45 100644
--- a/soc/arm/gigadevice/gd32a50x/Kconfig.defconfig.series
+++ b/soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.series
@@ -3,7 +3,7 @@
 
 if SOC_SERIES_GD32A50X
 
-source "soc/arm/gigadevice/gd32a50x/Kconfig.defconfig.gd32*"
+source "soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.gd32*"
 
 config SOC_SERIES
 	default "gd32a50x"
diff --git a/soc/arm/gigadevice/gd32a50x/Kconfig.series b/soc/arm/gd_gd32/gd32a50x/Kconfig.series
similarity index 100%
rename from soc/arm/gigadevice/gd32a50x/Kconfig.series
rename to soc/arm/gd_gd32/gd32a50x/Kconfig.series
diff --git a/soc/arm/gigadevice/gd32a50x/Kconfig.soc b/soc/arm/gd_gd32/gd32a50x/Kconfig.soc
similarity index 100%
rename from soc/arm/gigadevice/gd32a50x/Kconfig.soc
rename to soc/arm/gd_gd32/gd32a50x/Kconfig.soc
diff --git a/soc/arm/gigadevice/gd32a50x/gd32_regs.h b/soc/arm/gd_gd32/gd32a50x/gd32_regs.h
similarity index 100%
rename from soc/arm/gigadevice/gd32a50x/gd32_regs.h
rename to soc/arm/gd_gd32/gd32a50x/gd32_regs.h
diff --git a/soc/arm/gigadevice/gd32a50x/soc.c b/soc/arm/gd_gd32/gd32a50x/soc.c
similarity index 100%
rename from soc/arm/gigadevice/gd32a50x/soc.c
rename to soc/arm/gd_gd32/gd32a50x/soc.c
diff --git a/soc/arm/gigadevice/gd32a50x/soc.h b/soc/arm/gd_gd32/gd32a50x/soc.h
similarity index 100%
rename from soc/arm/gigadevice/gd32a50x/soc.h
rename to soc/arm/gd_gd32/gd32a50x/soc.h
diff --git a/soc/arm/gigadevice/gd32e10x/CMakeLists.txt b/soc/arm/gd_gd32/gd32e10x/CMakeLists.txt
similarity index 100%
rename from soc/arm/gigadevice/gd32e10x/CMakeLists.txt
rename to soc/arm/gd_gd32/gd32e10x/CMakeLists.txt
diff --git a/soc/arm/gigadevice/gd32e10x/Kconfig.defconfig.gd32e103 b/soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.gd32e103
similarity index 100%
rename from soc/arm/gigadevice/gd32e10x/Kconfig.defconfig.gd32e103
rename to soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.gd32e103
diff --git a/soc/arm/gigadevice/gd32e10x/Kconfig.defconfig.series b/soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.series
similarity index 75%
rename from soc/arm/gigadevice/gd32e10x/Kconfig.defconfig.series
rename to soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.series
index 5a17c08d864..f16328e1e70 100644
--- a/soc/arm/gigadevice/gd32e10x/Kconfig.defconfig.series
+++ b/soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.series
@@ -3,7 +3,7 @@
 
 if SOC_SERIES_GD32E10X
 
-source "soc/arm/gigadevice/gd32e10x/Kconfig.defconfig.gd32*"
+source "soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.gd32*"
 
 config SOC_SERIES
 	default "gd32e10x"
diff --git a/soc/arm/gigadevice/gd32e10x/Kconfig.series b/soc/arm/gd_gd32/gd32e10x/Kconfig.series
similarity index 100%
rename from soc/arm/gigadevice/gd32e10x/Kconfig.series
rename to soc/arm/gd_gd32/gd32e10x/Kconfig.series
diff --git a/soc/arm/gigadevice/gd32e10x/Kconfig.soc b/soc/arm/gd_gd32/gd32e10x/Kconfig.soc
similarity index 100%
rename from soc/arm/gigadevice/gd32e10x/Kconfig.soc
rename to soc/arm/gd_gd32/gd32e10x/Kconfig.soc
diff --git a/soc/arm/gigadevice/gd32e10x/gd32_regs.h b/soc/arm/gd_gd32/gd32e10x/gd32_regs.h
similarity index 100%
rename from soc/arm/gigadevice/gd32e10x/gd32_regs.h
rename to soc/arm/gd_gd32/gd32e10x/gd32_regs.h
diff --git a/soc/arm/gigadevice/gd32e10x/soc.c b/soc/arm/gd_gd32/gd32e10x/soc.c
similarity index 100%
rename from soc/arm/gigadevice/gd32e10x/soc.c
rename to soc/arm/gd_gd32/gd32e10x/soc.c
diff --git a/soc/arm/gigadevice/gd32e10x/soc.h b/soc/arm/gd_gd32/gd32e10x/soc.h
similarity index 100%
rename from soc/arm/gigadevice/gd32e10x/soc.h
rename to soc/arm/gd_gd32/gd32e10x/soc.h
diff --git a/soc/arm/gigadevice/gd32e50x/CMakeLists.txt b/soc/arm/gd_gd32/gd32e50x/CMakeLists.txt
similarity index 100%
rename from soc/arm/gigadevice/gd32e50x/CMakeLists.txt
rename to soc/arm/gd_gd32/gd32e50x/CMakeLists.txt
diff --git a/soc/arm/gigadevice/gd32e50x/Kconfig.defconfig.gd32e507 b/soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.gd32e507
similarity index 100%
rename from soc/arm/gigadevice/gd32e50x/Kconfig.defconfig.gd32e507
rename to soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.gd32e507
diff --git a/soc/arm/gigadevice/gd32e50x/Kconfig.defconfig.series b/soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.series
similarity index 74%
rename from soc/arm/gigadevice/gd32e50x/Kconfig.defconfig.series
rename to soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.series
index 3a05359fd4a..f771aea44d9 100644
--- a/soc/arm/gigadevice/gd32e50x/Kconfig.defconfig.series
+++ b/soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.series
@@ -3,7 +3,7 @@
 
 if SOC_SERIES_GD32E50X
 
-source "soc/arm/gigadevice/gd32e50x/Kconfig.defconfig.gd32*"
+source "soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.gd32*"
 
 config SOC_SERIES
 	default "gd32e50x"
diff --git a/soc/arm/gigadevice/gd32e50x/Kconfig.series b/soc/arm/gd_gd32/gd32e50x/Kconfig.series
similarity index 100%
rename from soc/arm/gigadevice/gd32e50x/Kconfig.series
rename to soc/arm/gd_gd32/gd32e50x/Kconfig.series
diff --git a/soc/arm/gigadevice/gd32e50x/Kconfig.soc b/soc/arm/gd_gd32/gd32e50x/Kconfig.soc
similarity index 100%
rename from soc/arm/gigadevice/gd32e50x/Kconfig.soc
rename to soc/arm/gd_gd32/gd32e50x/Kconfig.soc
diff --git a/soc/arm/gigadevice/gd32e50x/gd32_regs.h b/soc/arm/gd_gd32/gd32e50x/gd32_regs.h
similarity index 100%
rename from soc/arm/gigadevice/gd32e50x/gd32_regs.h
rename to soc/arm/gd_gd32/gd32e50x/gd32_regs.h
diff --git a/soc/arm/gigadevice/gd32e50x/soc.c b/soc/arm/gd_gd32/gd32e50x/soc.c
similarity index 100%
rename from soc/arm/gigadevice/gd32e50x/soc.c
rename to soc/arm/gd_gd32/gd32e50x/soc.c
diff --git a/soc/arm/gigadevice/gd32e50x/soc.h b/soc/arm/gd_gd32/gd32e50x/soc.h
similarity index 100%
rename from soc/arm/gigadevice/gd32e50x/soc.h
rename to soc/arm/gd_gd32/gd32e50x/soc.h
diff --git a/soc/arm/gigadevice/gd32f3x0/CMakeLists.txt b/soc/arm/gd_gd32/gd32f3x0/CMakeLists.txt
similarity index 100%
rename from soc/arm/gigadevice/gd32f3x0/CMakeLists.txt
rename to soc/arm/gd_gd32/gd32f3x0/CMakeLists.txt
diff --git a/soc/arm/gigadevice/gd32f3x0/Kconfig.defconfig.gd32f350 b/soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32f350
similarity index 100%
rename from soc/arm/gigadevice/gd32f3x0/Kconfig.defconfig.gd32f350
rename to soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32f350
diff --git a/soc/arm/gigadevice/gd32f3x0/Kconfig.defconfig.series b/soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.series
similarity index 73%
rename from soc/arm/gigadevice/gd32f3x0/Kconfig.defconfig.series
rename to soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.series
index dc9607f1149..4852255d255 100644
--- a/soc/arm/gigadevice/gd32f3x0/Kconfig.defconfig.series
+++ b/soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.series
@@ -3,7 +3,7 @@
 
 if SOC_SERIES_GD32F3X0
 
-source "soc/arm/gigadevice/gd32f3x0/Kconfig.defconfig.gd32*"
+source "soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32*"
 
 config SOC_SERIES
 	default "gd32f3x0"
diff --git a/soc/arm/gigadevice/gd32f3x0/Kconfig.series b/soc/arm/gd_gd32/gd32f3x0/Kconfig.series
similarity index 100%
rename from soc/arm/gigadevice/gd32f3x0/Kconfig.series
rename to soc/arm/gd_gd32/gd32f3x0/Kconfig.series
diff --git a/soc/arm/gigadevice/gd32f3x0/Kconfig.soc b/soc/arm/gd_gd32/gd32f3x0/Kconfig.soc
similarity index 100%
rename from soc/arm/gigadevice/gd32f3x0/Kconfig.soc
rename to soc/arm/gd_gd32/gd32f3x0/Kconfig.soc
diff --git a/soc/arm/gigadevice/gd32f3x0/gd32_regs.h b/soc/arm/gd_gd32/gd32f3x0/gd32_regs.h
similarity index 100%
rename from soc/arm/gigadevice/gd32f3x0/gd32_regs.h
rename to soc/arm/gd_gd32/gd32f3x0/gd32_regs.h
diff --git a/soc/arm/gigadevice/gd32f3x0/soc.c b/soc/arm/gd_gd32/gd32f3x0/soc.c
similarity index 100%
rename from soc/arm/gigadevice/gd32f3x0/soc.c
rename to soc/arm/gd_gd32/gd32f3x0/soc.c
diff --git a/soc/arm/gigadevice/gd32f3x0/soc.h b/soc/arm/gd_gd32/gd32f3x0/soc.h
similarity index 100%
rename from soc/arm/gigadevice/gd32f3x0/soc.h
rename to soc/arm/gd_gd32/gd32f3x0/soc.h
diff --git a/soc/arm/gigadevice/gd32f403/CMakeLists.txt b/soc/arm/gd_gd32/gd32f403/CMakeLists.txt
similarity index 100%
rename from soc/arm/gigadevice/gd32f403/CMakeLists.txt
rename to soc/arm/gd_gd32/gd32f403/CMakeLists.txt
diff --git a/soc/arm/gigadevice/gd32f403/Kconfig.defconfig.gd32f403 b/soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403
similarity index 100%
rename from soc/arm/gigadevice/gd32f403/Kconfig.defconfig.gd32f403
rename to soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403
diff --git a/soc/arm/gigadevice/gd32f403/Kconfig.defconfig.series b/soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.series
similarity index 72%
rename from soc/arm/gigadevice/gd32f403/Kconfig.defconfig.series
rename to soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.series
index dbec480c299..8923e1582a3 100644
--- a/soc/arm/gigadevice/gd32f403/Kconfig.defconfig.series
+++ b/soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.series
@@ -3,7 +3,7 @@
 
 if SOC_SERIES_GD32F403
 
-source "soc/arm/gigadevice/gd32f403/Kconfig.defconfig.gd32f403"
+source "soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403"
 
 config SOC_SERIES
 	default "gd32f403"
diff --git a/soc/arm/gigadevice/gd32f403/Kconfig.series b/soc/arm/gd_gd32/gd32f403/Kconfig.series
similarity index 100%
rename from soc/arm/gigadevice/gd32f403/Kconfig.series
rename to soc/arm/gd_gd32/gd32f403/Kconfig.series
diff --git a/soc/arm/gigadevice/gd32f403/Kconfig.soc b/soc/arm/gd_gd32/gd32f403/Kconfig.soc
similarity index 100%
rename from soc/arm/gigadevice/gd32f403/Kconfig.soc
rename to soc/arm/gd_gd32/gd32f403/Kconfig.soc
diff --git a/soc/arm/gigadevice/gd32f403/gd32_regs.h b/soc/arm/gd_gd32/gd32f403/gd32_regs.h
similarity index 100%
rename from soc/arm/gigadevice/gd32f403/gd32_regs.h
rename to soc/arm/gd_gd32/gd32f403/gd32_regs.h
diff --git a/soc/arm/gigadevice/gd32f403/soc.c b/soc/arm/gd_gd32/gd32f403/soc.c
similarity index 100%
rename from soc/arm/gigadevice/gd32f403/soc.c
rename to soc/arm/gd_gd32/gd32f403/soc.c
diff --git a/soc/arm/gigadevice/gd32f403/soc.h b/soc/arm/gd_gd32/gd32f403/soc.h
similarity index 100%
rename from soc/arm/gigadevice/gd32f403/soc.h
rename to soc/arm/gd_gd32/gd32f403/soc.h
diff --git a/soc/arm/gigadevice/gd32f4xx/CMakeLists.txt b/soc/arm/gd_gd32/gd32f4xx/CMakeLists.txt
similarity index 100%
rename from soc/arm/gigadevice/gd32f4xx/CMakeLists.txt
rename to soc/arm/gd_gd32/gd32f4xx/CMakeLists.txt
diff --git a/soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.gd32f405 b/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f405
similarity index 100%
rename from soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.gd32f405
rename to soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f405
diff --git a/soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.gd32f407 b/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f407
similarity index 100%
rename from soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.gd32f407
rename to soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f407
diff --git a/soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.gd32f450 b/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f450
similarity index 100%
rename from soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.gd32f450
rename to soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f450
diff --git a/soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.gd32f470 b/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f470
similarity index 100%
rename from soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.gd32f470
rename to soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f470
diff --git a/soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.series b/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.series
similarity index 74%
rename from soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.series
rename to soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.series
index f5ef03cd276..a4ccaed4e80 100644
--- a/soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.series
+++ b/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.series
@@ -3,7 +3,7 @@
 
 if SOC_SERIES_GD32F4XX
 
-source "soc/arm/gigadevice/gd32f4xx/Kconfig.defconfig.gd32*"
+source "soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32*"
 
 config SOC_SERIES
 	default "gd32f4xx"
diff --git a/soc/arm/gigadevice/gd32f4xx/Kconfig.series b/soc/arm/gd_gd32/gd32f4xx/Kconfig.series
similarity index 100%
rename from soc/arm/gigadevice/gd32f4xx/Kconfig.series
rename to soc/arm/gd_gd32/gd32f4xx/Kconfig.series
diff --git a/soc/arm/gigadevice/gd32f4xx/Kconfig.soc b/soc/arm/gd_gd32/gd32f4xx/Kconfig.soc
similarity index 100%
rename from soc/arm/gigadevice/gd32f4xx/Kconfig.soc
rename to soc/arm/gd_gd32/gd32f4xx/Kconfig.soc
diff --git a/soc/arm/gigadevice/gd32f4xx/gd32_regs.h b/soc/arm/gd_gd32/gd32f4xx/gd32_regs.h
similarity index 100%
rename from soc/arm/gigadevice/gd32f4xx/gd32_regs.h
rename to soc/arm/gd_gd32/gd32f4xx/gd32_regs.h
diff --git a/soc/arm/gigadevice/gd32f4xx/soc.c b/soc/arm/gd_gd32/gd32f4xx/soc.c
similarity index 100%
rename from soc/arm/gigadevice/gd32f4xx/soc.c
rename to soc/arm/gd_gd32/gd32f4xx/soc.c
diff --git a/soc/arm/gigadevice/gd32f4xx/soc.h b/soc/arm/gd_gd32/gd32f4xx/soc.h
similarity index 100%
rename from soc/arm/gigadevice/gd32f4xx/soc.h
rename to soc/arm/gd_gd32/gd32f4xx/soc.h
diff --git a/soc/arm/gigadevice/gd32l23x/CMakeLists.txt b/soc/arm/gd_gd32/gd32l23x/CMakeLists.txt
similarity index 100%
rename from soc/arm/gigadevice/gd32l23x/CMakeLists.txt
rename to soc/arm/gd_gd32/gd32l23x/CMakeLists.txt
diff --git a/soc/arm/gigadevice/gd32l23x/Kconfig.defconfig.gd32l233 b/soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.gd32l233
similarity index 100%
rename from soc/arm/gigadevice/gd32l23x/Kconfig.defconfig.gd32l233
rename to soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.gd32l233
diff --git a/soc/arm/gigadevice/gd32l23x/Kconfig.defconfig.series b/soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.series
similarity index 73%
rename from soc/arm/gigadevice/gd32l23x/Kconfig.defconfig.series
rename to soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.series
index da16d8f287c..36a6476dbfb 100644
--- a/soc/arm/gigadevice/gd32l23x/Kconfig.defconfig.series
+++ b/soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.series
@@ -3,7 +3,7 @@
 
 if SOC_SERIES_GD32L23X
 
-source "soc/arm/gigadevice/gd32l23x/Kconfig.defconfig.gd32*"
+source "soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.gd32*"
 
 config SOC_SERIES
 	default "gd32l23x"
diff --git a/soc/arm/gigadevice/gd32l23x/Kconfig.series b/soc/arm/gd_gd32/gd32l23x/Kconfig.series
similarity index 100%
rename from soc/arm/gigadevice/gd32l23x/Kconfig.series
rename to soc/arm/gd_gd32/gd32l23x/Kconfig.series
diff --git a/soc/arm/gigadevice/gd32l23x/Kconfig.soc b/soc/arm/gd_gd32/gd32l23x/Kconfig.soc
similarity index 100%
rename from soc/arm/gigadevice/gd32l23x/Kconfig.soc
rename to soc/arm/gd_gd32/gd32l23x/Kconfig.soc
diff --git a/soc/arm/gigadevice/gd32l23x/gd32_regs.h b/soc/arm/gd_gd32/gd32l23x/gd32_regs.h
similarity index 100%
rename from soc/arm/gigadevice/gd32l23x/gd32_regs.h
rename to soc/arm/gd_gd32/gd32l23x/gd32_regs.h
diff --git a/soc/arm/gigadevice/gd32l23x/soc.c b/soc/arm/gd_gd32/gd32l23x/soc.c
similarity index 100%
rename from soc/arm/gigadevice/gd32l23x/soc.c
rename to soc/arm/gd_gd32/gd32l23x/soc.c
diff --git a/soc/arm/gigadevice/gd32l23x/soc.h b/soc/arm/gd_gd32/gd32l23x/soc.h
similarity index 100%
rename from soc/arm/gigadevice/gd32l23x/soc.h
rename to soc/arm/gd_gd32/gd32l23x/soc.h