Skip to content

Commit c66403f

Browse files
committed
Merge tag 'genpd-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm
Pull ARM SoC generic power domain driver updates from Ulf Hansson: "This adds a new subsystem for generic power domain providers in drivers/genpd and starts moving some of the corresponding code in there. We have currently ~60 users of the genpd provider interface, which are sprinkled across various subsystems. To release some burden from the soc maintainers (Arnd Bergmann, etc) in particular, but also to gain a better overall view of what goes on in the area, I will help out with maintenance" [ I find the "genpd" name singularly uninformative, so we'll probably end up moving this driver subsystem somewhere else, but that's still being discussed - Linus ] * tag 'genpd-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm: (30 commits) genpd: ti: Use for_each_node_with_property() simplify code logic genpd: Explicitly include correct DT includes genpd: imx: scu-pd: initialize is_off according to HW state genpd: imx: scu-pd: Suppress bind attrs genpd: imx: scu-pd: do not power off console if no_console_suspend genpd: imx: scu-pd: add more PDs genpd: imx: scu-pd: enlarge PD range genpd: imx: relocate scu-pd under genpd MAINTAINERS: adjust file entry in STARFIVE JH71XX PMU CONTROLLER DRIVER genpd: Makefile: build imx genpd: move owl-sps-helper.c from drivers/soc soc: starfive: remove stale Makefile entry ARM: ux500: Move power-domain driver to the genpd dir ARM: ux500: Convert power-domain code into a regular platform driver soc: xilinx: Move power-domain driver to the genpd dir soc: ti: Mover power-domain drivers to the genpd dir soc: tegra: Move powergate-bpmp driver to the genpd dir soc: sunxi: Move power-domain driver to the genpd dir soc: starfive: Move the power-domain driver to the genpd dir soc: samsung: Move power-domain driver to the genpd dir ...
2 parents 4fb0dac + 5e53636 commit c66403f

File tree

110 files changed

+288
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+288
-138
lines changed

