Skip to content

Commit 9f93a0a

Browse files
Luo Jieandersson
authored andcommitted
clk: qcom: common: commonize qcom_cc_really_probe
The previous wrapper qcom_cc_really_probe takes the platform device as parameter, which is limited to platform driver. As for qca8k clock controller driver, which is registered as the MDIO device, which also follows the qcom clock framework. To commonize qcom_cc_really_probe, updating it to take the struct device as parameter, so that the qcom_cc_really_probe can be utilized by the previous platform device and the new added MDIO device. Also update the current clock controller drivers to take &pdev->dev as parameter when calling qcom_cc_really_probe. Reviewed-by: Stephen Boyd <sboyd@kernel.org> Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Luo Jie <quic_luoj@quicinc.com> Link: https://lore.kernel.org/r/20240605124541.2711467-4-quic_luoj@quicinc.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 80bbd1c commit 9f93a0a

105 files changed

Lines changed: 108 additions & 109 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

drivers/clk/qcom/apss-ipq6018.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ static int apss_ipq6018_probe(struct platform_device *pdev)
123123
if (!regmap)
124124
return -ENODEV;
125125

126-
ret = qcom_cc_really_probe(pdev, &apss_ipq6018_desc, regmap);
126+
ret = qcom_cc_really_probe(&pdev->dev, &apss_ipq6018_desc, regmap);
127127
if (ret)
128128
return ret;
129129

drivers/clk/qcom/camcc-sc7180.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1680,7 +1680,7 @@ static int cam_cc_sc7180_probe(struct platform_device *pdev)
16801680
clk_agera_pll_configure(&cam_cc_pll2, regmap, &cam_cc_pll2_config);
16811681
clk_fabia_pll_configure(&cam_cc_pll3, regmap, &cam_cc_pll3_config);
16821682

1683-
ret = qcom_cc_really_probe(pdev, &cam_cc_sc7180_desc, regmap);
1683+
ret = qcom_cc_really_probe(&pdev->dev, &cam_cc_sc7180_desc, regmap);
16841684
pm_runtime_put(&pdev->dev);
16851685
if (ret < 0) {
16861686
dev_err(&pdev->dev, "Failed to register CAM CC clocks\n");

drivers/clk/qcom/camcc-sc7280.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2481,7 +2481,7 @@ static int cam_cc_sc7280_probe(struct platform_device *pdev)
24812481
clk_lucid_pll_configure(&cam_cc_pll5, regmap, &cam_cc_pll5_config);
24822482
clk_lucid_pll_configure(&cam_cc_pll6, regmap, &cam_cc_pll6_config);
24832483

2484-
return qcom_cc_really_probe(pdev, &cam_cc_sc7280_desc, regmap);
2484+
return qcom_cc_really_probe(&pdev->dev, &cam_cc_sc7280_desc, regmap);
24852485
}
24862486

24872487
static struct platform_driver cam_cc_sc7280_driver = {

drivers/clk/qcom/camcc-sc8280xp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3034,7 +3034,7 @@ static int camcc_sc8280xp_probe(struct platform_device *pdev)
30343034
/* Keep some clocks always-on */
30353035
qcom_branch_set_clk_en(regmap, 0xc1e4); /* CAMCC_GDSC_CLK */
30363036

3037-
ret = qcom_cc_really_probe(pdev, &camcc_sc8280xp_desc, regmap);
3037+
ret = qcom_cc_really_probe(&pdev->dev, &camcc_sc8280xp_desc, regmap);
30383038
if (ret)
30393039
goto err_disable;
30403040

drivers/clk/qcom/camcc-sdm845.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1735,7 +1735,7 @@ static int cam_cc_sdm845_probe(struct platform_device *pdev)
17351735
cam_cc_pll_config.l = 0x14;
17361736
clk_fabia_pll_configure(&cam_cc_pll3, regmap, &cam_cc_pll_config);
17371737

1738-
return qcom_cc_really_probe(pdev, &cam_cc_sdm845_desc, regmap);
1738+
return qcom_cc_really_probe(&pdev->dev, &cam_cc_sdm845_desc, regmap);
17391739
}
17401740

17411741
static struct platform_driver cam_cc_sdm845_driver = {

drivers/clk/qcom/camcc-sm6350.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1879,7 +1879,7 @@ static int camcc_sm6350_probe(struct platform_device *pdev)
18791879
clk_agera_pll_configure(&camcc_pll2, regmap, &camcc_pll2_config);
18801880
clk_fabia_pll_configure(&camcc_pll3, regmap, &camcc_pll3_config);
18811881

1882-
return qcom_cc_really_probe(pdev, &camcc_sm6350_desc, regmap);
1882+
return qcom_cc_really_probe(&pdev->dev, &camcc_sm6350_desc, regmap);
18831883
}
18841884

18851885
static struct platform_driver camcc_sm6350_driver = {

drivers/clk/qcom/camcc-sm7150.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2044,7 +2044,7 @@ static int camcc_sm7150_probe(struct platform_device *pdev)
20442044
/* Keep some clocks always-on */
20452045
qcom_branch_set_clk_en(regmap, 0xc1a0); /* CAMCC_GDSC_CLK */
20462046

2047-
return qcom_cc_really_probe(pdev, &camcc_sm7150_desc, regmap);
2047+
return qcom_cc_really_probe(&pdev->dev, &camcc_sm7150_desc, regmap);
20482048
}
20492049

20502050
static struct platform_driver camcc_sm7150_driver = {

drivers/clk/qcom/camcc-sm8250.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2433,7 +2433,7 @@ static int cam_cc_sm8250_probe(struct platform_device *pdev)
24332433
clk_lucid_pll_configure(&cam_cc_pll3, regmap, &cam_cc_pll3_config);
24342434
clk_lucid_pll_configure(&cam_cc_pll4, regmap, &cam_cc_pll4_config);
24352435

2436-
return qcom_cc_really_probe(pdev, &cam_cc_sm8250_desc, regmap);
2436+
return qcom_cc_really_probe(&pdev->dev, &cam_cc_sm8250_desc, regmap);
24372437
}
24382438

24392439
static struct platform_driver cam_cc_sm8250_driver = {

drivers/clk/qcom/camcc-sm8450.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2839,7 +2839,7 @@ static int cam_cc_sm8450_probe(struct platform_device *pdev)
28392839
clk_lucid_evo_pll_configure(&cam_cc_pll7, regmap, &cam_cc_pll7_config);
28402840
clk_lucid_evo_pll_configure(&cam_cc_pll8, regmap, &cam_cc_pll8_config);
28412841

2842-
return qcom_cc_really_probe(pdev, &cam_cc_sm8450_desc, regmap);
2842+
return qcom_cc_really_probe(&pdev->dev, &cam_cc_sm8450_desc, regmap);
28432843
}
28442844

28452845
static struct platform_driver cam_cc_sm8450_driver = {

drivers/clk/qcom/camcc-sm8550.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3540,7 +3540,7 @@ static int cam_cc_sm8550_probe(struct platform_device *pdev)
35403540
qcom_branch_set_clk_en(regmap, 0x1419c); /* CAM_CC_GDSC_CLK */
35413541
qcom_branch_set_clk_en(regmap, 0x142cc); /* CAM_CC_SLEEP_CLK */
35423542

3543-
ret = qcom_cc_really_probe(pdev, &cam_cc_sm8550_desc, regmap);
3543+
ret = qcom_cc_really_probe(&pdev->dev, &cam_cc_sm8550_desc, regmap);
35443544

35453545
pm_runtime_put(&pdev->dev);
35463546

0 commit comments

Comments
 (0)