soc: bcm: Move power-domain drivers to the genpd dir

To simplify with maintenance let's move the bcm power-domain drivers to the
new genpd directory. Going forward, patches are intended to be managed
through a separate git tree, according to MAINTAINERS.

While moving the drivers, we end up with a directory for bcm63xx that only
contains a Kconfig file, which seems a bit silly. Let's therefore also move
the Kconfig options into the Kconfig file a directory above, as it allows
us to drop the directory too.

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>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index caa221fd0c11f24c9954cd9fdf04b1fc7f175820..77629ab4a5f0adf1fbfa4096dbf95db5dc9a6fef 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4009,7 +4009,7 @@ F:        arch/mips/kernel/*bmips*
 F:     drivers/irqchip/irq-bcm63*
 F:     drivers/irqchip/irq-bcm7*
 F:     drivers/irqchip/irq-brcmstb*
-F:     drivers/soc/bcm/bcm63xx
+F:     drivers/genpd/bcm/bcm63xx-power.c
 F:     include/linux/bcm963xx_nvram.h
 F:     include/linux/bcm963xx_tag.h
 
@@ -4224,7 +4224,7 @@ R:        Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 T:     git https://github.com/broadcom/stblinux.git
-F:     drivers/soc/bcm/bcm63xx/bcm-pmb.c
+F:     drivers/genpd/bcm/bcm-pmb.c
 F:     include/dt-bindings/soc/bcm-pmb.h
 
 BROADCOM SPECIFIC AMBA DRIVER (BCMA)

diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile
index 91d4a3808981dec4a8fa7b7a5ac9ac4e5a85aeb9..6b9e9fe907f37a873a305d99edf7f425f72cdc7d 100644 (file)
--- a/drivers/genpd/Makefile
+++ b/drivers/genpd/Makefile
@@ -2,3 +2,4 @@
 obj-y                                  += actions/
 obj-y                                  += amlogic/
 obj-y                                  += apple/
+obj-y                                  += bcm/

diff --git a/drivers/genpd/bcm/Makefile b/drivers/genpd/bcm/Makefile
new file mode 100644 (file)
index 0000000..6bfbe4e
--- /dev/null
+++ b/drivers/genpd/bcm/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_BCM_PMB)                  += bcm-pmb.o
+obj-$(CONFIG_BCM2835_POWER)            += bcm2835-power.o
+obj-$(CONFIG_BCM63XX_POWER)            += bcm63xx-power.o
+obj-$(CONFIG_RASPBERRYPI_POWER)                += raspberrypi-power.o

diff --git a/drivers/soc/bcm/bcm63xx/bcm-pmb.c b/drivers/genpd/bcm/bcm-pmb.c
similarity index 100%
rename from drivers/soc/bcm/bcm63xx/bcm-pmb.c
rename to drivers/genpd/bcm/bcm-pmb.c

diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/genpd/bcm/bcm2835-power.c
similarity index 100%
rename from drivers/soc/bcm/bcm2835-power.c
rename to drivers/genpd/bcm/bcm2835-power.c

diff --git a/drivers/soc/bcm/bcm63xx/bcm63xx-power.c b/drivers/genpd/bcm/bcm63xx-power.c
similarity index 100%
rename from drivers/soc/bcm/bcm63xx/bcm63xx-power.c
rename to drivers/genpd/bcm/bcm63xx-power.c

diff --git a/drivers/soc/bcm/raspberrypi-power.c b/drivers/genpd/bcm/raspberrypi-power.c
similarity index 100%
rename from drivers/soc/bcm/raspberrypi-power.c
rename to drivers/genpd/bcm/raspberrypi-power.c

diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig
index 24f92a6e882afcc5505f53bc0205befa0d382c15..f96906795fa6dd69a9e6c0ddd988ce2c36fbbbd8 100644 (file)
--- a/drivers/soc/bcm/Kconfig
+++ b/drivers/soc/bcm/Kconfig
@@ -42,7 +42,27 @@ config SOC_BRCMSTB
 
          If unsure, say N.
 
-source "drivers/soc/bcm/bcm63xx/Kconfig"
+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

diff --git a/drivers/soc/bcm/Makefile b/drivers/soc/bcm/Makefile
index 0f0efa28d92b7fb6f3bdd9bf00506396113c8497..32424b1032c7ba10be5a7898db9da8c48aa65649 100644 (file)
--- a/drivers/soc/bcm/Makefile
+++ b/drivers/soc/bcm/Makefile
@@ -1,5 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_BCM2835_POWER)    += bcm2835-power.o
-obj-$(CONFIG_RASPBERRYPI_POWER)        += raspberrypi-power.o
-obj-y                          += bcm63xx/
 obj-$(CONFIG_SOC_BRCMSTB)      += brcmstb/

diff --git a/drivers/soc/bcm/bcm63xx/Kconfig b/drivers/soc/bcm/bcm63xx/Kconfig
deleted file mode 100644 (file)
index 355c344..0000000
--- a/drivers/soc/bcm/bcm63xx/Kconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-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
-
-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.

diff --git a/drivers/soc/bcm/bcm63xx/Makefile b/drivers/soc/bcm/bcm63xx/Makefile
deleted file mode 100644 (file)
index 557eed3..0000000
--- a/drivers/soc/bcm/bcm63xx/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_BCM63XX_POWER) += bcm63xx-power.o
-obj-$(CONFIG_BCM_PMB)          += bcm-pmb.o