pmdomain: ti: Move and add Kconfig options to the pmdomain subsystem

The TI_SCI_PM_DOMAINS Kconfig option belongs closer to its corresponding
implementation, hence let's move it from the soc subsystem to the pmdomain
subsystem.

While at it, let's also add a Kconfig option the omap_prm driver, rather
than using ARCH_OMAP2PLUS directly.

Cc: Nishanth Menon <nm@ti.com>
Cc: Santosh Shilimkar <ssantosh@kernel.org>
Cc: Tero Kristo <kristo@kernel.org>
Cc: Tony Lindgren <tony@atomide.com>
Reviewed-by: Dhruva Gole <d-gole@ti.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/pmdomain/Kconfig b/drivers/pmdomain/Kconfig
index 98e04589bef4e2bac7b87914d31d0e95baa7d10e..33bfec9c4f7a6a6d55aa46bbc1892c38030f43d4 100644 (file)
--- a/drivers/pmdomain/Kconfig
+++ b/drivers/pmdomain/Kconfig
@@ -15,5 +15,6 @@ source "drivers/pmdomain/st/Kconfig"
 source "drivers/pmdomain/starfive/Kconfig"
 source "drivers/pmdomain/sunxi/Kconfig"
 source "drivers/pmdomain/tegra/Kconfig"
+source "drivers/pmdomain/ti/Kconfig"
 
 endmenu

diff --git a/drivers/pmdomain/ti/Kconfig b/drivers/pmdomain/ti/Kconfig
new file mode 100644 (file)
index 0000000..67c608b
--- /dev/null
+++ b/drivers/pmdomain/ti/Kconfig
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config OMAP2PLUS_PRM
+       bool
+       depends on ARCH_OMAP2PLUS
+       default ARCH_OMAP2PLUS
+
+if SOC_TI
+
+config TI_SCI_PM_DOMAINS
+       tristate "TI SCI PM Domains Driver"
+       depends on TI_SCI_PROTOCOL
+       depends on PM_GENERIC_DOMAINS
+       help
+         Generic power domain implementation for TI device implementing
+         the TI SCI protocol.
+
+         To compile this as a module, choose M here. The module will be
+         called ti_sci_pm_domains. Note this is needed early in boot before
+         rootfs may be available.
+
+endif

diff --git a/drivers/pmdomain/ti/Makefile b/drivers/pmdomain/ti/Makefile
index 69580afbb4366e1fcdfe5563e8dad02f48e308e5..af6cd056c1586e9a3753cf2d863a6b66d830e16c 100644 (file)
--- a/drivers/pmdomain/ti/Makefile
+++ b/drivers/pmdomain/ti/Makefile
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_ARCH_OMAP2PLUS)           += omap_prm.o
+obj-$(CONFIG_OMAP2PLUS_PRM)            += omap_prm.o
 obj-$(CONFIG_TI_SCI_PM_DOMAINS)                += ti_sci_pm_domains.o

diff --git a/drivers/soc/ti/Kconfig b/drivers/soc/ti/Kconfig
index 2cae17b65fd9306a48bccbaa147aaecbfdcbcd6b..1a93001c9e3672c93b5211daec4f780592fd5f61 100644 (file)
--- a/drivers/soc/ti/Kconfig
+++ b/drivers/soc/ti/Kconfig
@@ -50,18 +50,6 @@ config WKUP_M3_IPC
          to communicate and use the Wakeup M3 for PM features like suspend
          resume and boots it using wkup_m3_rproc driver.
 
-config TI_SCI_PM_DOMAINS
-       tristate "TI SCI PM Domains Driver"
-       depends on TI_SCI_PROTOCOL
-       depends on PM_GENERIC_DOMAINS
-       help
-         Generic power domain implementation for TI device implementing
-         the TI SCI protocol.
-
-         To compile this as a module, choose M here. The module will be
-         called ti_sci_pm_domains. Note this is needed early in boot before
-         rootfs may be available.
-
 config TI_K3_RINGACC
        tristate "K3 Ring accelerator Sub System"
        depends on ARCH_K3 || COMPILE_TEST