0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
- <&clkc CLKID_VPU_CLKB_COMP>;
+ <&clkc CLKID_VPU_CLKB_COMP>,
+ <&clkc CLKID_VPU_MUX>;
clock-names = "vpu_clkb_tmp_composite",
- "vpu_clkb_composite";
+ "vpu_clkb_composite",
+ "vpu_mux";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
- <&clkc CLKID_VPU_CLKB_COMP>;
+ <&clkc CLKID_VPU_CLKB_COMP>,
+ <&clkc CLKID_VPU_MUX>;
clock-names = "vpu_clkb_tmp_composite",
- "vpu_clkb_composite";
+ "vpu_clkb_composite",
+ "vpu_mux";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
- <&clkc CLKID_VPU_CLKB_COMP>;
+ <&clkc CLKID_VPU_CLKB_COMP>,
+ <&clkc CLKID_VPU_MUX>;
clock-names = "vpu_clkb_tmp_composite",
- "vpu_clkb_composite";
+ "vpu_clkb_composite",
+ "vpu_mux";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
- <&clkc CLKID_VPU_CLKB_COMP>;
+ <&clkc CLKID_VPU_CLKB_COMP>,
+ <&clkc CLKID_VPU_MUX>;
clock-names = "vpu_clkb_tmp_composite",
- "vpu_clkb_composite";
+ "vpu_clkb_composite",
+ "vpu_mux";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
- <&clkc CLKID_VPU_CLKB_COMP>;
+ <&clkc CLKID_VPU_CLKB_COMP>,
+ <&clkc CLKID_VPU_MUX>;
clock-names = "vpu_clkb_tmp_composite",
- "vpu_clkb_composite";
+ "vpu_clkb_composite",
+ "vpu_mux";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/
0 40 1>;
interrupt-names = "pre_irq", "post_irq";
clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
- <&clkc CLKID_VPU_CLKB_COMP>;
+ <&clkc CLKID_VPU_CLKB_COMP>,
+ <&clkc CLKID_VPU_MUX>;
clock-names = "vpu_clkb_tmp_composite",
- "vpu_clkb_composite";
+ "vpu_clkb_composite",
+ "vpu_mux";
clock-range = <334 667>;
/* buffer-size = <3621952>;(yuv422 8bit) */
buffer-size = <4074560>;/*yuv422 fullpack*/
static dev_t di_devno;
static struct class *di_clsp;
-static const char version_s[] = "2019-0422b:vscale_skip v is odd";
+static const char version_s[] = "2019-04-12b:chg clkb from 500 to 667 for tl1";
static int bypass_state = 1;
static int bypass_all;
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))
pdev->clkb_max_rate);
#ifdef CLK_TREE_SUPPORT
pdev->vpu_clkb = clk_get(dev, "vpu_clkb_composite");
+ if (is_meson_tl1_cpu()) {
+ 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__);
- clk_set_rate(pdev->vpu_clkb, pdev->clkb_min_rate);
+ else {
+ clk_set_rate(pdev->vpu_clkb, pdev->clkb_min_rate);
+ pr_info("get clkb rate:%ld\n", clk_get_rate(pdev->vpu_clkb));
+ }
#endif
}