Commit 0c4b09cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pmdomain-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm 

Pull pmdomain updates from Ulf Hansson:
 "Core:
   - Move the generic PM domain and its governor to the pmdomain
     subsystem
   - Drop the unused pm_genpd_opp_to_performance_state()

  Providers:
   - Convert some providers to let the ->remove() callback return void
   - amlogic: Add support for G12A ISP power domain
   - arm: Move the SCPI power-domain driver to the pmdomain subsystem
   - arm: Move Kconfig options to the pmdomain subsystem
   - qcom: Update part number to X1E80100 for the rpmhpd"

* tag 'pmdomain-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm:
  PM: domains: Move genpd and its governor to the pmdomain subsystem
  PM: domains: Drop redundant header for genpd
  PM: domains: Drop the unused pm_genpd_opp_to_performance_state()
  PM: domains: fix domain_governor kernel-doc warnings
  pmdomain: xilinx/zynqmp: Convert to platform remove callback returning void
  pmdomain: qcom-cpr: Convert to platform remove callback returning void
  pmdomain: imx93-pd: Convert to platform remove callback returning void
  pmdomain: imx93-blk-ctrl: Convert to platform remove callback returning void
  pmdomain: imx8mp-blk-ctrl: Convert to platform remove callback returning void
  pmdomain: imx8m-blk-ctrl: Convert to platform remove callback returning void
  pmdomain: imx-gpcv2: Convert to platform remove callback returning void
  pmdomain: imx-gpc: Convert to platform remove callback returning void
  pmdomain: imx-pgc: Convert to platform remove callback returning void
  pmdomain: amlogic: meson-ee-pwrc: add support for G12A ISP power domain
  dt-bindings: power: meson-g12a-power: document ISP power domain
  firmware: arm_scpi: Move power-domain driver to the pmdomain dir
  pmdomain: arm_scmi: Move Kconfig options to the pmdomain subsystem
  pmdomain: qcom: rpmhpd: Update part number to X1E80100
  dt-bindings: power: rpmpd: Update part number to X1E80100
parents bf9ca811 d6948c13

Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ properties: 
          - qcom,sc7280-rpmhpd

          - qcom,sc8180x-rpmhpd

          - qcom,sc8280xp-rpmhpd

          - qcom,sc8380xp-rpmhpd

          - qcom,sdm660-rpmpd

          - qcom,sdm670-rpmhpd

          - qcom,sdm845-rpmhpd
@@ -57,6 +56,7 @@ properties: 
          - qcom,sm8450-rpmhpd

          - qcom,sm8550-rpmhpd

          - qcom,sm8650-rpmhpd

          - qcom,x1e80100-rpmhpd

      - items:

          - enum:

              - qcom,msm8937-rpmpd

MAINTAINERS

+1 −9
Original line number Diff line number Diff line
@@ -8875,21 +8875,13 @@ F: Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.yaml 
F:	drivers/i2c/muxes/i2c-demux-pinctrl.c









GENERIC PM DOMAINS









M:	"Rafael J. Wysocki" <rafael@kernel.org>









M:	Kevin Hilman <khilman@kernel.org>









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









L:	linux-pm@vger.kernel.org









S:	Supported









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/pmdomain/









F:	include/linux/pm_domain.h

















GENERIC RADIX TREE









M:	Kent Overstreet <kent.overstreet@linux.dev>
































drivers/base/power/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,6 @@







obj-$(CONFIG_PM)	+= sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o









obj-$(CONFIG_PM_SLEEP)	+= main.o wakeup.o wakeup_stats.o









obj-$(CONFIG_PM_TRACE_RTC)	+= trace.o









obj-$(CONFIG_PM_GENERIC_DOMAINS)	+=  domain.o domain_governor.o









obj-$(CONFIG_HAVE_CLK)	+= clock_ops.o









obj-$(CONFIG_PM_QOS_KUNIT_TEST) += qos-test.o










































drivers/firmware/Kconfig



+0
−9






























Original line number
Diff line number
Diff line







@@ -28,15 +28,6 @@ config ARM_SCPI_PROTOCOL







	  This protocol library provides interface for all the client drivers









	  making use of the features offered by the SCP.



















config ARM_SCPI_POWER_DOMAIN









	tristate "SCPI power domain driver"









	depends on ARM_SCPI_PROTOCOL || (COMPILE_TEST && OF)









	default y









	select PM_GENERIC_DOMAINS if PM









	help









	  This enables support for the SCPI power domains which can be









	  enabled or disabled via the SCP firmware



















config ARM_SDE_INTERFACE









	bool "ARM Software Delegated Exception Interface (SDEI)"









	depends on ARM64
































drivers/firmware/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -3,7 +3,6 @@







# Makefile for the linux kernel.









#









obj-$(CONFIG_ARM_SCPI_PROTOCOL)	+= arm_scpi.o









obj-$(CONFIG_ARM_SCPI_POWER_DOMAIN) += scpi_pm_domain.o









obj-$(CONFIG_ARM_SDE_INTERFACE)	+= arm_sdei.o









obj-$(CONFIG_DMI)		+= dmi_scan.o









obj-$(CONFIG_DMI_SYSFS)		+= dmi-sysfs.o