summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/soc/Kconfig2
-rw-r--r--drivers/soc/Makefile2
-rw-r--r--drivers/soc/canaan/Kconfig (renamed from drivers/soc/kendryte/Kconfig)4
-rw-r--r--drivers/soc/canaan/Makefile (renamed from drivers/soc/kendryte/Makefile)0
-rw-r--r--drivers/soc/canaan/k210-sysctl.c (renamed from drivers/soc/kendryte/k210-sysctl.c)0
5 files changed, 4 insertions, 4 deletions
diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index d097d070f579..c0143651f4a9 100644
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -6,6 +6,7 @@ source "drivers/soc/amlogic/Kconfig"
source "drivers/soc/aspeed/Kconfig"
source "drivers/soc/atmel/Kconfig"
source "drivers/soc/bcm/Kconfig"
+source "drivers/soc/canaan/Kconfig"
source "drivers/soc/fsl/Kconfig"
source "drivers/soc/imx/Kconfig"
source "drivers/soc/ixp4xx/Kconfig"
@@ -23,6 +24,5 @@ source "drivers/soc/ux500/Kconfig"
source "drivers/soc/versatile/Kconfig"
source "drivers/soc/xilinx/Kconfig"
source "drivers/soc/zte/Kconfig"
-source "drivers/soc/kendryte/Kconfig"
endmenu
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 699b758d28e4..fa7071246546 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -29,4 +29,4 @@ obj-$(CONFIG_ARCH_U8500) += ux500/
obj-$(CONFIG_PLAT_VERSATILE) += versatile/
obj-y += xilinx/
obj-$(CONFIG_ARCH_ZX) += zte/
-obj-$(CONFIG_SOC_KENDRYTE) += kendryte/
+obj-$(CONFIG_SOC_CANAAN) += canaan/
diff --git a/drivers/soc/kendryte/Kconfig b/drivers/soc/canaan/Kconfig
index 49785b1b0217..5232d13f07e5 100644
--- a/drivers/soc/kendryte/Kconfig
+++ b/drivers/soc/canaan/Kconfig
@@ -1,9 +1,9 @@
# SPDX-License-Identifier: GPL-2.0
-if SOC_KENDRYTE
+if SOC_CANAAN
config K210_SYSCTL
- bool "Kendryte K210 system controller"
+ bool "Canaan Kendryte K210 SoC system controller"
default y
depends on RISCV
help
diff --git a/drivers/soc/kendryte/Makefile b/drivers/soc/canaan/Makefile
index 002d9ce95c0d..002d9ce95c0d 100644
--- a/drivers/soc/kendryte/Makefile
+++ b/drivers/soc/canaan/Makefile
diff --git a/drivers/soc/kendryte/k210-sysctl.c b/drivers/soc/canaan/k210-sysctl.c
index 4608fbca20e1..4608fbca20e1 100644
--- a/drivers/soc/kendryte/k210-sysctl.c
+++ b/drivers/soc/canaan/k210-sysctl.c