arm64: dts: mt8173: fix vcodec-enc clock
authorHsin-Yi Wang <hsinyi@chromium.org>
Mon, 4 May 2020 12:44:43 +0000 (20:44 +0800)
committerMatthias Brugger <matthias.bgg@gmail.com>
Fri, 15 May 2020 15:27:38 +0000 (17:27 +0200)
Fix the assigned-clock-parents to higher frequency clock to avoid h264
encode timeout:

[  134.763465] mtk_vpu 10020000.vpu: vpu ipi 4 ack time out !
[  134.769008] [MTK_VCODEC][ERROR][18]: vpu_enc_send_msg() vpu_ipi_send msg_id c002 len 32 fail -5
[  134.777707] [MTK_VCODEC][ERROR][18]: vpu_enc_encode() AP_IPIMSG_ENC_ENCODE 0 fail

venc_sel is the clock used by h264 encoder, and venclt_sel is the clock
used by vp8 encoder. Assign venc_sel to vcodecpll_ck and venclt_sel to
vcodecpll_370p5.

    vcodecpll                         1482000000
       vcodecpll_ck                    494000000
          venc_sel                     494000000
...
       vcodecpll_370p5                 370500000
          venclt_sel                   370500000

Fixes: fbbad0287cec ("arm64: dts: Using standard CCF interface to set vcodec clk")
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Link: https://lore.kernel.org/r/20200504124442.208004-1-hsinyi@chromium.org
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
arch/arm64/boot/dts/mediatek/mt8173.dtsi

index ccb8e88a60c5a5b2512558a876f1c1b1c20558b5..d819e44d94a8d12a8747619c78916d06104c05bd 100644 (file)
                                      "venc_lt_sel";
                        assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>,
                                          <&topckgen CLK_TOP_VENC_LT_SEL>;
-                       assigned-clock-parents = <&topckgen CLK_TOP_VENCPLL_D2>,
-                                                <&topckgen CLK_TOP_UNIVPLL1_D2>;
+                       assigned-clock-parents = <&topckgen CLK_TOP_VCODECPLL>,
+                                                <&topckgen CLK_TOP_VCODECPLL_370P5>;
                };
 
                jpegdec: jpegdec@18004000 {