Skip to content

Commit feb1737

Browse files
finley1226rkhuangtao
authored andcommitted
soc: rockchip: power-domain: Modify power domain driver for px30
This driver is modified to support PX30 SoC. Change-Id: I0226327d6d63302627a823bf73a5f8239b70adaf Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
1 parent 7051792 commit feb1737

3 files changed

Lines changed: 65 additions & 0 deletions

File tree

Documentation/devicetree/bindings/soc/rockchip/power_domain.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ powered up/down by software based on different application scenes to save power.
55

66
Required properties for power domain controller:
77
- compatible: Should be one of the following.
8+
"rockchip,px30-power-controller" - for PX30 SoCs.
89
"rockchip,rk3036-power-controller" - for RK3036 SoCs.
910
"rockchip,rk3128-power-controller" - for RK3128 SoCs.
1011
"rockchip,rk3288-power-controller" - for RK3288 SoCs.
@@ -19,6 +20,7 @@ Required properties for power domain controller:
1920

2021
Required properties for power domain sub nodes:
2122
- reg: index of the power domain, should use macros in:
23+
"include/dt-bindings/power/px30-power.h" - for PX30 type power domain.
2224
"include/dt-bindings/power/rk3036-power.h" - for RK3036 type power domain.
2325
"include/dt-bindings/power/rk3128-power.h" - for RK3128 type power domain.
2426
"include/dt-bindings/power/rk3288-power.h" - for RK3288 type power domain.
@@ -97,6 +99,7 @@ Node of a device using power domains must have a power-domains property,
9799
containing a phandle to the power device node and an index specifying which
98100
power domain to use.
99101
The index should use macros in:
102+
"include/dt-bindings/power/px30-power.h" - for px30 type power domain.
100103
"include/dt-bindings/power/rk3036-power.h" - for rk3036 type power domain.
101104
"include/dt-bindings/power/rk3128-power.h" - for rk3128 type power domain.
102105
"include/dt-bindings/power/rk3288-power.h" - for rk3288 type power domain.

drivers/soc/rockchip/pm_domains.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <linux/clk.h>
2020
#include <linux/regmap.h>
2121
#include <linux/mfd/syscon.h>
22+
#include <dt-bindings/power/px30-power.h>
2223
#include <dt-bindings/power/rk3036-power.h>
2324
#include <dt-bindings/power/rk3128-power.h>
2425
#include <dt-bindings/power/rk3288-power.h>
@@ -119,6 +120,9 @@ static struct rockchip_pmu *dmc_pmu;
119120
.active_wakeup = wakeup, \
120121
}
121122

123+
#define DOMAIN_PX30(pwr, status, req, wakeup) \
124+
DOMAIN_M(pwr, status, req, (req) + 16, req, wakeup)
125+
122126
#define DOMAIN_RK3288(pwr, status, req, wakeup) \
123127
DOMAIN(pwr, status, req, req, (req) + 16, wakeup)
124128

@@ -764,6 +768,17 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev)
764768
return error;
765769
}
766770

771+
static const struct rockchip_domain_info px30_pm_domains[] = {
772+
[PX30_PD_USB] = DOMAIN_PX30(5, 5, 10, false),
773+
[PX30_PD_SDCARD] = DOMAIN_PX30(8, 8, 9, false),
774+
[PX30_PD_GMAC] = DOMAIN_PX30(10, 10, 6, false),
775+
[PX30_PD_MMC_NAND] = DOMAIN_PX30(11, 11, 5, false),
776+
[PX30_PD_VPU] = DOMAIN_PX30(12, 12, 14, false),
777+
[PX30_PD_VO] = DOMAIN_PX30(13, 13, 7, false),
778+
[PX30_PD_VI] = DOMAIN_PX30(14, 14, 8, false),
779+
[PX30_PD_GPU] = DOMAIN_PX30(15, 15, 2, false),
780+
};
781+
767782
static const struct rockchip_domain_info rk3036_pm_domains[] = {
768783
[RK3036_PD_MSCH] = DOMAIN_RK3036(14, 23, 30, true),
769784
[RK3036_PD_CORE] = DOMAIN_RK3036(13, 17, 24, false),
@@ -849,6 +864,17 @@ static const struct rockchip_domain_info rk3399_pm_domains[] = {
849864
[RK3399_PD_SDIOAUDIO] = DOMAIN_RK3399(31, 31, 29, true),
850865
};
851866

867+
static const struct rockchip_pmu_info px30_pmu = {
868+
.pwr_offset = 0x18,
869+
.status_offset = 0x20,
870+
.req_offset = 0x64,
871+
.idle_offset = 0x6c,
872+
.ack_offset = 0x6c,
873+
874+
.num_domains = ARRAY_SIZE(px30_pm_domains),
875+
.domain_info = px30_pm_domains,
876+
};
877+
852878
static const struct rockchip_pmu_info rk3036_pmu = {
853879
.req_offset = 0x148,
854880
.idle_offset = 0x14c,
@@ -947,6 +973,10 @@ static const struct rockchip_pmu_info rk3399_pmu = {
947973
};
948974

949975
static const struct of_device_id rockchip_pm_domain_dt_match[] = {
976+
{
977+
.compatible = "rockchip,px30-power-controller",
978+
.data = (void *)&px30_pmu,
979+
},
950980
{
951981
.compatible = "rockchip,rk3036-power-controller",
952982
.data = (void *)&rk3036_pmu,
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd
3+
*
4+
* SPDX-License-Identifier: (GPL-2.0+ OR MIT)
5+
*/
6+
7+
#ifndef __DT_BINDINGS_POWER_PX30_POWER_H__
8+
#define __DT_BINDINGS_POWER_PX30_POWER_H__
9+
10+
/* VD_CORE */
11+
#define PX30_PD_A35_0 0
12+
#define PX30_PD_A35_1 1
13+
#define PX30_PD_A35_2 2
14+
#define PX30_PD_A35_3 3
15+
#define PX30_PD_SCU 4
16+
17+
/* VD_LOGIC */
18+
#define PX30_PD_USB 5
19+
#define PX30_PD_DDR 6
20+
#define PX30_PD_SDCARD 7
21+
#define PX30_PD_CRYPTO 8
22+
#define PX30_PD_GMAC 9
23+
#define PX30_PD_MMC_NAND 10
24+
#define PX30_PD_VPU 11
25+
#define PX30_PD_VO 12
26+
#define PX30_PD_VI 13
27+
#define PX30_PD_GPU 14
28+
29+
/* VD_PMU */
30+
#define PX30_PD_PMU 15
31+
32+
#endif

0 commit comments

Comments
 (0)