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.

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 6fb9453396dce64b00b7c0b9f35e072e4c392cb7..edf1558c110521e0f364b4079a720f441cecc6d8 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -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

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 44929d248bfaa8621bfaac2b0cd6d0fe4c179d5f..44e41250631786693c61009d1983ca75fd9b197f 100644 (file)
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -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/

diff --git a/drivers/acpi/pmic/Kconfig b/drivers/acpi/pmic/Kconfig
index 357d1a846e68b555dfda2d2ece64ae310fadc1fd..56bbcb2ce61b28ce254ca01c352dd048446cd77f 100644 (file)
--- a/drivers/acpi/pmic/Kconfig
+++ b/drivers/acpi/pmic/Kconfig
@@ -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.

diff --git a/drivers/acpi/pmic/Makefile b/drivers/acpi/pmic/Makefile
index 773c267420bc9e56cf99d5b1500e14b50fea9725..cd072c64920c66eccfcfdbbbe55e5711a8aa8acd 100644 (file)
--- a/drivers/acpi/pmic/Makefile
+++ b/drivers/acpi/pmic/Makefile
@@ -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