Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c870e61 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Will Deacon
Browse files

arm64: fix ACPI dependencies 



Kconfig reports a warning on x86 builds after the ARM64 dependency
was added.

drivers/acpi/Kconfig:6:error: recursive dependency detected!
drivers/acpi/Kconfig:6:       symbol ACPI depends on EFI

This rephrases the dependency to keep the ARM64 details out of the
shared Kconfig file, so Kconfig no longer gets confused by it.

For consistency, all three architectures that support ACPI now
select ARCH_SUPPORTS_ACPI in exactly the configuration in which
they allow it. We still need the 'default x86', as each one
wants a different default: default-y on x86, default-n on arm64,
and always-y on ia64.

Fixes: 5bcd4408 ("drivers: acpi: add dependency of EFI for arm64")
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent b9657463

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1262,6 +1262,7 @@ config EFI 
	bool "UEFI runtime support"

	depends on OF && !CPU_BIG_ENDIAN

	depends on KERNEL_MODE_NEON

	select ARCH_SUPPORTS_ACPI

	select LIBFDT

	select UCS2_STRING

	select EFI_PARAMS_FROM_FDT

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config IA64 
	select ARCH_MIGHT_HAVE_PC_SERIO

	select PCI if (!IA64_HP_SIM)

	select ACPI if (!IA64_HP_SIM)

	select ARCH_SUPPORTS_ACPI if (!IA64_HP_SIM)

	select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI

	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI

	select HAVE_UNSTABLE_SCHED_CLOCK

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ config X86 
	select ARCH_MIGHT_HAVE_ACPI_PDC		if ACPI

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ARCH_SUPPORTS_ACPI

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_NUMA_BALANCING	if X86_64

	select ARCH_USE_BUILTIN_BSWAP

drivers/acpi/Kconfig

+5 −3
Original line number Diff line number Diff line
@@ -5,11 +5,10 @@ 


menuconfig ACPI

	bool "ACPI (Advanced Configuration and Power Interface) Support"

	depends on !IA64_HP_SIM

	depends on IA64 || X86 || (ARM64 && EFI)

	depends on ARCH_SUPPORTS_ACPI

	depends on PCI

	select PNP

	default y if (IA64 || X86)

	default y if X86

	help

	  Advanced Configuration and Power Interface (ACPI) support for 

	  Linux requires an ACPI-compliant platform (hardware/firmware),
@@ -41,6 +40,9 @@ menuconfig ACPI 
	  <http://www.acpi.info>

	  <http://www.uefi.org/acpi/specs>



config ARCH_SUPPORTS_ACPI

	bool



if ACPI



config ACPI_LEGACY_TABLES_LOOKUP