Skip to content

Commit 95fe9e7

Browse files
committed
pmdomain: Merge branch dt into next
Merge the immutable branch dt into next, to allow the DT bindings to be tested together with changes that are targeted for v6.9. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
2 parents 841c351 + 05d1039 commit 95fe9e7

File tree

5 files changed

+73
-8
lines changed

5 files changed

+73
-8
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ properties:
2424
- qcom,msm8917-rpmpd
2525
- qcom,msm8939-rpmpd
2626
- qcom,msm8953-rpmpd
27+
- qcom,msm8974-rpmpd
28+
- qcom,msm8974pro-pma8084-rpmpd
2729
- qcom,msm8976-rpmpd
2830
- qcom,msm8994-rpmpd
2931
- qcom,msm8996-rpmpd

Documentation/devicetree/bindings/power/renesas,rcar-sysc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ properties:
4545
- renesas,r8a779a0-sysc # R-Car V3U
4646
- renesas,r8a779f0-sysc # R-Car S4-8
4747
- renesas,r8a779g0-sysc # R-Car V4H
48+
- renesas,r8a779h0-sysc # R-Car V4M
4849

4950
reg:
5051
maxItems: 1

Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ properties:
2727
const: 1
2828

2929
power-domains:
30-
minItems: 8
31-
maxItems: 8
30+
minItems: 10
31+
maxItems: 10
3232

3333
power-domain-names:
3434
items:
@@ -40,17 +40,20 @@ properties:
4040
- const: trng
4141
- const: hdmi-tx
4242
- const: hdmi-tx-phy
43+
- const: hdcp
44+
- const: hrv
4345

4446
clocks:
45-
minItems: 4
46-
maxItems: 4
47+
minItems: 5
48+
maxItems: 5
4749

4850
clock-names:
4951
items:
5052
- const: apb
5153
- const: axi
5254
- const: ref_266m
5355
- const: ref_24m
56+
- const: fdcc
5457

5558
interconnects:
5659
maxItems: 3
@@ -82,12 +85,15 @@ examples:
8285
clocks = <&clk IMX8MP_CLK_HDMI_APB>,
8386
<&clk IMX8MP_CLK_HDMI_ROOT>,
8487
<&clk IMX8MP_CLK_HDMI_REF_266M>,
85-
<&clk IMX8MP_CLK_HDMI_24M>;
86-
clock-names = "apb", "axi", "ref_266m", "ref_24m";
88+
<&clk IMX8MP_CLK_HDMI_24M>,
89+
<&clk IMX8MP_CLK_HDMI_FDCC_TST>;
90+
clock-names = "apb", "axi", "ref_266m", "ref_24m", "fdcc";
8791
power-domains = <&pgc_hdmimix>, <&pgc_hdmimix>, <&pgc_hdmimix>,
8892
<&pgc_hdmimix>, <&pgc_hdmimix>, <&pgc_hdmimix>,
89-
<&pgc_hdmimix>, <&pgc_hdmi_phy>;
93+
<&pgc_hdmimix>, <&pgc_hdmi_phy>,
94+
<&pgc_hdmimix>, <&pgc_hdmimix>;
9095
power-domain-names = "bus", "irqsteer", "lcdif", "pai", "pvi", "trng",
91-
"hdmi-tx", "hdmi-tx-phy";
96+
"hdmi-tx", "hdmi-tx-phy",
97+
"hdcp", "hrv";
9298
#power-domain-cells = <1>;
9399
};

include/dt-bindings/power/qcom-rpmpd.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,13 @@
308308
#define MSM8953_VDDMX 5
309309
#define MSM8953_VDDMX_AO 6
310310

311+
/* MSM8974 Power Domain Indexes */
312+
#define MSM8974_VDDCX 0
313+
#define MSM8974_VDDCX_AO 1
314+
#define MSM8974_VDDCX_VFC 2
315+
#define MSM8974_VDDGFX 3
316+
#define MSM8974_VDDGFX_VFC 4
317+
311318
/* MSM8976 Power Domain Indexes */
312319
#define MSM8976_VDDCX 0
313320
#define MSM8976_VDDCX_AO 1
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
2+
/*
3+
* Copyright (C) 2023 Renesas Electronics Corp.
4+
*/
5+
#ifndef __DT_BINDINGS_POWER_RENESAS_R8A779H0_SYSC_H__
6+
#define __DT_BINDINGS_POWER_RENESAS_R8A779H0_SYSC_H__
7+
8+
/*
9+
* These power domain indices match the Power Domain Register Numbers (PDR)
10+
*/
11+
12+
#define R8A779H0_PD_A1E0D0C0 0
13+
#define R8A779H0_PD_A1E0D0C1 1
14+
#define R8A779H0_PD_A1E0D0C2 2
15+
#define R8A779H0_PD_A1E0D0C3 3
16+
#define R8A779H0_PD_A2E0D0 16
17+
#define R8A779H0_PD_A3CR0 21
18+
#define R8A779H0_PD_A3CR1 22
19+
#define R8A779H0_PD_A3CR2 23
20+
#define R8A779H0_PD_A33DGA 24
21+
#define R8A779H0_PD_A23DGB 25
22+
#define R8A779H0_PD_C4 31
23+
#define R8A779H0_PD_A1DSP0 33
24+
#define R8A779H0_PD_A2IMP01 34
25+
#define R8A779H0_PD_A2PSC 35
26+
#define R8A779H0_PD_A2CV0 36
27+
#define R8A779H0_PD_A2CV1 37
28+
#define R8A779H0_PD_A3IMR0 38
29+
#define R8A779H0_PD_A3IMR1 39
30+
#define R8A779H0_PD_A3VC 40
31+
#define R8A779H0_PD_A2CN0 42
32+
#define R8A779H0_PD_A1CN0 44
33+
#define R8A779H0_PD_A1DSP1 45
34+
#define R8A779H0_PD_A2DMA 47
35+
#define R8A779H0_PD_A2CV2 48
36+
#define R8A779H0_PD_A2CV3 49
37+
#define R8A779H0_PD_A3IMR2 50
38+
#define R8A779H0_PD_A3IMR3 51
39+
#define R8A779H0_PD_A3PCI 52
40+
#define R8A779H0_PD_A2PCIPHY 53
41+
#define R8A779H0_PD_A3VIP0 56
42+
#define R8A779H0_PD_A3VIP2 58
43+
#define R8A779H0_PD_A3ISP0 60
44+
#define R8A779H0_PD_A3DUL 62
45+
46+
/* Always-on power area */
47+
#define R8A779H0_PD_ALWAYS_ON 64
48+
49+
#endif /* __DT_BINDINGS_POWER_RENESAS_R8A779H0_SYSC_H__ */

0 commit comments

Comments
 (0)