mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
ARM: socfpga: fix missing RESET_CONTROLLER
commit3037b174b1
upstream. The SocFPGA machine since commitb3ca9888f3
("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:b3ca9888f3
("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>
This commit is contained in:
parent
ccdd7956cd
commit
7740eb27c3
1 changed files with 2 additions and 0 deletions
|
@ -2,6 +2,7 @@
|
||||||
menuconfig ARCH_INTEL_SOCFPGA
|
menuconfig ARCH_INTEL_SOCFPGA
|
||||||
bool "Altera SOCFPGA family"
|
bool "Altera SOCFPGA family"
|
||||||
depends on ARCH_MULTI_V7
|
depends on ARCH_MULTI_V7
|
||||||
|
select ARCH_HAS_RESET_CONTROLLER
|
||||||
select ARCH_SUPPORTS_BIG_ENDIAN
|
select ARCH_SUPPORTS_BIG_ENDIAN
|
||||||
select ARM_AMBA
|
select ARM_AMBA
|
||||||
select ARM_GIC
|
select ARM_GIC
|
||||||
|
@ -18,6 +19,7 @@ menuconfig ARCH_INTEL_SOCFPGA
|
||||||
select PL310_ERRATA_727915
|
select PL310_ERRATA_727915
|
||||||
select PL310_ERRATA_753970 if PL310
|
select PL310_ERRATA_753970 if PL310
|
||||||
select PL310_ERRATA_769419
|
select PL310_ERRATA_769419
|
||||||
|
select RESET_CONTROLLER
|
||||||
|
|
||||||
if ARCH_INTEL_SOCFPGA
|
if ARCH_INTEL_SOCFPGA
|
||||||
config SOCFPGA_SUSPEND
|
config SOCFPGA_SUSPEND
|
||||||
|
|
Loading…
Reference in a new issue