Commit bc48641a authored by Yassine Oudjana's avatar Yassine Oudjana Committed by Bjorn Andersson

clk: qcom: cbf-msm8996: Add support for MSM8996 Pro

The CBF PLL on MSM8996 Pro has a /4 post divisor instead of /2. Handle the
difference accordingly.
Signed-off-by: default avatarYassine Oudjana <y.oudjana@protonmail.com>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230527093934.101335-4-y.oudjana@protonmail.comSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 434cb577
...@@ -52,7 +52,7 @@ static const u8 cbf_pll_regs[PLL_OFF_MAX_REGS] = { ...@@ -52,7 +52,7 @@ static const u8 cbf_pll_regs[PLL_OFF_MAX_REGS] = {
[PLL_OFF_STATUS] = 0x28, [PLL_OFF_STATUS] = 0x28,
}; };
static const struct alpha_pll_config cbfpll_config = { static struct alpha_pll_config cbfpll_config = {
.l = 72, .l = 72,
.config_ctl_val = 0x200d4828, .config_ctl_val = 0x200d4828,
.config_ctl_hi_val = 0x006, .config_ctl_hi_val = 0x006,
...@@ -141,7 +141,7 @@ static int clk_cbf_8996_mux_determine_rate(struct clk_hw *hw, ...@@ -141,7 +141,7 @@ static int clk_cbf_8996_mux_determine_rate(struct clk_hw *hw,
{ {
struct clk_hw *parent; struct clk_hw *parent;
if (req->rate < (DIV_THRESHOLD / 2)) if (req->rate < (DIV_THRESHOLD / cbf_pll_postdiv.div))
return -EINVAL; return -EINVAL;
if (req->rate < DIV_THRESHOLD) if (req->rate < DIV_THRESHOLD)
...@@ -312,6 +312,11 @@ static int qcom_msm8996_cbf_probe(struct platform_device *pdev) ...@@ -312,6 +312,11 @@ static int qcom_msm8996_cbf_probe(struct platform_device *pdev)
/* Switch CBF to use the primary PLL */ /* Switch CBF to use the primary PLL */
regmap_update_bits(regmap, CBF_MUX_OFFSET, CBF_MUX_PARENT_MASK, 0x1); regmap_update_bits(regmap, CBF_MUX_OFFSET, CBF_MUX_PARENT_MASK, 0x1);
if (of_device_is_compatible(dev->of_node, "qcom,msm8996pro-cbf")) {
cbfpll_config.post_div_val = 0x3 << 8;
cbf_pll_postdiv.div = 4;
}
for (i = 0; i < ARRAY_SIZE(cbf_msm8996_hw_clks); i++) { for (i = 0; i < ARRAY_SIZE(cbf_msm8996_hw_clks); i++) {
ret = devm_clk_hw_register(dev, cbf_msm8996_hw_clks[i]); ret = devm_clk_hw_register(dev, cbf_msm8996_hw_clks[i]);
if (ret) if (ret)
...@@ -342,6 +347,7 @@ static int qcom_msm8996_cbf_remove(struct platform_device *pdev) ...@@ -342,6 +347,7 @@ static int qcom_msm8996_cbf_remove(struct platform_device *pdev)
static const struct of_device_id qcom_msm8996_cbf_match_table[] = { static const struct of_device_id qcom_msm8996_cbf_match_table[] = {
{ .compatible = "qcom,msm8996-cbf" }, { .compatible = "qcom,msm8996-cbf" },
{ .compatible = "qcom,msm8996pro-cbf" },
{ /* sentinel */ }, { /* sentinel */ },
}; };
MODULE_DEVICE_TABLE(of, qcom_msm8996_cbf_match_table); MODULE_DEVICE_TABLE(of, qcom_msm8996_cbf_match_table);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment