ACPI / PMIC: Split out Kconfig and Makefile specific for ACPI PMIC

It's a bit better to maintain and allows to avoid mistakes in the future
with PMIC OpRegion drivers, if we split out Kconfig and Makefile
for ACPI PMIC to its own folder.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 7540a51..6fb9453 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -504,55 +504,6 @@ config ACPI_EXTLOG
 config ACPI_ADXL
        bool
 
-menuconfig PMIC_OPREGION
-       bool "PMIC (Power Management Integrated Circuit) operation region support"
-       help
-         Select this option to enable support for ACPI operation
-         region of the PMIC chip. The operation region can be used
-         to control power rails and sensor reading/writing on the
-         PMIC chip.
-
-if PMIC_OPREGION
-config BYTCRC_PMIC_OPREGION
-       bool "ACPI operation region support for Bay Trail Crystal Cove PMIC"
-       depends on INTEL_SOC_PMIC
-       help
-         This config adds ACPI operation region support for the Bay Trail
-         version of the Crystal Cove PMIC.
-
-config CHTCRC_PMIC_OPREGION
-       bool "ACPI operation region support for Cherry Trail Crystal Cove PMIC"
-       depends on INTEL_SOC_PMIC
-       help
-         This config adds ACPI operation region support for the Cherry Trail
-         version of the Crystal Cove PMIC.
-
-config XPOWER_PMIC_OPREGION
-       bool "ACPI operation region support for XPower AXP288 PMIC"
-       depends on MFD_AXP20X_I2C && IOSF_MBI=y
-       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_BXTWC
-       help
-         This config adds ACPI operation region support for BXT WhiskeyCove PMIC.
-
-config CHT_WC_PMIC_OPREGION
-       bool "ACPI operation region support for CHT Whiskey Cove PMIC"
-       depends on INTEL_SOC_PMIC_CHTWC
-       help
-         This config adds ACPI operation region support for CHT Whiskey Cove PMIC.
-
-config CHT_DC_TI_PMIC_OPREGION
-       bool "ACPI operation region support for Dollar Cove TI PMIC"
-       depends on INTEL_SOC_PMIC_CHTDC_TI
-       help
-         This config adds ACPI operation region support for Dollar Cove TI PMIC.
-
-endif
-
 config ACPI_CONFIGFS
        tristate "ACPI configfs support"
        select CONFIGFS_FS
@@ -568,6 +519,8 @@ config ACPI_PPTT
        bool
 endif
 
+source "drivers/acpi/pmic/Kconfig"
+
 config TPS68470_PMIC_OPREGION
        bool "ACPI operation region support for TPS68470 PMIC"
        depends on MFD_TPS68470

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 9a95754..44929d2 100644 (file)
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -107,16 +107,9 @@ obj-$(CONFIG_ACPI_APEI)            += apei/
 
 obj-$(CONFIG_ACPI_EXTLOG)      += acpi_extlog.o
 
-obj-$(CONFIG_PMIC_OPREGION)    += pmic/intel_pmic.o
-obj-$(CONFIG_BYTCRC_PMIC_OPREGION) += pmic/intel_pmic_bytcrc.o
-obj-$(CONFIG_CHTCRC_PMIC_OPREGION) += pmic/intel_pmic_chtcrc.o
-obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o
-obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += pmic/intel_pmic_bxtwc.o
-obj-$(CONFIG_CHT_WC_PMIC_OPREGION) += pmic/intel_pmic_chtwc.o
-obj-$(CONFIG_CHT_DC_TI_PMIC_OPREGION) += pmic/intel_pmic_chtdc_ti.o
-
 obj-$(CONFIG_ACPI_CONFIGFS)    += acpi_configfs.o
 
+obj-y                          += pmic/
 obj-$(CONFIG_TPS68470_PMIC_OPREGION)   += pmic/tps68470_pmic.o
 
 video-objs                     += acpi_video.o video_detect.o

diff --git a/drivers/acpi/pmic/Kconfig b/drivers/acpi/pmic/Kconfig
new file mode 100644 (file)
index 0000000..357d1a8
--- /dev/null
+++ b/drivers/acpi/pmic/Kconfig
@@ -0,0 +1,51 @@
+# SPDX-License-Identifier: GPL-2.0
+
+menuconfig PMIC_OPREGION
+       bool "PMIC (Power Management Integrated Circuit) operation region support"
+       help
+         Select this option to enable support for ACPI operation
+         region of the PMIC chip. The operation region can be used
+         to control power rails and sensor reading/writing on the
+         PMIC chip.
+
+if PMIC_OPREGION
+
+config BYTCRC_PMIC_OPREGION
+       bool "ACPI operation region support for Bay Trail Crystal Cove PMIC"
+       depends on INTEL_SOC_PMIC
+       help
+         This config adds ACPI operation region support for the Bay Trail
+         version of the Crystal Cove PMIC.
+
+config CHTCRC_PMIC_OPREGION
+       bool "ACPI operation region support for Cherry Trail Crystal Cove PMIC"
+       depends on INTEL_SOC_PMIC
+       help
+         This config adds ACPI operation region support for the Cherry Trail
+         version of the Crystal Cove PMIC.
+
+config XPOWER_PMIC_OPREGION
+       bool "ACPI operation region support for XPower AXP288 PMIC"
+       depends on MFD_AXP20X_I2C && IOSF_MBI=y
+       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_BXTWC
+       help
+         This config adds ACPI operation region support for BXT WhiskeyCove PMIC.
+
+config CHT_WC_PMIC_OPREGION
+       bool "ACPI operation region support for CHT Whiskey Cove PMIC"
+       depends on INTEL_SOC_PMIC_CHTWC
+       help
+         This config adds ACPI operation region support for CHT Whiskey Cove PMIC.
+
+config CHT_DC_TI_PMIC_OPREGION
+       bool "ACPI operation region support for Dollar Cove TI PMIC"
+       depends on INTEL_SOC_PMIC_CHTDC_TI
+       help
+         This config adds ACPI operation region support for Dollar Cove TI PMIC.
+
+endif  # PMIC_OPREGION

diff --git a/drivers/acpi/pmic/Makefile b/drivers/acpi/pmic/Makefile
new file mode 100644 (file)
index 0000000..773c267
--- /dev/null
+++ b/drivers/acpi/pmic/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_PMIC_OPREGION)            += intel_pmic.o
+obj-$(CONFIG_BYTCRC_PMIC_OPREGION)     += intel_pmic_bytcrc.o
+obj-$(CONFIG_CHTCRC_PMIC_OPREGION)     += intel_pmic_chtcrc.o
+obj-$(CONFIG_XPOWER_PMIC_OPREGION)     += intel_pmic_xpower.o
+obj-$(CONFIG_BXT_WC_PMIC_OPREGION)     += intel_pmic_bxtwc.o
+obj-$(CONFIG_CHT_WC_PMIC_OPREGION)     += intel_pmic_chtwc.o
+obj-$(CONFIG_CHT_DC_TI_PMIC_OPREGION)  += intel_pmic_chtdc_ti.o