]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
clk: qcom: msm8974: Remove gfx3d clock from MMCC
authorGeorgi Djakov <georgi.djakov@linaro.org>
Thu, 3 Dec 2015 09:34:09 +0000 (11:34 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Fri, 13 Apr 2018 14:00:18 +0000 (16:00 +0200)
The gfx3d clocks is controlled by the RPM clock controller.

Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
drivers/clk/qcom/mmcc-msm8974.c
include/dt-bindings/clock/qcom,mmcc-msm8974.h

index 9d790bcadf25a75a360f8d5aebfdf4ab50237c61..1dbfd8ef9a8be54740a636e1d4217f2aeca89949 100644 (file)
@@ -462,18 +462,6 @@ static struct clk_rcg2 mdp_clk_src = {
        },
 };
 
-static struct clk_rcg2 gfx3d_clk_src = {
-       .cmd_rcgr = 0x4000,
-       .hid_width = 5,
-       .parent_map = mmcc_xo_mmpll0_1_2_gpll0_map,
-       .clkr.hw.init = &(struct clk_init_data){
-               .name = "gfx3d_clk_src",
-               .parent_names = mmcc_xo_mmpll0_1_2_gpll0,
-               .num_parents = 5,
-               .ops = &clk_rcg2_ops,
-       },
-};
-
 static struct freq_tbl ftbl_camss_jpeg_jpeg0_2_clk[] = {
        F(75000000, P_GPLL0, 8, 0, 0),
        F(133330000, P_GPLL0, 4.5, 0, 0),
@@ -2420,7 +2408,6 @@ static struct clk_regmap *mmcc_msm8974_clocks[] = {
        [VFE0_CLK_SRC] = &vfe0_clk_src.clkr,
        [VFE1_CLK_SRC] = &vfe1_clk_src.clkr,
        [MDP_CLK_SRC] = &mdp_clk_src.clkr,
-       [GFX3D_CLK_SRC] = &gfx3d_clk_src.clkr,
        [JPEG0_CLK_SRC] = &jpeg0_clk_src.clkr,
        [JPEG1_CLK_SRC] = &jpeg1_clk_src.clkr,
        [JPEG2_CLK_SRC] = &jpeg2_clk_src.clkr,
index 28651e54c9aeeb8a1b41ad025e69aeb4cc04a4c1..8be9d54b98b1304dcefe8b1fb1b72c021fa16b1c 100644 (file)
@@ -29,7 +29,6 @@
 #define VFE0_CLK_SRC                                   12
 #define VFE1_CLK_SRC                                   13
 #define MDP_CLK_SRC                                    14
-#define GFX3D_CLK_SRC                                  15
 #define JPEG0_CLK_SRC                                  16
 #define JPEG1_CLK_SRC                                  17
 #define JPEG2_CLK_SRC                                  18