mirror of
https://github.com/torvalds/linux
synced 2024-09-30 00:10:51 +00:00
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>
This commit is contained in:
parent
869b9dd333
commit
aded002384
|
@ -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)
|
||||
|
|
|
@ -2,3 +2,4 @@
|
|||
obj-y += actions/
|
||||
obj-y += amlogic/
|
||||
obj-y += apple/
|
||||
obj-y += bcm/
|
||||
|
|
5
drivers/genpd/bcm/Makefile
Normal file
5
drivers/genpd/bcm/Makefile
Normal file
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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.
|
|
@ -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
|
Loading…
Reference in a new issue