aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2021-02-08 15:38:55 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-15 09:50:31 +0200
commit25fbfc31ceec99cec4e3284d911d6c975d8561e7 (patch)
tree0b44a8e5a3d6fb1aba67b7ee39145d15f98a43a9
parentc391728c9b25e51a352a65562ae78dde3b11b6e0 (diff)
downloadkernel_replicant_linux-25fbfc31ceec99cec4e3284d911d6c975d8561e7.tar.gz
kernel_replicant_linux-25fbfc31ceec99cec4e3284d911d6c975d8561e7.tar.bz2
kernel_replicant_linux-25fbfc31ceec99cec4e3284d911d6c975d8561e7.zip
soc: rockchip: ROCKCHIP_GRF should not default to y, unconditionally
[ Upstream commit 2a1c55d4762dd34a8b0f2e36fb01b7b16b60735b ] Merely enabling CONFIG_COMPILE_TEST should not enable additional code. To fix this, restrict the automatic enabling of ROCKCHIP_GRF to ARCH_ROCKCHIP, and ask the user in case of compile-testing. Fixes: 4c58063d4258f6be ("soc: rockchip: add driver handling grf setup") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/20210208143855.418374-1-geert+renesas@glider.be Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/soc/rockchip/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig
index 2c13bf4dd5db..25eb2c1e31bb 100644
--- a/drivers/soc/rockchip/Kconfig
+++ b/drivers/soc/rockchip/Kconfig
@@ -6,8 +6,8 @@ if ARCH_ROCKCHIP || COMPILE_TEST
#
config ROCKCHIP_GRF
- bool
- default y
+ bool "Rockchip General Register Files support" if COMPILE_TEST
+ default y if ARCH_ROCKCHIP
help
The General Register Files are a central component providing
special additional settings registers for a lot of soc-components.