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

diff --combined drivers/acpi/Kconfig
index 8e27d16,47cb6f6..7d18069
--- 1/drivers/acpi/Kconfig
--- 2/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@ -213,10 -213,6 +213,10 @@@ config ACPI_CPU_FREQ_PS
        bool
        select THERMAL
  
 +config ACPI_PROCESSOR_CSTATE
 +      def_bool y
 +      depends on IA64 || X86
 +
  config ACPI_PROCESSOR_IDLE
        bool
        select CPU_IDLE
@@@ -238,7 -234,7 +238,7 @@@ config ACPI_CPPC_LI
  config ACPI_PROCESSOR
        tristate "Processor"
        depends on X86 || IA64 || ARM64
 -      select ACPI_PROCESSOR_IDLE if X86 || IA64
 +      select ACPI_PROCESSOR_IDLE
        select ACPI_CPU_FREQ_PSS if X86 || IA64
        default y
        help
@@@ -295,8 -291,8 +295,8 @@@ config ACPI_THERMA
  config ACPI_NUMA
        bool "NUMA support"
        depends on NUMA
 -      depends on (X86 || IA64)
 -      default y if IA64_GENERIC || IA64_SGI_SN2
 +      depends on (X86 || IA64 || ARM64)
 +      default y if IA64_GENERIC || IA64_SGI_SN2 || ARM64
  
  config ACPI_CUSTOM_DSDT_FILE
        string "Custom DSDT Table file to include"
@@@ -315,12 -311,9 +315,12 @@@ config ACPI_CUSTOM_DSD
        bool
        default ACPI_CUSTOM_DSDT_FILE != ""
  
 +config ARCH_HAS_ACPI_TABLE_UPGRADE
 +      def_bool n
 +
  config ACPI_TABLE_UPGRADE
        bool "Allow upgrading ACPI tables via initrd"
 -      depends on BLK_DEV_INITRD && X86
 +      depends on BLK_DEV_INITRD && ARCH_HAS_ACPI_TABLE_UPGRADE
        default y
        help
          This option provides functionality to upgrade arbitrary ACPI tables
@@@ -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 --combined drivers/acpi/Makefile
index f72a83d,5da9d4b..5b271f4
--- 1/drivers/acpi/Makefile
--- 2/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