Skip to content

Commit 3c86a44

Browse files
torvaldstorvalds
committed
Merge tag 'pmdomain-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm
Pull pmdomain updates from Ulf Hansson: - Move Kconfig files into the pmdomain subsystem - Drop use of genpd's redundant ->opp_to_performance_state() callback - amlogic: - Add support for the T7 power-domains controller - Fix mask for the second NNA mem power-domain - bcm: Fixup ASB register read and comparison for bcm2835-power - imx: Fix device link problem for consumers of the pgc power-domain - mediatek: Add support for the MT8365 power domains - qcom: - Add support for the rpmhpds for SC8380XP power-domains - Add support for the rpmhpds for SM8650 power-domains - Add support for the rpmhpd clocks for SM7150 - Add support for the rpmpds for MSM8917 (families) power-domains - starfive: Add support for the JH7110 AON PMU * tag 'pmdomain-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm: (56 commits) pmdomain: amlogic: Fix mask for the second NNA mem PD domain pmdomain: qcom: rpmhpd: Add SC8380XP power domains pmdomain: qcom: rpmhpd: Add SM8650 RPMh Power Domains dt-bindings: power: rpmpd: Add SC8380XP support dt-bindings: power: qcom,rpmhpd: Add GMXC PD index dt-bindings: power: qcom,rpmpd: document the SM8650 RPMh Power Domains pmdomain: imx: Make imx pgc power domain also set the fwnode pmdomain: qcom: rpmpd: Add QM215 power domains pmdomain: qcom: rpmpd: Add MSM8917 power domains dt-bindings: power: rpmpd: Add MSM8917, MSM8937 and QM215 pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable pmdomain: qcom: rpmhpd: Drop the ->opp_to_performance_state() callback pmdomain: qcom: rpmpd: Drop the ->opp_to_performance_state() callback pmdomain: qcom: cpr: Drop the ->opp_to_performance_state() callback pmdomain: Use device_get_match_data() pmdomain: ti: add missing of_node_put pmdomain: mediatek: Add support for MT8365 pmdomain: mediatek: Add support for MTK_SCPD_STRICT_BUS_PROTECTION cap pmdomain: mediatek: Add support for WAY_EN operations pmdomain: mediatek: Unify configuration for infracfg and smi ...
2 parents 40aa597 + 9e0ccea commit 3c86a44

68 files changed

Lines changed: 1938 additions & 925 deletions

Some content is hidden

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

‎Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ maintainers:
1212
- Jianxin Pan <jianxin.pan@amlogic.com>
1313

1414
description: |+
15-
Secure Power Domains used in Meson A1/C1/S4 & C3 SoCs, and should be the child node
15+
Secure Power Domains used in Meson A1/C1/S4 & C3/T7 SoCs, and should be the child node
1616
of secure-monitor.
1717
1818
properties:
@@ -21,6 +21,7 @@ properties:
2121
- amlogic,meson-a1-pwrc
2222
- amlogic,meson-s4-pwrc
2323
- amlogic,c3-pwrc
24+
- amlogic,t7-pwrc
2425

2526
"#power-domain-cells":
2627
const: 1

‎Documentation/devicetree/bindings/power/mediatek,power-controller.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ properties:
3131
- mediatek,mt8188-power-controller
3232
- mediatek,mt8192-power-controller
3333
- mediatek,mt8195-power-controller
34+
- mediatek,mt8365-power-controller
3435

3536
'#power-domain-cells':
3637
const: 1
@@ -88,6 +89,7 @@ $defs:
8889
"include/dt-bindings/power/mediatek,mt8188-power.h" - for MT8188 type power domain.
8990
"include/dt-bindings/power/mt8192-power.h" - for MT8192 type power domain.
9091
"include/dt-bindings/power/mt8195-power.h" - for MT8195 type power domain.
92+
"include/dt-bindings/power/mediatek,mt8365-power.h" - for MT8365 type power domain.
9193
maxItems: 1
9294

9395
clocks:
@@ -115,6 +117,10 @@ $defs:
115117
$ref: /schemas/types.yaml#/definitions/phandle
116118
description: phandle to the device containing the INFRACFG register range.
117119

120+
mediatek,infracfg-nao:
121+
$ref: /schemas/types.yaml#/definitions/phandle
122+
description: phandle to the device containing the INFRACFG-NAO register range.
123+
118124
mediatek,smi:
119125
$ref: /schemas/types.yaml#/definitions/phandle
120126
description: phandle to the device containing the SMI register range.

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

Lines changed: 46 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,52 @@ description:
1515

