ACPI / PMIC: Split out Kconfig and Makefile specific for ACPI PMIC
Subsystems (2)
PATCH v2 1/2 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.
---
v2: fixed build error ([email protected])
drivers/acpi/Kconfig | 51 ++------------------------------------ drivers/acpi/Makefile | 9 +------ drivers/acpi/pmic/Kconfig | 51 ++++++++++++++++++++++++++++++++++++++ drivers/acpi/pmic/Makefile | 9 +++++++ 4 files changed, 63 insertions(+), 57 deletions(-) create mode 100644 drivers/acpi/pmic/Kconfig create mode 100644 drivers/acpi/pmic/Makefile
drivers/acpi/Kconfig +2 -49
@@ -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
drivers/acpi/Makefile +1 -8
@@ -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
drivers/acpi/pmic/Kconfig new file +51 -0
51 lines not on this page · raw message
drivers/acpi/pmic/Makefile new file +9 -0
@@ -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
Signature · 1 line
2.28.0
PATCH v2 2/2 ACPI / PMIC: Move TPS68470 OpRegion driver to drivers/acpi/pmic/
It is revealed now that TPS68470 OpRegion driver has been added in slightly different scope. Let's move it to the drivers/acpi/pmic/ folder for sake of the unification.
---
v2: fixed build error ([email protected])
drivers/acpi/Kconfig | 16 ---------------- drivers/acpi/Makefile | 1 - drivers/acpi/pmic/Kconfig | 16 ++++++++++++++++ drivers/acpi/pmic/Makefile | 1 + 4 files changed, 17 insertions(+), 17 deletions(-)
drivers/acpi/Kconfig +0 -16
@@ -521,22 +521,6 @@ endif source "drivers/acpi/pmic/Kconfig" -config TPS68470_PMIC_OPREGION - bool "ACPI operation region support for TPS68470 PMIC" - depends on MFD_TPS68470 - help - This config adds ACPI operation region support for TI TPS68470 PMIC. - TPS68470 device is an advanced power management unit that powers - a Compact Camera Module (CCM), generates clocks for image sensors, - drives a dual LED for flash and incorporates two LED drivers for - general purpose indicators. - This driver enables ACPI operation region support control voltage - regulators and clocks. - - This option is a bool as it provides an ACPI operation - region, which must be available before any of the devices - using this, are probed. - endif # ACPI config X86_PM_TIMER
drivers/acpi/Makefile +0 -1
@@ -110,7 +110,6 @@ obj-$(CONFIG_ACPI_EXTLOG) += acpi_extlog.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 obj-y += dptf/
drivers/acpi/pmic/Kconfig +16 -0
@@ -49,3 +49,19 @@ config CHT_DC_TI_PMIC_OPREGION This config adds ACPI operation region support for Dollar Cove TI PMIC. endif # PMIC_OPREGION + +config TPS68470_PMIC_OPREGION + bool "ACPI operation region support for TPS68470 PMIC" + depends on MFD_TPS68470 + help + This config adds ACPI operation region support for TI TPS68470 PMIC. + TPS68470 device is an advanced power management unit that powers + a Compact Camera Module (CCM), generates clocks for image sensors, + drives a dual LED for flash and incorporates two LED drivers for + general purpose indicators. + This driver enables ACPI operation region support control voltage + regulators and clocks. + + This option is a bool as it provides an ACPI operation + region, which must be available before any of the devices + using this, are probed.
drivers/acpi/pmic/Makefile +1 -0
@@ -7,3 +7,4 @@ 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 +obj-$(CONFIG_TPS68470_PMIC_OPREGION) += tps68470_pmic.o
Signature · 1 line
2.28.0
Re: [PATCH v2 2/2] ACPI / PMIC: Move TPS68470 OpRegion driver to drivers/acpi/pmic/
Quoted 5 lines · Andy Shevchenko
It is revealed now that TPS68470 OpRegion driver has been added in slightly different scope. Let's move it to the
drivers/acpi/pmic/folder for sake of the unification.Signed-off-by Andy Shevchenko <[email protected]>
Re: [PATCH v2 2/2] ACPI / PMIC: Move TPS68470 OpRegion driver to drivers/acpi/pmic/
Quoted 8 lines · Mika Westerberg
Quoted 5 lines · Andy Shevchenko
It is revealed now that TPS68470 OpRegion driver has been added in slightly different scope. Let's move it to the
drivers/acpi/pmic/folder for sake of the unification.Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Mika Westerberg <[email protected]>
Thanks!
Rafael, can we apply these?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 5 lines · Andy Shevchenko
It's a bit better to maintain and allows to avoid mistakes in the future with PMIC OpRegion drivers, if we split out
KconfigandMakefilefor ACPI PMIC to its own folder.Signed-off-by Andy Shevchenko <[email protected]>