projects
/
linux
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'drm/drm-next'
[linux]
/
drivers
/
acpi
/
pmic
/
intel_pmic_xpower.c
diff --git
a/drivers/acpi/pmic/intel_pmic_xpower.c
b/drivers/acpi/pmic/intel_pmic_xpower.c
index
e7c0006
..
a091d5a
100644
(file)
--- a/
drivers/acpi/pmic/intel_pmic_xpower.c
+++ b/
drivers/acpi/pmic/intel_pmic_xpower.c
@@
-265,6
+265,7
@@
static struct intel_pmic_opregion_data intel_xpower_pmic_opregion_data = {
.power_table_count = ARRAY_SIZE(power_table),
.thermal_table = thermal_table,
.thermal_table_count = ARRAY_SIZE(thermal_table),
+ .pmic_i2c_address = 0x34,
};
static acpi_status intel_xpower_pmic_gpio_handler(u32 function,