qcom clock fixes
Subsystems (3)
cover qcom clock fixes
Here's two small fixes for the qcom clock drivers. Nobody has reported these as regressions so we can safely wait for 3.17, but I've marked them with the "Fixes" tag so that stable trees can pick them up as necessary.
Stephen Boyd (2):
clk: qcom: Fix PLL rate configurations
clk: qcom: mdp_lut_clk is a child of mdp_src
drivers/clk/qcom/common.c | 39 ++++++++++++++++++++++++++++----------- drivers/clk/qcom/common.h | 6 ++++++ drivers/clk/qcom/mmcc-msm8960.c | 2 +- drivers/clk/qcom/mmcc-msm8974.c | 10 ++++------ 4 files changed, 39 insertions(+), 18 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 1/2 clk: qcom: Fix PLL rate configurations
Sometimes we need to program PLLs with a fixed rate configuration during driver probe. Doing this after we register the PLLs with the clock framework causes the common clock framework to assume the rate of the PLLs are 0. This causes all sorts of problems for rate recalculations because the common clock framework caches the rate once at registration time unless a flag is set to always recalculate the rates.
Split the qcom_cc_probe() function into two pieces, map and everything else, so that drivers which need to configure some PLL rates or otherwise twiddle bits in the clock controller can do so before registering clocks. This allows us to properly detect the rates of PLLs that are programmed at boot.
--- drivers/clk/qcom/common.c | 39 ++++++++++++++++++++++++++++----------- drivers/clk/qcom/common.h | 6 ++++++ drivers/clk/qcom/mmcc-msm8974.c | 10 ++++------ 3 files changed, 38 insertions(+), 17 deletions(-)
drivers/clk/qcom/common.c +28 -11
@@ -27,30 +27,35 @@ struct qcom_cc {struct clk *clks[]; }; -int qcom_cc_probe (struct platform_device *pdev,const struct qcom_cc_desc *desc) +struct regmap * +qcom_cc_map (struct platform_device *pdev,const struct qcom_cc_desc *desc) {void __iomem *base;struct resource *res; +struct device *dev = &pdev->dev; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + base =devm_ioremap_resource (dev, res); +if (IS_ERR (base)) +return ERR_CAST (base); + +return devm_regmap_init_mmio (dev, base, desc->config); +} +EXPORT_SYMBOL_GPL (qcom_cc_map); + +int qcom_cc_really_probe (struct platform_device *pdev, +const struct qcom_cc_desc *desc,struct regmap *regmap) +{int i, ret;struct device *dev = &pdev->dev;struct clk *clk;struct clk_onecell_data *data;struct clk **clks; -struct regmap *regmap;struct qcom_reset_controller *reset;struct qcom_cc *cc;size_t num_clks = desc->num_clks;struct clk_regmap **rclks = desc->clks; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - base =devm_ioremap_resource (dev, res); -if (IS_ERR (base)) -return PTR_ERR (base); - - regmap =devm_regmap_init_mmio (dev, base, desc->config); -if (IS_ERR (regmap)) -return PTR_ERR (regmap); - cc =devm_kzalloc (dev,sizeof (*cc) +sizeof (*clks) * num_clks,GFP_KERNEL );if (!cc)
@@ -91,6 +96,18 @@ int qcom_cc_probe(struct platform_device *pdev, const struct qcom_cc_desc *desc)return ret; } +EXPORT_SYMBOL_GPL (qcom_cc_really_probe); + +int qcom_cc_probe (struct platform_device *pdev,const struct qcom_cc_desc *desc) +{ +struct regmap *regmap; + + regmap =qcom_cc_map (pdev, desc); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); + +return qcom_cc_really_probe (pdev, desc, regmap); +}EXPORT_SYMBOL_GPL (qcom_cc_probe);void qcom_cc_remove (struct platform_device *pdev)
drivers/clk/qcom/common.h +6 -0
@@ -17,6 +17,7 @@ struct platform_device;struct regmap_config ;struct clk_regmap ;struct qcom_reset_map ; +struct regmap ;struct qcom_cc_desc {const struct regmap_config *config;
@@ -26,6 +27,11 @@ struct qcom_cc_desc {size_t num_resets; }; +extern struct regmap *qcom_cc_map (struct platform_device *pdev, +const struct qcom_cc_desc *desc); +extern int qcom_cc_really_probe (struct platform_device *pdev, +const struct qcom_cc_desc *desc, +struct regmap *regmap);extern int qcom_cc_probe (struct platform_device *pdev,const struct qcom_cc_desc *desc);
drivers/clk/qcom/mmcc-msm8974.c +4 -6
@@ -2547,18 +2547,16 @@ MODULE_DEVICE_TABLE(of, mmcc_msm8974_match_table);static int mmcc_msm8974_probe (struct platform_device *pdev) { -int ret;struct regmap *regmap; - ret =qcom_cc_probe (pdev, &mmcc_msm8974_desc); -if (ret) -return ret; + regmap =qcom_cc_map (pdev, &mmcc_msm8974_desc); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); - regmap =dev_get_regmap (&pdev->dev,NULL );clk_pll_configure_sr_hpm_lp (&mmpll1, regmap, &mmpll1_config, true);clk_pll_configure_sr_hpm_lp (&mmpll3, regmap, &mmpll3_config, false); -return 0 ; +return qcom_cc_really_probe (pdev, &mmcc_msm8974_desc, regmap); }static int mmcc_msm8974_remove (struct platform_device *pdev)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/2 clk: qcom: mdp_lut_clk is a child of mdp_src
In reply to Stephen BoydThe mdp_lut_clk isn't a child of the mdp_clk. Instead it's the child of the mdp_src clock. Fix it.
--- drivers/clk/qcom/mmcc-msm8960.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/mmcc-msm8960.c +1 -1
@@ -1117,7 +1117,7 @@ static struct clk_branch mdp_lut_clk = { .enable_reg = 0x016c, .enable_mask = BIT(0), .hw.init = &(struct clk_init_data ){ - .parent_names = (const char *[]){"mdp_clk" }, + .parent_names = (const char *[]){"mdp_src" }, .num_parents =1 , .name ="mdp_lut_clk" , .ops = &clk_branch_ops,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation