| From 3037b174b1876aae6b2d1a27a878c681c78ccadc Mon Sep 17 00:00:00 2001 |
| From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> |
| Date: Mon, 7 Feb 2022 09:44:04 +0100 |
| Subject: ARM: socfpga: fix missing RESET_CONTROLLER |
| |
| From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> |
| |
| commit 3037b174b1876aae6b2d1a27a878c681c78ccadc upstream. |
| |
| The SocFPGA machine since commit b3ca9888f35f ("reset: socfpga: add an |
| early reset driver for SoCFPGA") uses reset controller, so it should |
| select RESET_CONTROLLER explicitly. Selecting ARCH_HAS_RESET_CONTROLLER |
| is not enough because it affects only default choice still allowing a |
| non-buildable configuration: |
| |
| /usr/bin/arm-linux-gnueabi-ld: arch/arm/mach-socfpga/socfpga.o: in function `socfpga_init_irq': |
| arch/arm/mach-socfpga/socfpga.c:56: undefined reference to `socfpga_reset_init' |
| |
| Reported-by: kernel test robot <lkp@intel.com> |
| Cc: <stable@vger.kernel.org> |
| Fixes: b3ca9888f35f ("reset: socfpga: add an early reset driver for SoCFPGA") |
| Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> |
| Signed-off-by: Dinh Nguyen <dinguyen@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm/mach-socfpga/Kconfig | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/arch/arm/mach-socfpga/Kconfig |
| +++ b/arch/arm/mach-socfpga/Kconfig |
| @@ -2,6 +2,7 @@ |
| menuconfig ARCH_INTEL_SOCFPGA |
| bool "Altera SOCFPGA family" |
| depends on ARCH_MULTI_V7 |
| + select ARCH_HAS_RESET_CONTROLLER |
| select ARCH_SUPPORTS_BIG_ENDIAN |
| select ARM_AMBA |
| select ARM_GIC |
| @@ -18,6 +19,7 @@ menuconfig ARCH_INTEL_SOCFPGA |
| select PL310_ERRATA_727915 |
| select PL310_ERRATA_753970 if PL310 |
| select PL310_ERRATA_769419 |
| + select RESET_CONTROLLER |
| |
| if ARCH_INTEL_SOCFPGA |
| config SOCFPGA_SUSPEND |
