From: Rafael J. Wysocki Date: Mon, 25 Jul 2016 11:42:48 +0000 (+0200) Subject: Merge branch 'acpi-pmic' X-Git-Tag: v4.8-rc1~157^2~1 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=273b5a4836966eb192af9d01d0cdef2e30585864 Merge branch 'acpi-pmic' * acpi-pmic: ACPI / PMIC: remove modular references from non-modular code ACPI / PMIC: intel: initialize result to 0 ACPI / PMIC: intel: add REGS operation region support ACPI / PMIC: Add opregion driver for Intel BXT WhiskeyCove PMIC ACPI / PMIC: modify the pen function signature to take bit field Conflicts: drivers/acpi/Makefile --- 273b5a4836966eb192af9d01d0cdef2e30585864 diff --cc drivers/acpi/Kconfig index 8e27d161049f,47cb6f65b247..7d180690c804 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@@ -526,14 -519,12 +526,20 @@@ config XPOWER_PMIC_OPREGIO help This config adds ACPI operation region support for XPower AXP288 PMIC. + config BXT_WC_PMIC_OPREGION + bool "ACPI operation region support for BXT WhiskeyCove PMIC" + depends on INTEL_SOC_PMIC + help + This config adds ACPI operation region support for BXT WhiskeyCove PMIC. + endif +config ACPI_CONFIGFS + tristate "ACPI configfs support" + select CONFIGFS_FS + help + Select this option to enable support for ACPI configuration from + userspace. The configurable ACPI groups will be visible under + /config/acpi, assuming configfs is mounted under /config. + endif # ACPI diff --cc drivers/acpi/Makefile index f72a83df1cf3,5da9d4b8f23f..5b271f492be3 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@@ -99,6 -99,6 +99,8 @@@ obj-$(CONFIG_ACPI_EXTLOG) += acpi_extlo obj-$(CONFIG_PMIC_OPREGION) += pmic/intel_pmic.o obj-$(CONFIG_CRC_PMIC_OPREGION) += pmic/intel_pmic_crc.o obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o + obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += pmic/intel_pmic_bxtwc.o + +obj-$(CONFIG_ACPI_CONFIGFS) += acpi_configfs.o + video-objs += acpi_video.o video_detect.o