git.codelabs.ch
/
muen
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'acpi-extra-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[muen/linux.git]
/
drivers
/
acpi
/
acpi_apd.c
diff --git
a/drivers/acpi/acpi_apd.c
b/drivers/acpi/acpi_apd.c
index
8f57648
..
fc6c416
100644
(file)
--- a/
drivers/acpi/acpi_apd.c
+++ b/
drivers/acpi/acpi_apd.c
@@
-179,6
+179,7
@@
static const struct acpi_device_id acpi_apd_device_ids[] = {
#ifdef CONFIG_ARM64
{ "APMC0D0F", APD_ADDR(xgene_i2c_desc) },
{ "BRCM900D", APD_ADDR(vulcan_spi_desc) },
+ { "CAV900D", APD_ADDR(vulcan_spi_desc) },
{ "HISI0A21", APD_ADDR(hip07_i2c_desc) },
{ "HISI0A22", APD_ADDR(hip08_i2c_desc) },
#endif