Skip to content

Commit 28a88b5

Browse files
author
Ulf Hansson
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.18. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
2 parents ffeebf7 + 9428fff commit 28a88b5

4 files changed

Lines changed: 79 additions & 0 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ properties:
2424
- amlogic,a5-pwrc
2525
- amlogic,c3-pwrc
2626
- amlogic,t7-pwrc
27+
- amlogic,s6-pwrc
28+
- amlogic,s7-pwrc
29+
- amlogic,s7d-pwrc
2730

2831
"#power-domain-cells":
2932
const: 1
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
2+
/*
3+
* Copyright (C) 2025 Amlogic, Inc. All rights reserved
4+
*/
5+
#ifndef _DT_BINDINGS_AMLOGIC_S6_POWER_H
6+
#define _DT_BINDINGS_AMLOGIC_S6_POWER_H
7+
8+
#define PWRC_S6_DSPA_ID 0
9+
#define PWRC_S6_DOS_HEVC_ID 1
10+
#define PWRC_S6_DOS_VDEC_ID 2
11+
#define PWRC_S6_VPU_HDMI_ID 3
12+
#define PWRC_S6_U2DRD_ID 4
13+
#define PWRC_S6_U3DRD_ID 5
14+
#define PWRC_S6_SD_EMMC_C_ID 6
15+
#define PWRC_S6_GE2D_ID 7
16+
#define PWRC_S6_AMFC_ID 8
17+
#define PWRC_S6_VC9000E_ID 9
18+
#define PWRC_S6_DEWARP_ID 10
19+
#define PWRC_S6_VICP_ID 11
20+
#define PWRC_S6_SD_EMMC_A_ID 12
21+
#define PWRC_S6_SD_EMMC_B_ID 13
22+
#define PWRC_S6_ETH_ID 14
23+
#define PWRC_S6_PCIE_ID 15
24+
#define PWRC_S6_NNA_4T_ID 16
25+
#define PWRC_S6_AUDIO_ID 17
26+
#define PWRC_S6_AUCPU_ID 18
27+
#define PWRC_S6_ADAPT_ID 19
28+
29+
#endif
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
2+
/*
3+
* Copyright (C) 2025 Amlogic, Inc. All rights reserved
4+
*/
5+
#ifndef _DT_BINDINGS_AMLOGIC_S7_POWER_H
6+
#define _DT_BINDINGS_AMLOGIC_S7_POWER_H
7+
8+
#define PWRC_S7_DOS_HEVC_ID 0
9+
#define PWRC_S7_DOS_VDEC_ID 1
10+
#define PWRC_S7_VPU_HDMI_ID 2
11+
#define PWRC_S7_USB_COMB_ID 3
12+
#define PWRC_S7_SD_EMMC_C_ID 4
13+
#define PWRC_S7_GE2D_ID 5
14+
#define PWRC_S7_SD_EMMC_A_ID 6
15+
#define PWRC_S7_SD_EMMC_B_ID 7
16+
#define PWRC_S7_ETH_ID 8
17+
#define PWRC_S7_AUCPU_ID 9
18+
#define PWRC_S7_AUDIO_ID 10
19+
20+
#endif
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
2+
/*
3+
* Copyright (C) 2025 Amlogic, Inc. All rights reserved
4+
*/
5+
#ifndef _DT_BINDINGS_AMLOGIC_S7D_POWER_H
6+
#define _DT_BINDINGS_AMLOGIC_S7D_POWER_H
7+
8+
#define PWRC_S7D_DOS_HCODEC_ID 0
9+
#define PWRC_S7D_DOS_HEVC_ID 1
10+
#define PWRC_S7D_DOS_VDEC_ID 2
11+
#define PWRC_S7D_VPU_HDMI_ID 3
12+
#define PWRC_S7D_USB_U2DRD_ID 4
13+
#define PWRC_S7D_USB_U2H_ID 5
14+
#define PWRC_S7D_SSD_EMMC_C_ID 6
15+
#define PWRC_S7D_GE2D_ID 7
16+
#define PWRC_S7D_AMFC_ID 8
17+
#define PWRC_S7D_EMMC_A_ID 9
18+
#define PWRC_S7D_EMMC_B_ID 10
19+
#define PWRC_S7D_ETH_ID 11
20+
#define PWRC_S7D_AUCPU_ID 12
21+
#define PWRC_S7D_AUDIO_ID 13
22+
#define PWRC_S7D_SRAMA_ID 14
23+
#define PWRC_S7D_DMC0_ID 15
24+
#define PWRC_S7D_DMC1_ID 16
25+
#define PWRC_S7D_DDR_ID 17
26+
27+
#endif

0 commit comments

Comments
 (0)