]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
reset: socfpga: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs
authorKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Thu, 11 Mar 2021 15:27:41 +0000 (16:27 +0100)
committerDinh Nguyen <dinguyen@kernel.org>
Tue, 23 Mar 2021 16:03:36 +0000 (11:03 -0500)
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 <krzysztof.kozlowski@canonical.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
drivers/reset/Kconfig

index b1e8efa1616697b671ebaeeb08ef8697a56729b4..7043c7f6dcf007a1d85ce1c88f9451b18164bd4f 100644 (file)
@@ -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