shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

video: rockchip: mpp: rkvenc2: Use new API to init and uninit opp info

Browse Source 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5ceb970f3d0ee1e6edeb51f51eb9015589fc65f3
This commit is contained in:
Finley Xiao
2023-06-09 10:51:30 +08:00
committed by Tao Huang
parent 400ce7d433
commit eeccebbfda
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/video/rockchip/mpp/mpp_rkvenc2.c
View File

@@ -1713,7 +1713,7 @@ static const struct of_device_id rockchip_rkvenc_of_match[] = {
static struct monitor_dev_profile venc_mdevp = {
.type = MONITOR_TYPE_DEV,
.update_volt = rockchip_monitor_check_rate_volt,
.check_rate_volt = rockchip_monitor_check_rate_volt,
};
static int rkvenc_devfreq_init(struct mpp_dev *mpp)
@@ -1721,37 +1721,19 @@ static int rkvenc_devfreq_init(struct mpp_dev *mpp)
struct rkvenc_dev *enc = to_rkvenc_dev(mpp);
struct clk *clk_core = enc->core_clk_info.clk;
struct device *dev = mpp->dev;
struct rockchip_opp_info *opp_info = &enc->opp_info;
int ret = 0;
if (!clk_core)
return 0;
if (of_find_property(dev->of_node, "venc-supply", NULL) &&
of_find_property(dev->of_node, "mem-supply", NULL)) {
const char *const reg_names[] = { "venc", "mem", NULL };
ret = dev_pm_opp_set_regulators(dev, reg_names);
if (ret)
return ret;
} else {
const char *const reg_names[] = { "venc", NULL };
ret = dev_pm_opp_set_regulators(dev, reg_names);
if (ret)
return ret;
}
ret = dev_pm_opp_set_clkname(dev, "clk_core");
if (ret)
return ret;
rockchip_get_opp_data(rockchip_rkvenc_of_match, &enc->opp_info);
ret = rockchip_init_opp_table(dev, &enc->opp_info, "leakage", "venc");
rockchip_get_opp_data(rockchip_rkvenc_of_match, opp_info);
ret = rockchip_init_opp_table(dev, opp_info, "clk_core", "venc");
if (ret) {
dev_err(dev, "failed to init_opp_table\n");
return ret;
}
venc_mdevp.opp_info = opp_info;
enc->mdev_info = rockchip_system_monitor_register(dev, &venc_mdevp);
if (IS_ERR(enc->mdev_info)) {
dev_dbg(dev, "without system monitor\n");