1616
properties:
1717
compatible:
18-
enum:
19-
- qcom,mdm9607-rpmpd
20-
- qcom,msm8226-rpmpd
21-
- qcom,msm8909-rpmpd
22-
- qcom,msm8916-rpmpd
23-
- qcom,msm8939-rpmpd
24-
- qcom,msm8953-rpmpd
25-
- qcom,msm8976-rpmpd
26-
- qcom,msm8994-rpmpd
27-
- qcom,msm8996-rpmpd
28-
- qcom,msm8998-rpmpd
29-
- qcom,qcm2290-rpmpd
30-
- qcom,qcs404-rpmpd
31-
- qcom,qdu1000-rpmhpd
32-
- qcom,sa8155p-rpmhpd
33-
- qcom,sa8540p-rpmhpd
34-
- qcom,sa8775p-rpmhpd
35-
- qcom,sdm660-rpmpd
36-
- qcom,sc7180-rpmhpd
37-
- qcom,sc7280-rpmhpd
38-
- qcom,sc8180x-rpmhpd
39-
- qcom,sc8280xp-rpmhpd
40-
- qcom,sdm670-rpmhpd
41-
- qcom,sdm845-rpmhpd
42-
- qcom,sdx55-rpmhpd
43-
- qcom,sdx65-rpmhpd
44-
- qcom,sdx75-rpmhpd
45-
- qcom,sm6115-rpmpd
46-
- qcom,sm6125-rpmpd
47-
- qcom,sm6350-rpmhpd
48-
- qcom,sm6375-rpmpd
49-
- qcom,sm8150-rpmhpd
50-
- qcom,sm8250-rpmhpd
51-
- qcom,sm8350-rpmhpd
52-
- qcom,sm8450-rpmhpd
53-
- qcom,sm8550-rpmhpd
18+
oneOf:
19+
- enum:
20+
- qcom,mdm9607-rpmpd
21+
- qcom,msm8226-rpmpd
22+
- qcom,msm8909-rpmpd
23+
- qcom,msm8916-rpmpd
24+
- qcom,msm8917-rpmpd
25+
- qcom,msm8939-rpmpd
26+
- qcom,msm8953-rpmpd
27+
- qcom,msm8976-rpmpd
28+
- qcom,msm8994-rpmpd
29+
- qcom,msm8996-rpmpd
30+
- qcom,msm8998-rpmpd
31+
- qcom,qcm2290-rpmpd
32+
- qcom,qcs404-rpmpd
33+
- qcom,qdu1000-rpmhpd
34+
- qcom,qm215-rpmpd
35+
- qcom,sa8155p-rpmhpd
36+
- qcom,sa8540p-rpmhpd
37+
- qcom,sa8775p-rpmhpd
38+
- qcom,sc7180-rpmhpd
39+
- qcom,sc7280-rpmhpd
40+
- qcom,sc8180x-rpmhpd
41+
- qcom,sc8280xp-rpmhpd
42+
- qcom,sc8380xp-rpmhpd
43+
- qcom,sdm660-rpmpd
44+
- qcom,sdm670-rpmhpd
45+
- qcom,sdm845-rpmhpd
46+
- qcom,sdx55-rpmhpd
47+
- qcom,sdx65-rpmhpd
48+
- qcom,sdx75-rpmhpd
49+
- qcom,sm6115-rpmpd
50+
- qcom,sm6125-rpmpd
51+
- qcom,sm6350-rpmhpd
52+
- qcom,sm6375-rpmpd
53+
- qcom,sm7150-rpmhpd
54+
- qcom,sm8150-rpmhpd
55+
- qcom,sm8250-rpmhpd
56+
- qcom,sm8350-rpmhpd
57+
- qcom,sm8450-rpmhpd
58+
- qcom,sm8550-rpmhpd
59+
- qcom,sm8650-rpmhpd
60+
- items:
61+
- enum:
62+
- qcom,msm8937-rpmpd
63+
- const: qcom,msm8917-rpmpd
5464

5565
'#power-domain-cells':
5666
const: 1

