github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

clk: qcom: gcc-x1e80100: Use common clock controller probe data

Browse Source 
Move the always-on branch register offsets into a critical_cbcrs array,
describe the DFS RCGs through qcom_cc_driver_data and move the register
programming into the clk_regs_configure callback.

Use qcom_cc_probe() to perform the common initialization instead of
open-coding it in the driver's probe.

Assisted-by: LLM
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
Link: https://patch.msgid.link/20260924-clk-qcom-rework-legacy-always-on-clocks-v2-35-1479443ee016@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
Abel Vesa 2026-09-24 15:06:47 +03:00 committed by Bjorn Andersson
parent 4423afe852
commit b981a88f76
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/clk/qcom/gcc-x1e80100.c
View File

@ -7441,7 +7441,37 @@ static const struct regmap_config gcc_x1e80100_regmap_config = {
.fast_io = true,
};
static const u32 gcc_x1e80100_critical_cbcrs[] = {
0x26004, /* GCC_CAMERA_AHB_CLK */
0x26028, /* GCC_CAMERA_XO_CLK */
0x27004, /* GCC_DISP_AHB_CLK */
0x27018, /* GCC_DISP_XO_CLK */
0x32004, /* GCC_VIDEO_AHB_CLK */
0x32030, /* GCC_VIDEO_XO_CLK */
0x71004, /* GCC_GPU_CFG_AHB_CLK */
0x7d01c, /* GCC_HLOS1_VOTE_AGGRE_NOC_MMU_USB_QTB_CLK */
};
static void gcc_x1e80100_regs_configure(struct device *dev, struct regmap *regmap)
{
/* Clear GDSC_SLEEP_ENA_VOTE to stop votes being auto-removed in sleep. */
regmap_write(regmap, 0x52224, 0x0);
/* FORCE_MEM_CORE_ON for ufs phy ice core and gcc ufs phy axi clocks */
qcom_branch_set_force_mem_core(regmap, gcc_ufs_phy_ice_core_clk, true);
qcom_branch_set_force_mem_core(regmap, gcc_ufs_phy_axi_clk, true);
}
static const struct qcom_cc_driver_data gcc_x1e80100_driver_data = {
.clk_cbcrs = gcc_x1e80100_critical_cbcrs,
.num_clk_cbcrs = ARRAY_SIZE(gcc_x1e80100_critical_cbcrs),
.dfs_rcgs = gcc_dfs_clocks,
.num_dfs_rcgs = ARRAY_SIZE(gcc_dfs_clocks),
.clk_regs_configure = gcc_x1e80100_regs_configure,
};
static const struct qcom_cc_desc gcc_x1e80100_desc = {
.driver_data = &gcc_x1e80100_driver_data,
.config = &gcc_x1e80100_regmap_config,
.clks = gcc_x1e80100_clocks,
.num_clks = ARRAY_SIZE(gcc_x1e80100_clocks),
@ -7460,36 +7490,7 @@ MODULE_DEVICE_TABLE(of, gcc_x1e80100_match_table);
static int gcc_x1e80100_probe(struct platform_device *pdev)
{
struct regmap *regmap;
int ret;
regmap = qcom_cc_map(pdev, &gcc_x1e80100_desc);
if (IS_ERR(regmap))
return PTR_ERR(regmap);
ret = qcom_cc_register_rcg_dfs(regmap, gcc_dfs_clocks,
ARRAY_SIZE(gcc_dfs_clocks));
if (ret)
return ret;
/* Keep some clocks always-on */
qcom_branch_set_clk_en(regmap, 0x26004); /* GCC_CAMERA_AHB_CLK */
qcom_branch_set_clk_en(regmap, 0x26028); /* GCC_CAMERA_XO_CLK */
qcom_branch_set_clk_en(regmap, 0x27004); /* GCC_DISP_AHB_CLK */
qcom_branch_set_clk_en(regmap, 0x27018); /* GCC_DISP_XO_CLK */
qcom_branch_set_clk_en(regmap, 0x32004); /* GCC_VIDEO_AHB_CLK */
qcom_branch_set_clk_en(regmap, 0x32030); /* GCC_VIDEO_XO_CLK */
qcom_branch_set_clk_en(regmap, 0x71004); /* GCC_GPU_CFG_AHB_CLK */
qcom_branch_set_clk_en(regmap, 0x7d01c); /* GCC_HLOS1_VOTE_AGGRE_NOC_MMU_USB_QTB_CLK */
/* Clear GDSC_SLEEP_ENA_VOTE to stop votes being auto-removed in sleep. */
regmap_write(regmap, 0x52224, 0x0);
/* FORCE_MEM_CORE_ON for ufs phy ice core and gcc ufs phy axi clocks */
qcom_branch_set_force_mem_core(regmap, gcc_ufs_phy_ice_core_clk, true);
qcom_branch_set_force_mem_core(regmap, gcc_ufs_phy_axi_clk, true);
return qcom_cc_really_probe(&pdev->dev, &gcc_x1e80100_desc, regmap);
return qcom_cc_probe(pdev, &gcc_x1e80100_desc);
}
static struct platform_driver gcc_x1e80100_driver = {