Unverified Commit b2162363 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'genpd_create_dir' of... 

Merge branch 'genpd_create_dir' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm into soc/drivers

* 'genpd_create_dir' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm:
  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
  soc: rockchip: Mover power-domain driver to the genpd dir
  soc: renesas: Move power-domain drivers to the genpd dir
  soc: qcom: Move power-domain drivers to the genpd dir
  soc: mediatek: Move power-domain drivers to the genpd dir
  soc: imx: Move power-domain drivers to the genpd dir
  soc: bcm: Move power-domain drivers to the genpd dir
  soc: apple: Move power-domain driver to the genpd dir
  soc: amlogic: Move power-domain drivers to the genpd dir
  soc: actions: Move power-domain driver to the genpd dir
  genpd: Create a new subsystem directory to host genpd providers

Link: https://lore.kernel.org/r/20230714092301.28690-1-ulf.hansson@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fdf0eaf1 b43f11e5

MAINTAINERS

+17 −5
Original line number Diff line number Diff line
@@ -1843,6 +1843,7 @@ F: Documentation/devicetree/bindings/phy/amlogic* 
F:	arch/arm/boot/dts/amlogic/

F:	arch/arm/mach-meson/

F:	arch/arm64/boot/dts/amlogic/

F:	drivers/genpd/amlogic/

F:	drivers/mmc/host/meson*

F:	drivers/phy/amlogic/

F:	drivers/pinctrl/meson/
@@ -1903,6 +1904,7 @@ F: drivers/bluetooth/hci_bcm4377.c 
F:	drivers/clk/clk-apple-nco.c

F:	drivers/cpufreq/apple-soc-cpufreq.c

F:	drivers/dma/apple-admac.c

F:	drivers/genpd/apple/

F:	drivers/i2c/busses/i2c-pasemi-core.c

F:	drivers/i2c/busses/i2c-pasemi-platform.c

F:	drivers/iommu/apple-dart.c
@@ -2419,6 +2421,7 @@ F: arch/arm/mach-ux500/ 
F:	drivers/clk/clk-nomadik.c

F:	drivers/clocksource/clksrc-dbx500-prcmu.c

F:	drivers/dma/ste_dma40*

F:	drivers/genpd/st/ste-ux500-pm-domain.c

F:	drivers/hwspinlock/u8500_hsem.c

F:	drivers/i2c/busses/i2c-nomadik.c

F:	drivers/iio/adc/ab8500-gpadc.c
@@ -2591,6 +2594,7 @@ F: arch/arm/include/debug/renesas-scif.S 
F:	arch/arm/mach-shmobile/

F:	arch/arm64/boot/dts/renesas/

F:	arch/riscv/boot/dts/renesas/

F:	drivers/genpd/renesas/

F:	drivers/soc/renesas/

F:	include/linux/soc/renesas/

K:	\brenesas,
@@ -4007,7 +4011,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








@@ -4229,7 +4233,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)








@@ -8672,6 +8676,13 @@ F:	Documentation/devicetree/bindings/power/power?domain*







F:	drivers/base/power/domain*.c









F:	include/linux/pm_domain.h

















GENERIC PM DOMAIN PROVIDERS









M:	Ulf Hansson <ulf.hansson@linaro.org>









L:	linux-pm@vger.kernel.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git









F:	drivers/genpd/

















GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER









M:	Eugen Hristev <eugen.hristev@microchip.com>









L:	linux-input@vger.kernel.org








@@ -17525,7 +17536,7 @@ L:	linux-pm@vger.kernel.org







L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml









F:	drivers/soc/qcom/cpr.c









F:	drivers/genpd/qcom/cpr.c

















QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096









M:	Ilia Lin <ilia.lin@kernel.org>








@@ -20324,7 +20335,7 @@ STARFIVE JH71XX PMU CONTROLLER DRIVER







M:	Walker Chen <walker.chen@starfivetech.com>









S:	Supported









F:	Documentation/devicetree/bindings/power/starfive*









F:	drivers/soc/starfive/jh71xx_pmu.c









F:	drivers/genpd/starfive/jh71xx_pmu.c









F:	include/dt-bindings/power/starfive,jh7110-pmu.h

















STARFIVE SOC DRIVERS








@@ -21108,7 +21119,7 @@ F:	drivers/irqchip/irq-ti-sci-inta.c







F:	drivers/irqchip/irq-ti-sci-intr.c









F:	drivers/reset/reset-ti-sci.c









F:	drivers/soc/ti/ti_sci_inta_msi.c









F:	drivers/soc/ti/ti_sci_pm_domains.c









F:	drivers/genpd/ti/ti_sci_pm_domains.c









F:	include/dt-bindings/soc/ti,sci_pm_domain.h









F:	include/linux/soc/ti/ti_sci_inta_msi.h









F:	include/linux/soc/ti/ti_sci_protocol.h








@@ -21342,6 +21353,7 @@ L:	linux-kernel@vger.kernel.org







L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git









F:	drivers/genpd/ti/omap_prm.c









F:	drivers/soc/ti/*

















TI LM49xxx FAMILY ASoC CODEC DRIVERS

























arch/arm/mach-ux500/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -6,4 +6,3 @@







obj-y				:= pm.o









obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o









obj-$(CONFIG_SMP)		+= platsmp.o








obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
























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



+0
−5






























Original line number
Diff line number
Diff line







@@ -26,8 +26,6 @@







#include <asm/mach/map.h>









#include <asm/mach/arch.h>



















#include "pm_domains.h"



















static int __init ux500_l2x0_unlock(void)









{









	int i;








@@ -115,9 +113,6 @@ static const struct of_device_id u8500_local_bus_nodes[] = {

















static void __init u8500_init_machine(void)









{









	/* Initialize ux500 power domains */









	ux500_pm_domains_init();



















	of_platform_populate(NULL, u8500_local_bus_nodes,









			     NULL, NULL);









}
































arch/arm/mach-ux500/pm_domains.h
deleted100644 → 0



+0
−17






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0-only */









/*









 * Copyright (C) 2014 Linaro Ltd.









 *









 * Author: Ulf Hansson <ulf.hansson@linaro.org>









 */



















#ifndef __MACH_UX500_PM_DOMAINS_H









#define __MACH_UX500_PM_DOMAINS_H



















#ifdef CONFIG_PM_GENERIC_DOMAINS









extern int __init ux500_pm_domains_init(void);









#else









static inline int ux500_pm_domains_init(void) { return 0; }









#endif



















#endif
























drivers/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -45,6 +45,7 @@ obj-$(CONFIG_DMADEVICES)	+= dma/

















# SOC specific infrastructure drivers.









obj-y				+= soc/









obj-$(CONFIG_PM_GENERIC_DOMAINS)	+= genpd/



















obj-y				+= virtio/









obj-$(CONFIG_VDPA)		+= vdpa/