Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Andy Shevchenko and committed by
Rafael J. Wysocki
fa870509 856deb86

+63 -57
+2 -49
drivers/acpi/Kconfig
··· 504 504 config ACPI_ADXL 505 505 bool 506 506 507 - menuconfig PMIC_OPREGION 508 - bool "PMIC (Power Management Integrated Circuit) operation region support" 509 - help 510 - Select this option to enable support for ACPI operation 511 - region of the PMIC chip. The operation region can be used 512 - to control power rails and sensor reading/writing on the 513 - PMIC chip. 514 - 515 - if PMIC_OPREGION 516 - config BYTCRC_PMIC_OPREGION 517 - bool "ACPI operation region support for Bay Trail Crystal Cove PMIC" 518 - depends on INTEL_SOC_PMIC 519 - help 520 - This config adds ACPI operation region support for the Bay Trail 521 - version of the Crystal Cove PMIC. 522 - 523 - config CHTCRC_PMIC_OPREGION 524 - bool "ACPI operation region support for Cherry Trail Crystal Cove PMIC" 525 - depends on INTEL_SOC_PMIC 526 - help 527 - This config adds ACPI operation region support for the Cherry Trail 528 - version of the Crystal Cove PMIC. 529 - 530 - config XPOWER_PMIC_OPREGION 531 - bool "ACPI operation region support for XPower AXP288 PMIC" 532 - depends on MFD_AXP20X_I2C && IOSF_MBI=y 533 - help 534 - This config adds ACPI operation region support for XPower AXP288 PMIC. 535 - 536 - config BXT_WC_PMIC_OPREGION 537 - bool "ACPI operation region support for BXT WhiskeyCove PMIC" 538 - depends on INTEL_SOC_PMIC_BXTWC 539 - help 540 - This config adds ACPI operation region support for BXT WhiskeyCove PMIC. 541 - 542 - config CHT_WC_PMIC_OPREGION 543 - bool "ACPI operation region support for CHT Whiskey Cove PMIC" 544 - depends on INTEL_SOC_PMIC_CHTWC 545 - help 546 - This config adds ACPI operation region support for CHT Whiskey Cove PMIC. 547 - 548 - config CHT_DC_TI_PMIC_OPREGION 549 - bool "ACPI operation region support for Dollar Cove TI PMIC" 550 - depends on INTEL_SOC_PMIC_CHTDC_TI 551 - help 552 - This config adds ACPI operation region support for Dollar Cove TI PMIC. 553 - 554 - endif 555 - 556 507 config ACPI_CONFIGFS 557 508 tristate "ACPI configfs support" 558 509 select CONFIGFS_FS ··· 518 567 config ACPI_PPTT 519 568 bool 520 569 endif 570 + 571 + source "drivers/acpi/pmic/Kconfig" 521 572 522 573 config TPS68470_PMIC_OPREGION 523 574 bool "ACPI operation region support for TPS68470 PMIC"
+1 -8
drivers/acpi/Makefile
··· 107 107 108 108 obj-$(CONFIG_ACPI_EXTLOG) += acpi_extlog.o 109 109 110 - obj-$(CONFIG_PMIC_OPREGION) += pmic/intel_pmic.o 111 - obj-$(CONFIG_BYTCRC_PMIC_OPREGION) += pmic/intel_pmic_bytcrc.o 112 - obj-$(CONFIG_CHTCRC_PMIC_OPREGION) += pmic/intel_pmic_chtcrc.o 113 - obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o 114 - obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += pmic/intel_pmic_bxtwc.o 115 - obj-$(CONFIG_CHT_WC_PMIC_OPREGION) += pmic/intel_pmic_chtwc.o 116 - obj-$(CONFIG_CHT_DC_TI_PMIC_OPREGION) += pmic/intel_pmic_chtdc_ti.o 117 - 118 110 obj-$(CONFIG_ACPI_CONFIGFS) += acpi_configfs.o 119 111 112 + obj-y += pmic/ 120 113 obj-$(CONFIG_TPS68470_PMIC_OPREGION) += pmic/tps68470_pmic.o 121 114 122 115 video-objs += acpi_video.o video_detect.o
+51
drivers/acpi/pmic/Kconfig
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + 3 + menuconfig PMIC_OPREGION 4 + bool "PMIC (Power Management Integrated Circuit) operation region support" 5 + help 6 + Select this option to enable support for ACPI operation 7 + region of the PMIC chip. The operation region can be used 8 + to control power rails and sensor reading/writing on the 9 + PMIC chip. 10 + 11 + if PMIC_OPREGION 12 + 13 + config BYTCRC_PMIC_OPREGION 14 + bool "ACPI operation region support for Bay Trail Crystal Cove PMIC" 15 + depends on INTEL_SOC_PMIC 16 + help 17 + This config adds ACPI operation region support for the Bay Trail 18 + version of the Crystal Cove PMIC. 19 + 20 + config CHTCRC_PMIC_OPREGION 21 + bool "ACPI operation region support for Cherry Trail Crystal Cove PMIC" 22 + depends on INTEL_SOC_PMIC 23 + help 24 + This config adds ACPI operation region support for the Cherry Trail 25 + version of the Crystal Cove PMIC. 26 + 27 + config XPOWER_PMIC_OPREGION 28 + bool "ACPI operation region support for XPower AXP288 PMIC" 29 + depends on MFD_AXP20X_I2C && IOSF_MBI=y 30 + help 31 + This config adds ACPI operation region support for XPower AXP288 PMIC. 32 + 33 + config BXT_WC_PMIC_OPREGION 34 + bool "ACPI operation region support for BXT WhiskeyCove PMIC" 35 + depends on INTEL_SOC_PMIC_BXTWC 36 + help 37 + This config adds ACPI operation region support for BXT WhiskeyCove PMIC. 38 + 39 + config CHT_WC_PMIC_OPREGION 40 + bool "ACPI operation region support for CHT Whiskey Cove PMIC" 41 + depends on INTEL_SOC_PMIC_CHTWC 42 + help 43 + This config adds ACPI operation region support for CHT Whiskey Cove PMIC. 44 + 45 + config CHT_DC_TI_PMIC_OPREGION 46 + bool "ACPI operation region support for Dollar Cove TI PMIC" 47 + depends on INTEL_SOC_PMIC_CHTDC_TI 48 + help 49 + This config adds ACPI operation region support for Dollar Cove TI PMIC. 50 + 51 + endif # PMIC_OPREGION
+9
drivers/acpi/pmic/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + 3 + obj-$(CONFIG_PMIC_OPREGION) += intel_pmic.o 4 + obj-$(CONFIG_BYTCRC_PMIC_OPREGION) += intel_pmic_bytcrc.o 5 + obj-$(CONFIG_CHTCRC_PMIC_OPREGION) += intel_pmic_chtcrc.o 6 + obj-$(CONFIG_XPOWER_PMIC_OPREGION) += intel_pmic_xpower.o 7 + obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += intel_pmic_bxtwc.o 8 + obj-$(CONFIG_CHT_WC_PMIC_OPREGION) += intel_pmic_chtwc.o 9 + obj-$(CONFIG_CHT_DC_TI_PMIC_OPREGION) += intel_pmic_chtdc_ti.o