Skip to content

Commit 0c4b09c

Browse files
torvaldstorvalds
committed
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
2 parents bf9ca81 + d6948c1 commit 0c4b09c

25 files changed

Lines changed: 100 additions & 141 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ properties:
3939
- qcom,sc7280-rpmhpd
4040
- qcom,sc8180x-rpmhpd
4141
- qcom,sc8280xp-rpmhpd
42-
- qcom,sc8380xp-rpmhpd
4342
- qcom,sdm660-rpmpd
4443
- qcom,sdm670-rpmhpd
4544
- qcom,sdm845-rpmhpd
@@ -57,6 +56,7 @@ properties:
5756
- qcom,sm8450-rpmhpd
5857
- qcom,sm8550-rpmhpd
5958
- qcom,sm8650-rpmhpd
59+
- qcom,x1e80100-rpmhpd
6060
- items:
6161
- enum:
6262
- qcom,msm8937-rpmpd

‎MAINTAINERS‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8875,21 +8875,13 @@ F: Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.yaml
88758875
F: drivers/i2c/muxes/i2c-demux-pinctrl.c
88768876

88778877
GENERIC PM DOMAINS
8878-
M: "Rafael J. Wysocki" <rafael@kernel.org>
8879-
M: Kevin Hilman <khilman@kernel.org>
88808878
M: Ulf Hansson <ulf.hansson@linaro.org>
88818879
L: linux-pm@vger.kernel.org
88828880
S: Supported
88838881
F: Documentation/devicetree/bindings/power/power?domain*
8884-
F: drivers/base/power/domain*.c
8885-
F: include/linux/pm_domain.h
8886-
8887-
GENERIC PM DOMAIN PROVIDERS
8888-
M: Ulf Hansson <ulf.hansson@linaro.org>
8889-
L: linux-pm@vger.kernel.org
8890-
S: Supported
88918882
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
88928883
F: drivers/pmdomain/
8884+
F: include/linux/pm_domain.h
88938885

88948886
GENERIC RADIX TREE
88958887
M: Kent Overstreet <kent.overstreet@linux.dev>

‎drivers/base/power/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o
33
obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o wakeup_stats.o
44
obj-$(CONFIG_PM_TRACE_RTC) += trace.o
5-
obj-$(CONFIG_PM_GENERIC_DOMAINS) += domain.o domain_governor.o
65
obj-$(CONFIG_HAVE_CLK) += clock_ops.o
76
obj-$(CONFIG_PM_QOS_KUNIT_TEST) += qos-test.o
87

‎drivers/firmware/Kconfig‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,6 @@ config ARM_SCPI_PROTOCOL
2828
This protocol library provides interface for all the client drivers
2929
making use of the features offered by the SCP.
3030

31-
config ARM_SCPI_POWER_DOMAIN
32-
tristate "SCPI power domain driver"
33-
depends on ARM_SCPI_PROTOCOL || (COMPILE_TEST && OF)
34-
default y
35-
select PM_GENERIC_DOMAINS if PM
36-
help
37-
This enables support for the SCPI power domains which can be
38-
enabled or disabled via the SCP firmware
39-
4031
config ARM_SDE_INTERFACE
4132
bool "ARM Software Delegated Exception Interface (SDEI)"
4233
depends on ARM64

‎drivers/firmware/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# Makefile for the linux kernel.
44
#
55
obj-$(CONFIG_ARM_SCPI_PROTOCOL) += arm_scpi.o
6-
obj-$(CONFIG_ARM_SCPI_POWER_DOMAIN) += scpi_pm_domain.o
76
obj-$(CONFIG_ARM_SDE_INTERFACE) += arm_sdei.o
87
obj-$(CONFIG_DMI) += dmi_scan.o
98
obj-$(CONFIG_DMI_SYSFS) += dmi-sysfs.o

‎drivers/firmware/arm_scmi/Kconfig‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -168,31 +168,6 @@ config ARM_SCMI_TRANSPORT_VIRTIO_ATOMIC_ENABLE
168168

169169
endif #ARM_SCMI_PROTOCOL
170170

171-
config ARM_SCMI_POWER_DOMAIN
172-
tristate "SCMI power domain driver"
173-
depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)
174-
default y
175-
select PM_GENERIC_DOMAINS if PM
176-
help
177-
This enables support for the SCMI power domains which can be
178-
enabled or disabled via the SCP firmware
179-
180-
This driver can also be built as a module. If so, the module
181-
will be called scmi_pm_domain. Note this may needed early in boot
182-
before rootfs may be available.
183-
184-
config ARM_SCMI_PERF_DOMAIN
185-
tristate "SCMI performance domain driver"
186-
depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)
187-
default y
188-
select PM_GENERIC_DOMAINS if PM
189-
help
190-
This enables support for the SCMI performance domains which can be
191-
enabled or disabled via the SCP firmware.
192-
193-
This driver can also be built as a module. If so, the module will be
194-
called scmi_perf_domain.
195-
196171
config ARM_SCMI_POWER_CONTROL
197172
tristate "SCMI system power control driver"
198173
depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)

