pmdomain: bcm: 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: Florian Fainelli <florian.fainelli@broadcom.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: <linux-mips@vger.kernel.org>
Cc: <linux-rpi-kernel@lists.infradead.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/pmdomain/Kconfig b/drivers/pmdomain/Kconfig
index 482d9e970e1470e53f0dfc995688684e69beb797..ddc05d6af10035b8636de4a6f11e1c28cace6daf 100644 (file)
--- a/drivers/pmdomain/Kconfig
+++ b/drivers/pmdomain/Kconfig
@@ -4,5 +4,6 @@ menu "PM Domains"
 source "drivers/pmdomain/actions/Kconfig"
 source "drivers/pmdomain/amlogic/Kconfig"
 source "drivers/pmdomain/apple/Kconfig"
+source "drivers/pmdomain/bcm/Kconfig"
 
 endmenu

diff --git a/drivers/pmdomain/bcm/Kconfig b/drivers/pmdomain/bcm/Kconfig
new file mode 100644 (file)
index 0000000..b28c9f6
--- /dev/null
+++ b/drivers/pmdomain/bcm/Kconfig
@@ -0,0 +1,42 @@
+# SPDX-License-Identifier: GPL-2.0-only
+menu "Broadcom PM Domains"
+
+config BCM2835_POWER
+       bool "BCM2835 power domain driver"
+       depends on ARCH_BCM2835 || (COMPILE_TEST && OF)
+       default y if ARCH_BCM2835
+       select PM_GENERIC_DOMAINS if PM
+       select RESET_CONTROLLER
+       help
+         This enables support for the BCM2835 power domains and reset
+         controller.  Any usage of power domains by the Raspberry Pi
+         firmware means that Linux usage of the same power domain
+         must be accessed using the RASPBERRYPI_POWER driver
+
+config RASPBERRYPI_POWER
+       bool "Raspberry Pi power domain driver"
+       depends on ARCH_BCM2835 || (COMPILE_TEST && OF)
+       depends on RASPBERRYPI_FIRMWARE=y
+       select PM_GENERIC_DOMAINS if PM
+       help
+         This enables support for the RPi power domains which can be enabled
+         or disabled via the RPi firmware.
+
+config BCM_PMB
+       bool "Broadcom PMB (Power Management Bus) driver"
+       depends on ARCH_BCMBCA || (COMPILE_TEST && OF)
+       default ARCH_BCMBCA
+       select PM_GENERIC_DOMAINS if PM
+       help
+         This enables support for the Broadcom's PMB (Power Management Bus) that
+         is used for disabling and enabling SoC devices.
+
+config BCM63XX_POWER
+       bool "BCM63xx power domain driver"
+       depends on BMIPS_GENERIC || (COMPILE_TEST && OF)
+       select PM_GENERIC_DOMAINS if PM
+       help
+         This enables support for the BCM63xx power domains controller on
+         BCM6318, BCM6328, BCM6362 and BCM63268 SoCs.
+
+endmenu

diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig
index f96906795fa6dd69a9e6c0ddd988ce2c36fbbbd8..1f5577cfd68c64b6a9da469a2d9fbeec45717d6e 100644 (file)
--- a/drivers/soc/bcm/Kconfig
+++ b/drivers/soc/bcm/Kconfig
@@ -1,36 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 menu "Broadcom SoC drivers"
 
-config BCM2835_POWER
-       bool "BCM2835 power domain driver"
-       depends on ARCH_BCM2835 || (COMPILE_TEST && OF)
-       default y if ARCH_BCM2835
-       select PM_GENERIC_DOMAINS if PM
-       select RESET_CONTROLLER
-       help
-         This enables support for the BCM2835 power domains and reset
-         controller.  Any usage of power domains by the Raspberry Pi
-         firmware means that Linux usage of the same power domain
-         must be accessed using the RASPBERRYPI_POWER driver
-
-config RASPBERRYPI_POWER
-       bool "Raspberry Pi power domain driver"
-       depends on ARCH_BCM2835 || (COMPILE_TEST && OF)
-       depends on RASPBERRYPI_FIRMWARE=y
-       select PM_GENERIC_DOMAINS if PM
-       help
-         This enables support for the RPi power domains which can be enabled
-         or disabled via the RPi firmware.
-
-config SOC_BCM63XX
-       bool "Broadcom 63xx SoC drivers"
-       depends on BMIPS_GENERIC || COMPILE_TEST
-       help
-         Enables drivers for the Broadcom 63xx series of chips.
-         Drivers can be enabled individually within this menu.
-
-         If unsure, say N.
-
 config SOC_BRCMSTB
        bool "Broadcom STB SoC drivers"
        depends on ARM || ARM64 || BMIPS_GENERIC || COMPILE_TEST
@@ -42,27 +12,6 @@ config SOC_BRCMSTB
 
          If unsure, say N.
 
-config BCM_PMB
-       bool "Broadcom PMB (Power Management Bus) driver"
-       depends on ARCH_BCMBCA || (COMPILE_TEST && OF)
-       default ARCH_BCMBCA
-       select PM_GENERIC_DOMAINS if PM
-       help
-         This enables support for the Broadcom's PMB (Power Management Bus) that
-         is used for disabling and enabling SoC devices.
-
-if SOC_BCM63XX
-
-config BCM63XX_POWER
-       bool "BCM63xx power domain driver"
-       depends on BMIPS_GENERIC || (COMPILE_TEST && OF)
-       select PM_GENERIC_DOMAINS if PM
-       help
-         This enables support for the BCM63xx power domains controller on
-         BCM6318, BCM6328, BCM6362 and BCM63268 SoCs.
-
-endif # SOC_BCM63XX
-
 source "drivers/soc/bcm/brcmstb/Kconfig"
 
 endmenu