]> Git Repo - linux.git/commitdiff
Merge branches 'clk-qcom-msm8998', 'clk-fractional-parent', 'clk-x86-mv' and 'clk...
authorStephen Boyd <[email protected]>
Fri, 8 Mar 2019 18:29:15 +0000 (10:29 -0800)
committerStephen Boyd <[email protected]>
Fri, 8 Mar 2019 18:29:15 +0000 (10:29 -0800)
 - Updates for qcom MSM8998 GCC clks
 - qcom MSM8998 RPM managed clks
 - Random static analysis fixes for clk drivers

* clk-qcom-msm8998:
  clk: qcom: Make common clk_hw registrations
  clk: qcom: smd: Add support for MSM8998 rpm clocks
  clk: qcom: Skip halt checks on gcc_usb3_phy_pipe_clk for 8998
  clk: qcom: Add missing freq for usb30_master_clk on 8998
  clk: qcom: Add CLK_SET_RATE_PARENT for 8998 branch clocks

* clk-fractional-parent:
  clk: fractional-divider: check parent rate only if flag is set

* clk-x86-mv:
  clk: x86: Move clk-lpss.h to platform_data/x86

* clk-SA-fixes:
  clk: mediatek: fix platform_no_drv_owner.cocci warnings
  clk: tegra: dfll: Fix debugfs_simple_attr.cocci warnings
  clk: qoriq: Improve an error message

1  2  3  4  5 
drivers/clk/clk-qoriq.c
drivers/clk/qcom/gcc-qcs404.c

diff --combined drivers/clk/clk-qoriq.c
index 0e84f6dfa54e85eb664bb8ca395e9cb8afd15327,5baa9e051110c3036570b884b6914dd6245b0233,5baa9e051110c3036570b884b6914dd6245b0233,5baa9e051110c3036570b884b6914dd6245b0233,a81995c262acb14ce9e4f806e5aaee62ccbe0552..1212a9be7e80f0d389b00670b1b345f409b63448
@@@@@@ -1148,8 -1148,8 -1148,8 -1148,8 -1148,8 +1148,8 @@@@@@ static void __init create_one_pll(struc
                pll->div[i].clk = clk;
                ret = clk_register_clkdev(clk, pll->div[i].name, NULL);
                if (ret != 0)
----                    pr_err("%s: %s: register to lookup table failed %ld\n",
----                           __func__, pll->div[i].name, PTR_ERR(clk));
++++                    pr_err("%s: %s: register to lookup table failed %d\n",
++++                           __func__, pll->div[i].name, ret);
     
        }
     }
@@@@@@ -1389,7 -1389,6 -1389,6 -1389,6 -1389,6 +1389,7 @@@@@@ static void __init clockgen_init(struc
                                pr_err("%s: Couldn't map %pOF regs\n", __func__,
                                       guts);
                        }
 ++++                   of_node_put(guts);
                }
     
        }
index 493e055299b48fa5f0ca1aee2bc5f14af474a805,a7b2fe0fe505ecee454741ec34cd290dbd47da54,64da032bb9edb35d571f013ca37582179493961c,64da032bb9edb35d571f013ca37582179493961c,64da032bb9edb35d571f013ca37582179493961c..5a62f64ada9305f358e479d08f939a084536729c
@@@@@@ -678,7 -678,6 -678,6 -678,6 -678,6 +678,7 @@@@@@ static struct clk_rcg2 blsp1_uart3_apps
        .cmd_rcgr = 0x4014,
        .mnd_width = 16,
        .hid_width = 5,
 ++++   .cfg_off = 0x20,
        .parent_map = gcc_parent_map_0,
        .freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
        .clkr.hw.init = &(struct clk_init_data){
@@@@@@ -2693,6 -2692,8 -2692,6 -2692,6 -2692,6 +2693,8 @@@@@@ static const struct qcom_cc_desc gcc_qc
        .num_clks = ARRAY_SIZE(gcc_qcs404_clocks),
        .resets = gcc_qcs404_resets,
        .num_resets = ARRAY_SIZE(gcc_qcs404_resets),
+ +++   .clk_hws = gcc_qcs404_hws,
+ +++   .num_clk_hws = ARRAY_SIZE(gcc_qcs404_hws),
     };
     
     static const struct of_device_id gcc_qcs404_match_table[] = {
@@@@@@ -2704,7 -2705,6 -2703,7 -2703,7 -2703,7 +2706,6 @@@@@@ MODULE_DEVICE_TABLE(of, gcc_qcs404_matc
     static int gcc_qcs404_probe(struct platform_device *pdev)
     {
        struct regmap *regmap;
- ---   int ret, i;
     
        regmap = qcom_cc_map(pdev, &gcc_qcs404_desc);
        if (IS_ERR(regmap))
     
        clk_alpha_pll_configure(&gpll3_out_main, regmap, &gpll3_config);
     
- ---   for (i = 0; i < ARRAY_SIZE(gcc_qcs404_hws); i++) {
- ---           ret = devm_clk_hw_register(&pdev->dev, gcc_qcs404_hws[i]);
- ---           if (ret)
- ---                   return ret;
- ---   }
- ---
        return qcom_cc_really_probe(pdev, &gcc_qcs404_desc, regmap);
     }
     
This page took 0.100002 seconds and 4 git commands to generate.