Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+29 -30
+2 -2
MAINTAINERS
··· 4009 4009 F: drivers/irqchip/irq-bcm63* 4010 4010 F: drivers/irqchip/irq-bcm7* 4011 4011 F: drivers/irqchip/irq-brcmstb* 4012 - F: drivers/soc/bcm/bcm63xx 4012 + F: drivers/genpd/bcm/bcm63xx-power.c 4013 4013 F: include/linux/bcm963xx_nvram.h 4014 4014 F: include/linux/bcm963xx_tag.h 4015 4015 ··· 4224 4224 L: linux-pm@vger.kernel.org 4225 4225 S: Maintained 4226 4226 T: git https://github.com/broadcom/stblinux.git 4227 - F: drivers/soc/bcm/bcm63xx/bcm-pmb.c 4227 + F: drivers/genpd/bcm/bcm-pmb.c 4228 4228 F: include/dt-bindings/soc/bcm-pmb.h 4229 4229 4230 4230 BROADCOM SPECIFIC AMBA DRIVER (BCMA)
+1
drivers/genpd/Makefile
··· 2 2 obj-y += actions/ 3 3 obj-y += amlogic/ 4 4 obj-y += apple/ 5 + obj-y += bcm/
+5
drivers/genpd/bcm/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0-only 2 + obj-$(CONFIG_BCM_PMB) += bcm-pmb.o 3 + obj-$(CONFIG_BCM2835_POWER) += bcm2835-power.o 4 + obj-$(CONFIG_BCM63XX_POWER) += bcm63xx-power.o 5 + obj-$(CONFIG_RASPBERRYPI_POWER) += raspberrypi-power.o
+21 -1
drivers/soc/bcm/Kconfig
··· 42 42 43 43 If unsure, say N. 44 44 45 - source "drivers/soc/bcm/bcm63xx/Kconfig" 45 + config BCM_PMB 46 + bool "Broadcom PMB (Power Management Bus) driver" 47 + depends on ARCH_BCMBCA || (COMPILE_TEST && OF) 48 + default ARCH_BCMBCA 49 + select PM_GENERIC_DOMAINS if PM 50 + help 51 + This enables support for the Broadcom's PMB (Power Management Bus) that 52 + is used for disabling and enabling SoC devices. 53 + 54 + if SOC_BCM63XX 55 + 56 + config BCM63XX_POWER 57 + bool "BCM63xx power domain driver" 58 + depends on BMIPS_GENERIC || (COMPILE_TEST && OF) 59 + select PM_GENERIC_DOMAINS if PM 60 + help 61 + This enables support for the BCM63xx power domains controller on 62 + BCM6318, BCM6328, BCM6362 and BCM63268 SoCs. 63 + 64 + endif # SOC_BCM63XX 65 + 46 66 source "drivers/soc/bcm/brcmstb/Kconfig" 47 67 48 68 endmenu
-3
drivers/soc/bcm/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - obj-$(CONFIG_BCM2835_POWER) += bcm2835-power.o 3 - obj-$(CONFIG_RASPBERRYPI_POWER) += raspberrypi-power.o 4 - obj-y += bcm63xx/ 5 2 obj-$(CONFIG_SOC_BRCMSTB) += brcmstb/
drivers/soc/bcm/bcm2835-power.c drivers/genpd/bcm/bcm2835-power.c
-21
drivers/soc/bcm/bcm63xx/Kconfig
··· 1 - # SPDX-License-Identifier: GPL-2.0-only 2 - if SOC_BCM63XX 3 - 4 - config BCM63XX_POWER 5 - bool "BCM63xx power domain driver" 6 - depends on BMIPS_GENERIC || (COMPILE_TEST && OF) 7 - select PM_GENERIC_DOMAINS if PM 8 - help 9 - This enables support for the BCM63xx power domains controller on 10 - BCM6318, BCM6328, BCM6362 and BCM63268 SoCs. 11 - 12 - endif # SOC_BCM63XX 13 - 14 - config BCM_PMB 15 - bool "Broadcom PMB (Power Management Bus) driver" 16 - depends on ARCH_BCMBCA || (COMPILE_TEST && OF) 17 - default ARCH_BCMBCA 18 - select PM_GENERIC_DOMAINS if PM 19 - help 20 - This enables support for the Broadcom's PMB (Power Management Bus) that 21 - is used for disabling and enabling SoC devices.
-3
drivers/soc/bcm/bcm63xx/Makefile
··· 1 - # SPDX-License-Identifier: GPL-2.0-only 2 - obj-$(CONFIG_BCM63XX_POWER) += bcm63xx-power.o 3 - obj-$(CONFIG_BCM_PMB) += bcm-pmb.o
drivers/soc/bcm/bcm63xx/bcm-pmb.c drivers/genpd/bcm/bcm-pmb.c
drivers/soc/bcm/bcm63xx/bcm63xx-power.c drivers/genpd/bcm/bcm63xx-power.c
drivers/soc/bcm/raspberrypi-power.c drivers/genpd/bcm/raspberrypi-power.c