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

rockchip/vcodec: add support for rk3128

Browse Source 
Also move set clk_sel from vpu_service_power_on to vcodec_subdev_probe.
It only need set one time.

Fixes: 1cace329a8 ("video: rockchip: vpu: use device tree to find out target SoC")
Change-Id: I41aed6296188ed2fb5eb26a2430b19dcc2916b22
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang
2017-11-15 19:05:57 +08:00
parent 06fa21989e
commit 28628bb291
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/video/rockchip/vcodec/vcodec_service.c
View File

@@ -790,11 +790,6 @@ static void vpu_service_power_on(struct vpu_subdev_data *data,
dev_dbg(pservice->dev, "power on\n");
#define BIT_VCODEC_CLK_SEL (1<<10)
if (of_machine_is_compatible("rockchip,rk3126"))
regmap_write(pservice->grf, RK312X_GRF_SOC_CON1,
BIT_VCODEC_CLK_SEL | (BIT_VCODEC_CLK_SEL << 16));
#if VCODEC_CLOCK_ENABLE
if (pservice->aclk_vcodec)
clk_prepare_enable(pservice->aclk_vcodec);
@@ -2261,6 +2256,12 @@ static int vcodec_subdev_probe(struct platform_device *pdev,
dev_info(dev, "vpu mmu dec %p\n", data->mmu_dev);
#define BIT_VCODEC_CLK_SEL BIT(10)
if (of_machine_is_compatible("rockchip,rk3126") ||
of_machine_is_compatible("rockchip,rk3128"))
regmap_write(pservice->grf, RK312X_GRF_SOC_CON1,
BIT_VCODEC_CLK_SEL | (BIT_VCODEC_CLK_SEL << 16));
clear_bit(MMU_ACTIVATED, &data->state);
vpu_service_power_on(data, pservice);
@@ -2756,6 +2757,7 @@ static void get_hw_info(struct vpu_subdev_data *data)
of_machine_is_compatible("rockchip,rk3036") ||
of_machine_is_compatible("rockchip,rk3066") ||
of_machine_is_compatible("rockchip,rk3126") ||
of_machine_is_compatible("rockchip,rk3128") ||
of_machine_is_compatible("rockchip,rk3188")) {
dec->max_dec_pic_width = 1920;
pservice->auto_freq = false;