summaryrefslogtreecommitdiff
path: root/drivers/soc
diff options
context:
space:
mode:
authorFinley Xiao <finley.xiao@rock-chips.com>2018-07-06 17:11:50 +0800
committerTao Huang <huangtao@rock-chips.com>2018-07-06 19:36:29 +0800
commit629b83c413ad0c6dea83c9e6052e40fd75faf255 (patch)
treed69b202c185e39e43646bc362c3b4ed6c2af6fdb /drivers/soc
parent8304527e6751dfe41f8baf4a62cb4c8c5c94266e (diff)
soc: rockchip: opp_select: Parse 'rockchip,pvtm-thermal-zone' first for pvtm
Sometimes pvtm thermal zone is different from wide-temperature control thermal zone, so let pvtm parse 'rockchip,pvtm-thermal-zone' first. Change-Id: Ia6bdfbabb99b053864cbc3cbf14aac675e26483c Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/rockchip/rockchip_opp_select.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/rockchip/rockchip_opp_select.c b/drivers/soc/rockchip/rockchip_opp_select.c
index 61c290ab4913..da9c538b2df8 100644
--- a/drivers/soc/rockchip/rockchip_opp_select.c
+++ b/drivers/soc/rockchip/rockchip_opp_select.c
@@ -232,9 +232,9 @@ static int rockchip_parse_pvtm_config(struct device_node *np,
if (of_property_read_u32_array(np, "rockchip,pvtm-temp-prop",
pvtm->temp_prop, 2))
return -EINVAL;
- if (of_property_read_string(np, "rockchip,thermal-zone",
+ if (of_property_read_string(np, "rockchip,pvtm-thermal-zone",
&pvtm->tz_name)) {
- if (of_property_read_string(np, "rockchip,pvtm-thermal-zone",
+ if (of_property_read_string(np, "rockchip,thermal-zone",
&pvtm->tz_name))
return -EINVAL;
}