From 6631851252ccdd6d39852991b79727fd372ad7f1 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Mon, 24 Jan 2022 15:25:28 +0800 Subject: [PATCH] soc: rockchip: Rename CPU_RV110X to CPU_RV1108 Now RV1103/6 is coming, the original CPU_RV110X is for RV1107/8, to avoid been mis-understood, so, make this change. Signed-off-by: Sugar Zhang Change-Id: I1fa19e740b72934dc84f0d2bbbf56b00aa24225a --- arch/arm/configs/rk3308_linux_aarch32_debug_defconfig | 2 +- arch/arm/configs/rk3308_linux_aarch32_defconfig | 2 +- drivers/soc/rockchip/Kconfig.cpu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/rk3308_linux_aarch32_debug_defconfig b/arch/arm/configs/rk3308_linux_aarch32_debug_defconfig index 0ca81fa3a3f1..dac317dd727c 100644 --- a/arch/arm/configs/rk3308_linux_aarch32_debug_defconfig +++ b/arch/arm/configs/rk3308_linux_aarch32_debug_defconfig @@ -202,7 +202,7 @@ CONFIG_RK_CONSOLE_THREAD=y # CONFIG_CPU_RK3188 is not set # CONFIG_CPU_RK3288 is not set # CONFIG_CPU_RK322X is not set -# CONFIG_CPU_RV110X is not set +# CONFIG_CPU_RV1108 is not set CONFIG_CPU_RK3308=y CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_PVTM=y diff --git a/arch/arm/configs/rk3308_linux_aarch32_defconfig b/arch/arm/configs/rk3308_linux_aarch32_defconfig index d3eab9663aa6..c51a23ae7e3f 100644 --- a/arch/arm/configs/rk3308_linux_aarch32_defconfig +++ b/arch/arm/configs/rk3308_linux_aarch32_defconfig @@ -197,7 +197,7 @@ CONFIG_RK_CONSOLE_THREAD=y # CONFIG_CPU_RK3188 is not set # CONFIG_CPU_RK3288 is not set # CONFIG_CPU_RK322X is not set -# CONFIG_CPU_RV110X is not set +# CONFIG_CPU_RV1108 is not set CONFIG_CPU_RK3308=y CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_PVTM=y diff --git a/drivers/soc/rockchip/Kconfig.cpu b/drivers/soc/rockchip/Kconfig.cpu index 40be45361c8a..896af61fbac6 100644 --- a/drivers/soc/rockchip/Kconfig.cpu +++ b/drivers/soc/rockchip/Kconfig.cpu @@ -27,7 +27,7 @@ config CPU_RK322X bool "RK3228/9" depends on ARM -config CPU_RV110X +config CPU_RV1108 bool "RV1107/8" depends on ARM