‎drivers/pmdomain/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ menu "PM Domains"
44
source "drivers/pmdomain/actions/Kconfig"
55
source "drivers/pmdomain/amlogic/Kconfig"
66
source "drivers/pmdomain/apple/Kconfig"
7+
source "drivers/pmdomain/arm/Kconfig"
78
source "drivers/pmdomain/bcm/Kconfig"
89
source "drivers/pmdomain/imx/Kconfig"
910
source "drivers/pmdomain/mediatek/Kconfig"

‎drivers/pmdomain/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ obj-y += sunxi/
1616
obj-y += tegra/
1717
obj-y += ti/
1818
obj-y += xilinx/
19+
obj-y += core.o governor.o

‎drivers/pmdomain/amlogic/meson-ee-pwrc.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747

4848
#define G12A_HHI_NANOQ_MEM_PD_REG0 (0x43 << 2)
4949
#define G12A_HHI_NANOQ_MEM_PD_REG1 (0x44 << 2)
50+
#define G12A_HHI_ISP_MEM_PD_REG0 (0x45 << 2)
51+
#define G12A_HHI_ISP_MEM_PD_REG1 (0x46 << 2)
5052

5153
struct meson_ee_pwrc;
5254
struct meson_ee_pwrc_domain;
@@ -115,6 +117,13 @@ static struct meson_ee_pwrc_top_domain g12a_pwrc_nna = {
115117
.iso_mask = BIT(16) | BIT(17),
116118
};
117119

120+
static struct meson_ee_pwrc_top_domain g12a_pwrc_isp = {
121+
.sleep_reg = GX_AO_RTI_GEN_PWR_SLEEP0,
122+
.sleep_mask = BIT(18) | BIT(19),
123+
.iso_reg = GX_AO_RTI_GEN_PWR_ISO0,
124+
.iso_mask = BIT(18) | BIT(19),
125+
};
126+
118127
/* Memory PD Domains */
119128

120129
#define VPU_MEMPD(__reg) \
@@ -231,6 +240,11 @@ static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_nna[] = {
231240
{ G12A_HHI_NANOQ_MEM_PD_REG1, GENMASK(31, 0) },
232241
};
233242

243+
static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_isp[] = {
244+
{ G12A_HHI_ISP_MEM_PD_REG0, GENMASK(31, 0) },
245+
{ G12A_HHI_ISP_MEM_PD_REG1, GENMASK(31, 0) },
246+
};
247+
234248
#define VPU_PD(__name, __top_pd, __mem, __is_pwr_off, __resets, __clks) \
235249
{ \
236250
.name = __name, \
@@ -269,6 +283,8 @@ static struct meson_ee_pwrc_domain_desc g12a_pwrc_domains[] = {
269283
[PWRC_G12A_ETH_ID] = MEM_PD("ETH", meson_pwrc_mem_eth),
270284
[PWRC_G12A_NNA_ID] = TOP_PD("NNA", &g12a_pwrc_nna, g12a_pwrc_mem_nna,
271285
pwrc_ee_is_powered_off),
286+
[PWRC_G12A_ISP_ID] = TOP_PD("ISP", &g12a_pwrc_isp, g12a_pwrc_mem_isp,
287+
pwrc_ee_is_powered_off),
272288
};
273289

274290
static struct meson_ee_pwrc_domain_desc gxbb_pwrc_domains[] = {

‎drivers/pmdomain/arm/Kconfig‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
config ARM_SCMI_PERF_DOMAIN
3+
tristate "SCMI performance domain driver"
4+
depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)
5+
default y
6+
select PM_GENERIC_DOMAINS if PM
7+
help
8+
This enables support for the SCMI performance domains which can be
9+
enabled or disabled via the SCP firmware.
10+
11+
This driver can also be built as a module. If so, the module will be
12+
called scmi_perf_domain.
13+
14+
config ARM_SCMI_POWER_DOMAIN
15+
tristate "SCMI power domain driver"
16+
depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)
17+
default y
18+
select PM_GENERIC_DOMAINS if PM
19+
help
20+
This enables support for the SCMI power domains which can be
21+
enabled or disabled via the SCP firmware
22+
23+
This driver can also be built as a module. If so, the module
24+
will be called scmi_pm_domain. Note this may needed early in boot
25+
before rootfs may be available.
26+
27+
config ARM_SCPI_POWER_DOMAIN
28+
tristate "SCPI power domain driver"
29+
depends on ARM_SCPI_PROTOCOL || (COMPILE_TEST && OF)
30+
default y
31+
select PM_GENERIC_DOMAINS if PM
32+
help
33+
This enables support for the SCPI power domains which can be
34+
enabled or disabled via the SCP firmware
35+
36+
This driver can also be built as a module. If so, the module will be
37+
called scpi_pm_domain.

0 commit comments

Comments
 (0)