From: Krzysztof Kozlowski Date: Thu, 11 Mar 2021 15:27:41 +0000 (+0100) Subject: reset: socfpga: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs X-Git-Tag: v5.13-rc1~168^2~13^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=225c13f0b7b69bec79520717e7ebb6e035457dbb;p=thirdparty%2Fkernel%2Flinux.git reset: socfpga: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs ARCH_SOCFPGA is being renamed to ARCH_INTEL_SOCFPGA so adjust the 32-bit ARM drivers to rely on new symbol. Signed-off-by: Krzysztof Kozlowski Signed-off-by: Dinh Nguyen --- diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index b1e8efa161669..7043c7f6dcf00 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -205,8 +205,8 @@ config RESET_STM32MP157 This enables the RCC reset controller driver for STM32 MPUs. config RESET_SOCFPGA - bool "SoCFPGA Reset Driver" if COMPILE_TEST && !ARCH_SOCFPGA - default ARCH_SOCFPGA + bool "SoCFPGA Reset Driver" if COMPILE_TEST && (!ARM || !ARCH_INTEL_SOCFPGA) + default ARM && ARCH_INTEL_SOCFPGA select RESET_SIMPLE help This enables the reset driver for the SoCFPGA ARMv7 platforms. This