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

Revert "di: change clkb frq from 500 to 667 [1/1]"

Browse Source 
This reverts commit c75a783c42.

Change-Id: I2bf82f1ceeebc1377d45b76ee1d2563811c154ca
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
This commit is contained in:
Yong Qin
2019-04-11 14:06:56 +08:00
committed by Jianxin Pan
parent cd2457a001
commit 2e4371efff
7 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
View File

@@ -216,11 +216,9 @@
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
<&clkc CLKID_VPU_CLKB_COMP>,
<&clkc CLKID_VPU_MUX>;
<&clkc CLKID_VPU_CLKB_COMP>;
clock-names = "vpu_clkb_tmp_composite",
"vpu_clkb_composite",
"vpu_mux";
"vpu_clkb_composite";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/

6
arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
View File

@@ -223,11 +223,9 @@
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
<&clkc CLKID_VPU_CLKB_COMP>,
<&clkc CLKID_VPU_MUX>;
<&clkc CLKID_VPU_CLKB_COMP>;
clock-names = "vpu_clkb_tmp_composite",
"vpu_clkb_composite",
"vpu_mux";
"vpu_clkb_composite";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/

6
arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
View File

@@ -218,11 +218,9 @@
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
<&clkc CLKID_VPU_CLKB_COMP>,
<&clkc CLKID_VPU_MUX>;
<&clkc CLKID_VPU_CLKB_COMP>;
clock-names = "vpu_clkb_tmp_composite",
"vpu_clkb_composite",
"vpu_mux";
"vpu_clkb_composite";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/

6
arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
View File

@@ -214,11 +214,9 @@
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
<&clkc CLKID_VPU_CLKB_COMP>,
<&clkc CLKID_VPU_MUX>;
<&clkc CLKID_VPU_CLKB_COMP>;
clock-names = "vpu_clkb_tmp_composite",
"vpu_clkb_composite",
"vpu_mux";
"vpu_clkb_composite";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/

6
arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
View File

@@ -220,11 +220,9 @@
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
<&clkc CLKID_VPU_CLKB_COMP>,
<&clkc CLKID_VPU_MUX>;
<&clkc CLKID_VPU_CLKB_COMP>;
clock-names = "vpu_clkb_tmp_composite",
"vpu_clkb_composite",
"vpu_mux";
"vpu_clkb_composite";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/

6
arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
View File

@@ -214,11 +214,9 @@
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
<&clkc CLKID_VPU_CLKB_COMP>,
<&clkc CLKID_VPU_MUX>;
<&clkc CLKID_VPU_CLKB_COMP>;
clock-names = "vpu_clkb_tmp_composite",
"vpu_clkb_composite",
"vpu_mux";
"vpu_clkb_composite";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/

14
drivers/amlogic/media/deinterlace/deinterlace.c
View File

@@ -7685,7 +7685,6 @@ static void di_get_vpu_clkb(struct device *dev, struct di_dev_s *pdev)
int ret = 0;
unsigned int tmp_clk[2] = {0, 0};
struct clk *vpu_clk = NULL;
struct clk *clkb_tmp_comp = NULL;
vpu_clk = clk_get(dev, "vpu_mux");
if (IS_ERR(vpu_clk))
@@ -7706,20 +7705,9 @@ static void di_get_vpu_clkb(struct device *dev, struct di_dev_s *pdev)
pdev->clkb_max_rate);
#ifdef CLK_TREE_SUPPORT
pdev->vpu_clkb = clk_get(dev, "vpu_clkb_composite");
clkb_tmp_comp = clk_get(dev, "vpu_clkb_tmp_composite");
if (IS_ERR(clkb_tmp_comp))
pr_err("clkb_tmp_comp error\n");
else {
if (!IS_ERR(vpu_clk))
clk_set_parent(clkb_tmp_comp, vpu_clk);
}
if (IS_ERR(pdev->vpu_clkb))
pr_err("%s: get vpu clkb gate error.\n", __func__);
else {
clk_set_rate(pdev->vpu_clkb, pdev->clkb_min_rate);
pr_info("get clkb rate:%ld\n", clk_get_rate(pdev->vpu_clkb));
}
clk_set_rate(pdev->vpu_clkb, pdev->clkb_min_rate);
#endif
}