MAINTAINERS

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1855,6 +1855,7 @@ F: Documentation/devicetree/bindings/phy/amlogic*
18551855
F: arch/arm/boot/dts/amlogic/
18561856
F: arch/arm/mach-meson/
18571857
F: arch/arm64/boot/dts/amlogic/
1858+
F: drivers/genpd/amlogic/
18581859
F: drivers/mmc/host/meson*
18591860
F: drivers/phy/amlogic/
18601861
F: drivers/pinctrl/meson/
@@ -1917,6 +1918,7 @@ F: drivers/bluetooth/hci_bcm4377.c
19171918
F: drivers/clk/clk-apple-nco.c
19181919
F: drivers/cpufreq/apple-soc-cpufreq.c
19191920
F: drivers/dma/apple-admac.c
1921+
F: drivers/genpd/apple/
19201922
F: drivers/i2c/busses/i2c-pasemi-core.c
19211923
F: drivers/i2c/busses/i2c-pasemi-platform.c
19221924
F: drivers/iommu/apple-dart.c
@@ -2433,6 +2435,7 @@ F: arch/arm/mach-ux500/
24332435
F: drivers/clk/clk-nomadik.c
24342436
F: drivers/clocksource/clksrc-dbx500-prcmu.c
24352437
F: drivers/dma/ste_dma40*
2438+
F: drivers/genpd/st/ste-ux500-pm-domain.c
24362439
F: drivers/hwspinlock/u8500_hsem.c
24372440
F: drivers/i2c/busses/i2c-nomadik.c
24382441
F: drivers/iio/adc/ab8500-gpadc.c
@@ -2605,6 +2608,7 @@ F: arch/arm/include/debug/renesas-scif.S
26052608
F: arch/arm/mach-shmobile/
26062609
F: arch/arm64/boot/dts/renesas/
26072610
F: arch/riscv/boot/dts/renesas/
2611+
F: drivers/genpd/renesas/
26082612
F: drivers/soc/renesas/
26092613
F: include/linux/soc/renesas/
26102614
K: \brenesas,
@@ -4032,7 +4036,7 @@ F: arch/mips/kernel/*bmips*
40324036
F: drivers/irqchip/irq-bcm63*
40334037
F: drivers/irqchip/irq-bcm7*
40344038
F: drivers/irqchip/irq-brcmstb*
4035-
F: drivers/soc/bcm/bcm63xx
4039+
F: drivers/genpd/bcm/bcm63xx-power.c
40364040
F: include/linux/bcm963xx_nvram.h
40374041
F: include/linux/bcm963xx_tag.h
40384042

@@ -4254,7 +4258,7 @@ R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
42544258
L: linux-pm@vger.kernel.org
42554259
S: Maintained
42564260
T: git https://github.com/broadcom/stblinux.git
4257-
F: drivers/soc/bcm/bcm63xx/bcm-pmb.c
4261+
F: drivers/genpd/bcm/bcm-pmb.c
42584262
F: include/dt-bindings/soc/bcm-pmb.h
42594263

42604264
BROADCOM SPECIFIC AMBA DRIVER (BCMA)
@@ -8712,6 +8716,13 @@ F: Documentation/devicetree/bindings/power/power?domain*
87128716
F: drivers/base/power/domain*.c
87138717
F: include/linux/pm_domain.h
87148718

8719+
GENERIC PM DOMAIN PROVIDERS
8720+
M: Ulf Hansson <ulf.hansson@linaro.org>
8721+
L: linux-pm@vger.kernel.org
8722+
S: Supported
8723+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
8724+
F: drivers/genpd/
8725+
87158726
GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
87168727
M: Eugen Hristev <eugen.hristev@microchip.com>
87178728
L: linux-input@vger.kernel.org
@@ -17611,7 +17622,7 @@ L: linux-pm@vger.kernel.org
1761117622
L: linux-arm-msm@vger.kernel.org
1761217623
S: Maintained
1761317624
F: Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
17614-
F: drivers/soc/qcom/cpr.c
17625+
F: drivers/genpd/qcom/cpr.c
1761517626

1761617627
QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
1761717628
M: Ilia Lin <ilia.lin@kernel.org>
@@ -20394,7 +20405,7 @@ STARFIVE JH71XX PMU CONTROLLER DRIVER
2039420405
M: Walker Chen <walker.chen@starfivetech.com>
2039520406
S: Supported
2039620407
F: Documentation/devicetree/bindings/power/starfive*
20397-
F: drivers/soc/starfive/jh71xx_pmu.c
20408+
F: drivers/genpd/starfive/jh71xx-pmu.c
2039820409
F: include/dt-bindings/power/starfive,jh7110-pmu.h
2039920410

2040020411
STARFIVE SOC DRIVERS
@@ -21210,7 +21221,7 @@ F: drivers/irqchip/irq-ti-sci-inta.c
2121021221
F: drivers/irqchip/irq-ti-sci-intr.c
2121121222
F: drivers/reset/reset-ti-sci.c
2121221223
F: drivers/soc/ti/ti_sci_inta_msi.c
21213-
F: drivers/soc/ti/ti_sci_pm_domains.c
21224+
F: drivers/genpd/ti/ti_sci_pm_domains.c
2121421225
F: include/dt-bindings/soc/ti,sci_pm_domain.h
2121521226
F: include/linux/soc/ti/ti_sci_inta_msi.h
2121621227
F: include/linux/soc/ti/ti_sci_protocol.h
@@ -21444,6 +21455,7 @@ L: linux-kernel@vger.kernel.org
2144421455
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2144521456
S: Maintained
2144621457
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
21458+
F: drivers/genpd/ti/omap_prm.c
2144721459
F: drivers/soc/ti/*
2144821460

2144921461
TI LM49xxx FAMILY ASoC CODEC DRIVERS

arch/arm/mach-ux500/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@
66
obj-y := pm.o
77
obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o
88
obj-$(CONFIG_SMP) += platsmp.o
9-
obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o

arch/arm/mach-ux500/cpu-db8500.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
#include <asm/mach/map.h>
2727
#include <asm/mach/arch.h>
2828

29-
#include "pm_domains.h"
30-
3129
static int __init ux500_l2x0_unlock(void)
3230
{
3331
int i;
@@ -115,9 +113,6 @@ static const struct of_device_id u8500_local_bus_nodes[] = {
115113

116114
static void __init u8500_init_machine(void)
117115
{
118-
/* Initialize ux500 power domains */
119-
ux500_pm_domains_init();
120-
121116
of_platform_populate(NULL, u8500_local_bus_nodes,
122117
NULL, NULL);
123118
}

arch/arm/mach-ux500/pm_domains.h

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

drivers/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ obj-$(CONFIG_DMADEVICES) += dma/
4545

4646
# SOC specific infrastructure drivers.
4747
obj-y += soc/
48+
obj-$(CONFIG_PM_GENERIC_DOMAINS) += genpd/
4849

4950
obj-y += virtio/
5051
obj-$(CONFIG_VDPA) += vdpa/

drivers/firmware/imx/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0
22
obj-$(CONFIG_IMX_DSP) += imx-dsp.o
33
obj-$(CONFIG_IMX_SCU) += imx-scu.o misc.o imx-scu-irq.o rm.o imx-scu-soc.o
4-
obj-$(CONFIG_IMX_SCU_PD) += scu-pd.o

drivers/genpd/Makefile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
obj-y += actions/
3+
obj-y += amlogic/
4+
obj-y += apple/
5+
obj-y += bcm/
6+
obj-y += imx/
7+
obj-y += mediatek/
8+
obj-y += qcom/
9+
obj-y += renesas/
10+
obj-y += rockchip/
11+
obj-y += samsung/
12+
obj-y += st/
13+
obj-y += starfive/
14+
obj-y += sunxi/
15+
obj-y += tegra/
16+
obj-y += ti/
17+
obj-y += xilinx/

drivers/genpd/actions/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0+
2+
obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o
3+
obj-$(CONFIG_OWL_PM_DOMAINS) += owl-sps.o
File renamed without changes.

0 commit comments

Comments
 (0)