diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-21 10:42:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-21 10:42:35 -0800 |
| commit | 5100b6f9e7bfc520e8129a5042a4bdd7dd486df6 (patch) | |
| tree | e1dfd4ccc0268f8fc23a8c95560270ea2178850d | |
| parent | baa172c77ac52b2058ba3abae7512b7b16d0c461 (diff) | |
| parent | 0674188f2f4d38d74aa863f17373d76256f2ed09 (diff) | |
| download | linux-5100b6f9e7bfc520e8129a5042a4bdd7dd486df6.tar.gz linux-5100b6f9e7bfc520e8129a5042a4bdd7dd486df6.tar.bz2 linux-5100b6f9e7bfc520e8129a5042a4bdd7dd486df6.zip | |
Merge tag 'acpi-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"Unbreak ACPI EC support on LoongArch that has been broken earlier in
this development cycle (Huacai Chen)"
* tag 'acpi-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: EC: Enable EC support on LoongArch by default
| -rw-r--r-- | drivers/acpi/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/platform/loongarch/Kconfig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index d65cd08ba8e1..d81b55f5068c 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -135,10 +135,10 @@ config ACPI_REV_OVERRIDE_POSSIBLE config ACPI_EC bool "Embedded Controller" depends on HAS_IOPORT - default X86 + default X86 || LOONGARCH help This driver handles communication with the microcontroller - on many x86 laptops and other machines. + on many x86/LoongArch laptops and other machines. config ACPI_EC_DEBUGFS tristate "EC read/write access through /sys/kernel/debug/ec" diff --git a/drivers/platform/loongarch/Kconfig b/drivers/platform/loongarch/Kconfig index 5633e4d73991..447528797d07 100644 --- a/drivers/platform/loongarch/Kconfig +++ b/drivers/platform/loongarch/Kconfig @@ -18,7 +18,7 @@ if LOONGARCH_PLATFORM_DEVICES config LOONGSON_LAPTOP tristate "Generic Loongson-3 Laptop Driver" - depends on ACPI + depends on ACPI_EC depends on BACKLIGHT_CLASS_DEVICE depends on INPUT depends on MACH_LOONGSON64 |