- Fix a build error for socfpga_defconfig
 -----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCgAyFiEEoHhMeiyk5VmwVMwNGZQEC4GjKPQFAmIA7rwUHGRpbmd1eWVu
 QGtlcm5lbC5vcmcACgkQGZQEC4GjKPSeUhAAnRpzOonqCbMXbj9JZz1zD0Hk39lW
 fmpafw6SA42/pd0jo4zzK2Z3lMkfvalY9qi2K4QUzp8n/CFW3f8PbW0jbWzCzC+m
 J7tJbtcyH0m/GS5pfPCvM8jBW3hEBPTlKfkY+FBJxWxvLBNJnQKMVg4tpeVtjYNH
 AieHJ4fllK4qocJF4l3pXl+mthY5ols9i+MtF1cUfeAnch7PwdqVrL1aEFr0lryW
 7geZuHfQZuPLTVf5q4G1Ot1mR2rF1EX9jLOFZV7YfX637YdwkO7KxpagXYacxbZG
 5Uhi8nNI/AZURHz1YSZSmCe6VzAhydQQFU8s/YY502NinXouzSgvs1/Sz5BBYmWd
 8q4y2kPuctUwqRYJP+aXjNlUhWnVMciSCK4E918746vas5jD/sPepHfGzwESQJT+
 HOpg2w6NLm+Ufx6fr6n45moM41qHjF71lKWjsD2M0+XcJ6vpBE+npwb7aGYyR6Se
 sz2MLDDp4On3hOHC/FR2Dwoen2zJuxQiNoeAEdrEFRjUbo9GaXMXASfDK3opMCJw
 FrhRj7WaxzFD6Twf9JdVPMVvVS1Vmfh8a+Lof+mJRs6FfBINNznBopVKPGCo0xDd
 DX28K6mhvUAcY/ag3ADccek6aeXfurLR/3QAAZbQ+LSxqWxnHCNoVrHmFDeT3h8p
 uiS6DR1uj1cncl4=
 =o/0j
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmICMGMACgkQmmx57+YA
 GNltPBAAlddVxWn5xIByFIz2bCNHiEiIimmA5v0fYTE1qM1zAaR8ynXUVfaajKfz
 a50jkQp8cObI/Yi3heJCNi8k8TjvjH6WVUArZqp7N0nSP2UElWpnDv+6T6xN35v9
 bi0UfFQ16irgkyFEn/aCIocvrn/6fNME37lAtrd95Su09L+ip992niHcYCndSJBB
 Sxe8kxUtJQsN2HN6hkPHdzi+fpFhIKI5isCZBiCaCTNorbNFOZfe5YCdwnmKHvYC
 Pa5EdbK30Fl34KGNpzCUTlnUpTVhr3zlM7nf8eclfNRABpjESMcLwGu+Rsi/jfnY
 lz2i+m57vx8dQAGUu8Z9eg9ozOtfrqECllmWeMJmHMiDJ8CLHApJ9VLAnSlWahlc
 BnGuhPsnYURIeRCo6YjVTqKBMK8rh6m0xL1HJsTd/iL3OXnZ2R62fhTnwS55fl1Q
 O5w2bZgr6zJv7zWXB9IgM09z5jvt6toEH7k7GUMtqe8eo/zAd+WJIdZkp/zWhkq+
 mKAw6tJSr3TCWouzkf9wWChVvGScdz7yQm6kreIdHBhx+zeb6j5y4VfOkcNRp6CZ
 z3ggc3dWSQCKA0x46voqWkcl6bbu7R09ZmZ2FvGuPcOm0OAgHEoy7sSZ1nN9kXUg
 CANebWTIHR2Vpwdg/lRzgzhFk40Hjo1ts6Y3MwUZN8/6Nw1Fq+8=
 =bJ/L
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_fix_for_v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes

SoCFPGA fix for v5.17, part 1
- Fix a build error for socfpga_defconfig

* tag 'socfpga_fix_for_v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: fix missing RESET_CONTROLLER

Link: https://lore.kernel.org/r/20220207101002.7566-1-dinguyen@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-02-08 09:57:07 +01:00
Родитель d9058d6a0e 3037b174b1
Коммит 6efb9f739d
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -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