‎MAINTAINERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,7 +1798,7 @@ F: drivers/irqchip/irq-owl-sirq.c
17981798
F: drivers/mmc/host/owl-mmc.c
17991799
F: drivers/net/ethernet/actions/
18001800
F: drivers/pinctrl/actions/*
1801-
F: drivers/soc/actions/
1801+
F: drivers/pmdomain/actions/
18021802
F: include/dt-bindings/power/owl-*
18031803
F: include/dt-bindings/reset/actions,*
18041804
F: include/linux/soc/actions/
@@ -20605,17 +20605,17 @@ F: drivers/usb/cdns3/cdns3-starfive.c
2060520605

2060620606
STARFIVE JH71XX PMU CONTROLLER DRIVER
2060720607
M: Walker Chen <walker.chen@starfivetech.com>
20608+
M: Changhuang Liang <changhuang.liang@starfivetech.com>
2060820609
S: Supported
2060920610
F: Documentation/devicetree/bindings/power/starfive*
20610-
F: drivers/pmdomain/starfive/jh71xx-pmu.c
20611+
F: drivers/pmdomain/starfive/
2061120612
F: include/dt-bindings/power/starfive,jh7110-pmu.h
2061220613

2061320614
STARFIVE SOC DRIVERS
2061420615
M: Conor Dooley <conor@kernel.org>
2061520616
S: Maintained
2061620617
T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
2061720618
F: Documentation/devicetree/bindings/soc/starfive/
20618-
F: drivers/soc/starfive/
2061920619

2062020620
STARFIVE TRNG DRIVER
2062120621
M: Jia Jie Ho <jiajie.ho@starfivetech.com>

‎drivers/Kconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ source "drivers/soundwire/Kconfig"
175175

176176
source "drivers/soc/Kconfig"
177177

178+
source "drivers/pmdomain/Kconfig"
179+
178180
source "drivers/devfreq/Kconfig"
179181

180182
source "drivers/extcon/Kconfig"

‎drivers/firmware/imx/Kconfig‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,3 @@ config IMX_SCU
2222

2323
This driver manages the IPC interface between host CPU and the
2424
SCU firmware running on M4.
25-
26-
config IMX_SCU_PD
27-
bool "IMX SCU Power Domain driver"
28-
depends on IMX_SCU
29-
help
30-
The System Controller Firmware (SCFW) based power domain driver.

‎drivers/pmdomain/Kconfig‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
menu "PM Domains"
3+
4+
source "drivers/pmdomain/actions/Kconfig"
5+
source "drivers/pmdomain/amlogic/Kconfig"
6+
source "drivers/pmdomain/apple/Kconfig"
7+
source "drivers/pmdomain/bcm/Kconfig"
8+
source "drivers/pmdomain/imx/Kconfig"
9+
source "drivers/pmdomain/mediatek/Kconfig"
10+
source "drivers/pmdomain/qcom/Kconfig"
11+
source "drivers/pmdomain/renesas/Kconfig"
12+
source "drivers/pmdomain/rockchip/Kconfig"
13+
source "drivers/pmdomain/samsung/Kconfig"
14+
source "drivers/pmdomain/st/Kconfig"
15+
source "drivers/pmdomain/starfive/Kconfig"
16+
source "drivers/pmdomain/sunxi/Kconfig"
17+
source "drivers/pmdomain/tegra/Kconfig"
18+
source "drivers/pmdomain/ti/Kconfig"
19+
source "drivers/pmdomain/xilinx/Kconfig"
20+
21+
endmenu

drivers/soc/actions/Kconfig renamed to drivers/pmdomain/actions/Kconfig

File renamed without changes.

‎drivers/pmdomain/actions/owl-sps.c‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
* Copyright (c) 2017 Andreas Färber
99
*/
1010

11+
#include <linux/mod_devicetable.h>
1112
#include <linux/of_address.h>
12-
#include <linux/of_platform.h>
13+
#include <linux/platform_device.h>
14+
#include <linux/property.h>
1315
#include <linux/pm_domain.h>
1416
#include <linux/soc/actions/owl-sps.h>
1517
#include <dt-bindings/power/owl-s500-powergate.h>
@@ -96,24 +98,16 @@ static int owl_sps_init_domain(struct owl_sps *sps, int index)
9698

9799
static int owl_sps_probe(struct platform_device *pdev)
98100
{
99-
const struct of_device_id *match;
100101
const struct owl_sps_info *sps_info;
101102
struct owl_sps *sps;
102103
int i, ret;
103104

104-
if (!pdev->dev.of_node) {
105-
dev_err(&pdev->dev, "no device node\n");
106-
return -ENODEV;
107-
}
108-
109-
match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev);
110-
if (!match || !match->data) {
105+
sps_info = device_get_match_data(&pdev->dev);
106+
if (!sps_info) {
111107
dev_err(&pdev->dev, "unknown compatible or missing data\n");
112108
return -EINVAL;
113109
}
114110

115-
sps_info = match->data;
116-
117111
sps = devm_kzalloc(&pdev->dev,
118112
struct_size(sps, domains, sps_info->num_domains),
119113
GFP_KERNEL);

‎drivers/pmdomain/amlogic/Kconfig‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
menu "Amlogic PM Domains"
3+
4+
config MESON_GX_PM_DOMAINS
5+
tristate "Amlogic Meson GX Power Domains driver"
6+
depends on ARCH_MESON || COMPILE_TEST
7+
depends on PM && OF
8+
default ARCH_MESON
9+
select PM_GENERIC_DOMAINS
10+
select PM_GENERIC_DOMAINS_OF
11+
help
12+
Say yes to expose Amlogic Meson GX Power Domains as
13+
Generic Power Domains.
14+
15+
config MESON_EE_PM_DOMAINS
16+
tristate "Amlogic Meson Everything-Else Power Domains driver"
17+
depends on ARCH_MESON || COMPILE_TEST
18+
depends on PM && OF
19+
default ARCH_MESON
20+
select PM_GENERIC_DOMAINS
21+
select PM_GENERIC_DOMAINS_OF
22+
help
23+
Say yes to expose Amlogic Meson Everything-Else Power Domains as
24+
Generic Power Domains.
25+
26+
config MESON_SECURE_PM_DOMAINS
27+
tristate "Amlogic Meson Secure Power Domains driver"
28+
depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM
29+
depends on PM && OF
30+
depends on HAVE_ARM_SMCCC
31+
default ARCH_MESON
32+
select PM_GENERIC_DOMAINS
33+
select PM_GENERIC_DOMAINS_OF
34+
help
35+
Support for the power controller on Amlogic A1/C1 series.
36+
Say yes to expose Amlogic Meson Secure Power Domains as Generic
37+
Power Domains.
38+
39+
endmenu

0 commit comments

Comments
 (0)