pmdomain: amlogic: Move Kconfig options to the pmdomain subsystem

The Kconfig options belongs closer to the corresponding implementations,
hence let's move them from the soc subsystem to the pmdomain subsystem.

Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: <linux-amlogic@lists.infradead.org>
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/pmdomain/Kconfig b/drivers/pmdomain/Kconfig
index e410c4b8071a6366aa66cda1b204ccecf7a61d61..03c8991ad0fd66bdbe46da3c742bbdc1411374e3 100644 (file)
--- a/drivers/pmdomain/Kconfig
+++ b/drivers/pmdomain/Kconfig
@@ -2,5 +2,6 @@
 menu "PM Domains"
 
 source "drivers/pmdomain/actions/Kconfig"
+source "drivers/pmdomain/amlogic/Kconfig"
 
 endmenu

diff --git a/drivers/pmdomain/amlogic/Kconfig b/drivers/pmdomain/amlogic/Kconfig
new file mode 100644 (file)
index 0000000..2108729
--- /dev/null
+++ b/drivers/pmdomain/amlogic/Kconfig
@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: GPL-2.0-only
+menu "Amlogic PM Domains"
+
+config MESON_GX_PM_DOMAINS
+       tristate "Amlogic Meson GX Power Domains driver"
+       depends on ARCH_MESON || COMPILE_TEST
+       depends on PM && OF
+       default ARCH_MESON
+       select PM_GENERIC_DOMAINS
+       select PM_GENERIC_DOMAINS_OF
+       help
+         Say yes to expose Amlogic Meson GX Power Domains as
+         Generic Power Domains.
+
+config MESON_EE_PM_DOMAINS
+       tristate "Amlogic Meson Everything-Else Power Domains driver"
+       depends on ARCH_MESON || COMPILE_TEST
+       depends on PM && OF
+       default ARCH_MESON
+       select PM_GENERIC_DOMAINS
+       select PM_GENERIC_DOMAINS_OF
+       help
+         Say yes to expose Amlogic Meson Everything-Else Power Domains as
+         Generic Power Domains.
+
+config MESON_SECURE_PM_DOMAINS
+       tristate "Amlogic Meson Secure Power Domains driver"
+       depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM
+       depends on PM && OF
+       depends on HAVE_ARM_SMCCC
+       default ARCH_MESON
+       select PM_GENERIC_DOMAINS
+       select PM_GENERIC_DOMAINS_OF
+       help
+         Support for the power controller on Amlogic A1/C1 series.
+         Say yes to expose Amlogic Meson Secure Power Domains as Generic
+         Power Domains.
+
+endmenu

diff --git a/drivers/soc/amlogic/Kconfig b/drivers/soc/amlogic/Kconfig
index 174a9b01146122870582e042ff96b7c51dd370d6..d08e398bdad48fa630669cc01c177f6cee497264 100644 (file)
--- a/drivers/soc/amlogic/Kconfig
+++ b/drivers/soc/amlogic/Kconfig
@@ -26,41 +26,6 @@ config MESON_GX_SOCINFO
          Say yes to support decoding of Amlogic Meson GX SoC family
          information about the type, package and version.
 
-config MESON_GX_PM_DOMAINS
-       tristate "Amlogic Meson GX Power Domains driver"
-       depends on ARCH_MESON || COMPILE_TEST
-       depends on PM && OF
-       default ARCH_MESON
-       select PM_GENERIC_DOMAINS
-       select PM_GENERIC_DOMAINS_OF
-       help
-         Say yes to expose Amlogic Meson GX Power Domains as
-         Generic Power Domains.
-
-config MESON_EE_PM_DOMAINS
-       tristate "Amlogic Meson Everything-Else Power Domains driver"
-       depends on ARCH_MESON || COMPILE_TEST
-       depends on PM && OF
-       default ARCH_MESON
-       select PM_GENERIC_DOMAINS
-       select PM_GENERIC_DOMAINS_OF
-       help
-         Say yes to expose Amlogic Meson Everything-Else Power Domains as
-         Generic Power Domains.
-
-config MESON_SECURE_PM_DOMAINS
-       tristate "Amlogic Meson Secure Power Domains driver"
-       depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM
-       depends on PM && OF
-       depends on HAVE_ARM_SMCCC
-       default ARCH_MESON
-       select PM_GENERIC_DOMAINS
-       select PM_GENERIC_DOMAINS_OF
-       help
-         Support for the power controller on Amlogic A1/C1 series.
-         Say yes to expose Amlogic Meson Secure Power Domains as Generic
-         Power Domains.
-
 config MESON_MX_SOCINFO
        bool "Amlogic Meson MX SoC Information driver"
        depends on (ARM && ARCH_MESON) || COMPILE_TEST