[PATCH] clk: qcom: mmcc-msm8960: Configure PLL15 only on APQ8064

[PATCH] clk: qcom: mmcc-msm8960: Configure PLL15 only on APQ8064

[Abel Vesa]

PLL15 is specific to APQ8064, but the shared probe function configures
it unconditionally, including on MSM8960. Its configuration registers
at offsets 0x33c through 0x348 exceed the MSM8960 regmap maximum of
0x334, so regmap rejects these accesses. The PLL configuration helper
ignores the errors and probe continues.

Only configure PLL15 when the selected descriptor is for APQ8064,
matching the existing variant check for the GFX3D clock adjustments.

Fixes: e216ce60a9e0 ("clk: qcom: Add support for APQ8064 multimedia clocks")
Assisted-by: LLM
Signed-off-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
---
 drivers/clk/qcom/mmcc-msm8960.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/qcom/mmcc-msm8960.c b/drivers/clk/qcom/mmcc-msm8960.c
index a23440e13b71..a67df833592a 100644
--- a/drivers/clk/qcom/mmcc-msm8960.c
+++ b/drivers/clk/qcom/mmcc-msm8960.c
@@ -3170,7 +3170,8 @@ static int mmcc_msm8960_probe(struct platform_device *pdev)
 	if (IS_ERR(regmap))
 		return PTR_ERR(regmap);
 
-	clk_pll_configure_sr(&pll15, regmap, &pll15_config, false);
+	if (desc == &mmcc_apq8064_desc)
+		clk_pll_configure_sr(&pll15, regmap, &pll15_config, false);
 
 	return qcom_cc_really_probe(&pdev->dev, desc, regmap);
 }

---
base-commit: e6e35979777d646fe3c7c94dca7dd32fb25d45f4
change-id: 20260916-clk-qcom-mmcc-msm8960-fix-pll15-config-404b986600af

Best regards,
--  
Abel Vesa <abel.vesa@oss.qualcomm.com>

Re: [PATCH] clk: qcom: mmcc-msm8960: Configure PLL15 only on APQ8064

[Konrad Dybcio]

On 9/16/26 2:04 PM, Abel Vesa wrote:
> PLL15 is specific to APQ8064, but the shared probe function configures
> it unconditionally, including on MSM8960. Its configuration registers
> at offsets 0x33c through 0x348 exceed the MSM8960 regmap maximum of
> 0x334, so regmap rejects these accesses. The PLL configuration helper
> ignores the errors and probe continues.
> 
> Only configure PLL15 when the selected descriptor is for APQ8064,
> matching the existing variant check for the GFX3D clock adjustments.
> 
> Fixes: e216ce60a9e0 ("clk: qcom: Add support for APQ8064 multimedia clocks")
> Assisted-by: LLM
> Signed-off-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
> ---
>  drivers/clk/qcom/mmcc-msm8960.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/qcom/mmcc-msm8960.c b/drivers/clk/qcom/mmcc-msm8960.c
> index a23440e13b71..a67df833592a 100644
> --- a/drivers/clk/qcom/mmcc-msm8960.c
> +++ b/drivers/clk/qcom/mmcc-msm8960.c
> @@ -3170,7 +3170,8 @@ static int mmcc_msm8960_probe(struct platform_device *pdev)
>  	if (IS_ERR(regmap))
>  		return PTR_ERR(regmap);
>  
> -	clk_pll_configure_sr(&pll15, regmap, &pll15_config, false);
> +	if (desc == &mmcc_apq8064_desc)
> +		clk_pll_configure_sr(&pll15, regmap, &pll15_config, false);
>  
>  	return qcom_cc_really_probe(&pdev->dev, desc, regmap);
>  }
> 
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad