diff mbox series

[v2,2/2] ACPI / PMIC: Move TPS68470 OpRegion driver to drivers/acpi/pmic/

Message ID 20200814132726.11456-2-andriy.shevchenko@linux.intel.com (mailing list archive)
State Mainlined, archived
Headers show
Series [v2,1/2] ACPI / PMIC: Split out Kconfig and Makefile specific for ACPI PMIC | expand

Commit Message

Andy Shevchenko Aug. 14, 2020, 1:27 p.m. UTC 
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>
---
v2: fixed build error (lkp@intel.com)

 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(-)

Comments

Mika Westerberg Aug. 17, 2020, 10:35 a.m. UTC | #1 
On Fri, Aug 14, 2020 at 04:27:26PM +0300, Andy Shevchenko wrote:
> 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>
Andy Shevchenko Aug. 27, 2020, 11:45 a.m. UTC | #2 
On Mon, Aug 17, 2020 at 01:35:25PM +0300, Mika Westerberg wrote:
> On Fri, Aug 14, 2020 at 04:27:26PM +0300, Andy Shevchenko wrote:
> > 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>

Thanks!
Rafael, can we apply these?
diff mbox series

Patch

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 6fb9453396dc..edf1558c1105 100644
--- 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 44929d248bfa..44e412506317 100644
--- 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 357d1a846e68..56bbcb2ce61b 100644
--- 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 773c267420bc..cd072c64920c 100644
--- 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