imx6dl.dtsi gpu clock definition bug

imx6dl.dtsi gpu clock definition bug

[Nikita Yushchenko]

Hi

Both in linux-imx branch imx_3.14.28_1.0.0_ga, and in linux-fslc branch
3.14-1.0.x-mx6, in arch/arm/boot/dts/imx6dl.dtsi file, in gpu@00130000,
clock definition is inconsistent:

clocks = <&clks IMX6QDL_CLK_OPENVG_AXI>, <&clks IMX6QDL_CLK_GPU3D_AXI>,
         <&clks IMX6QDL_CLK_GPU2D_CORE>, <&clks IMX6QDL_CLK_GPU3D_CORE>,
         <&clks IMX6QDL_CLK_DUMMY>;
clock-names = "gpu2d_axi_clk", "gpu3d_axi_clk",
              "gpu2d_clk", "gpu3d_clk",
              "gpu3d_shader_clk";

i.e first entry in "clocks" refers to openvg_axi clk, but name refers to
gpu2d_axi clk


This causes

[    1.331535] galcore: clk_get vg clock failed, disable vg!

and may cause unknown misfunctions.


Corresponding part of arch/arm/boot/dts/imx6q.dtsi file:

clocks = <&clks IMX6QDL_CLK_GPU2D_AXI>, <&clks IMX6QDL_CLK_OPENVG_AXI>,
         <&clks IMX6QDL_CLK_GPU3D_AXI>, <&clks IMX6QDL_CLK_GPU2D_CORE>,
       <&clks IMX6QDL_CLK_GPU3D_CORE>, <&clks IMX6QDL_CLK_GPU3D_SHADER>;
clock-names = "gpu2d_axi_clk", "openvg_axi_clk",
              "gpu3d_axi_clk", "gpu2d_clk",
              "gpu3d_clk", "gpu3d_shader_clk";


Is definition of 5 clocks instead of 6 in imx6dl.dtsi intensional?
If so - which one clock should be missing, gpu2d_axi or openvg_axi?