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

This reverts commit c75a783c4278f4b8c97dedadc72f44d49461dc4f.

Change-Id: I2bf82f1ceeebc1377d45b76ee1d2563811c154ca
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
index 8956791..f635279 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
@@ -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*/

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
index ad1250b..b92ba34 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
@@ -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*/

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
index 1c563e0..3fe7cb9 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
@@ -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*/

diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
index 9cbbb55..1ced060 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
@@ -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*/

diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
index e090467..6c406a9 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
@@ -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*/

diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
index 2161d18..094d71e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
@@ -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*/

diff --git a/drivers/amlogic/media/deinterlace/deinterlace.c b/drivers/amlogic/media/deinterlace/deinterlace.c
index 8da7afd..a99f016 100644 (file)
--- a/drivers/amlogic/media/deinterlace/deinterlace.c
+++ b/drivers/amlogic/media/deinterlace/deinterlace.c
@@ -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
 }