Skip to content

Commit aded002

Browse files
committed
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 <[email protected]> Cc: Ray Jui <[email protected]> Cc: Scott Branden <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Signed-off-by: Ulf Hansson <[email protected]>
1 parent 869b9dd commit aded002

File tree

11 files changed

+29
-30
lines changed

11 files changed

+29
-30
lines changed

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4009,7 +4009,7 @@ F: arch/mips/kernel/*bmips*
40094009
F: drivers/irqchip/irq-bcm63*
40104010
F: drivers/irqchip/irq-bcm7*
40114011
F: drivers/irqchip/irq-brcmstb*
4012-
F: drivers/soc/bcm/bcm63xx
4012+
F: drivers/genpd/bcm/bcm63xx-power.c
40134013
F: include/linux/bcm963xx_nvram.h
40144014
F: include/linux/bcm963xx_tag.h
40154015

@@ -4224,7 +4224,7 @@ R: Broadcom internal kernel review list <[email protected]>
42244224
42254225
S: Maintained
42264226
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
42284228
F: include/dt-bindings/soc/bcm-pmb.h
42294229

42304230
BROADCOM SPECIFIC AMBA DRIVER (BCMA)

drivers/genpd/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
obj-y += actions/
33
obj-y += amlogic/
44
obj-y += apple/
5+
obj-y += bcm/

drivers/genpd/bcm/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
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
File renamed without changes.
File renamed without changes.

drivers/soc/bcm/Kconfig

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,27 @@ config SOC_BRCMSTB
4242

4343
If unsure, say N.
4444

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+
4666
source "drivers/soc/bcm/brcmstb/Kconfig"
4767

4868
endmenu

drivers/soc/bcm/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
# 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/
52
obj-$(CONFIG_SOC_BRCMSTB) += brcmstb/

drivers/soc/bcm/bcm63xx/Kconfig

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)