Commit 9c76c5cf authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files

clk: qcom: gcc-msm8998: Control MMSS and GPUSS GPLL0 outputs properly 



Up until now, we've been relying on some non-descript hardware magic
to pinkypromise turn the clocks on for us. While new SoCs shine with
that feature, MSM8998 can not always be fully trusted.

Register the MMSS and GPUSS GPLL0 legs with the CCF to allow for manual
enable voting.

Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Tested-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230622-topic-8998clk-v2-3-6222fbc2916b@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 9127b377

drivers/clk/qcom/gcc-msm8998.c

+58 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
#include "reset.h"

#include "gdsc.h"



#define GCC_MMSS_MISC	0x0902C

#define GCC_GPU_MISC	0x71028



static struct pll_vco fabia_vco[] = {

	{ 250000000, 2000000000, 0 },

	{ 125000000, 1000000000, 1 },
@@ -1367,6 +1370,22 @@ static struct clk_branch gcc_boot_rom_ahb_clk = { 
	},

};



static struct clk_branch gcc_mmss_gpll0_div_clk = {

	.halt_check = BRANCH_HALT_DELAY,

	.clkr = {

		.enable_reg = 0x5200c,

		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "gcc_mmss_gpll0_div_clk",

			.parent_hws = (const struct clk_hw *[]) {

				&gpll0_out_main.clkr.hw,

			},

			.num_parents = 1,

			.ops = &clk_branch2_ops,

		},

	},

};



static struct clk_branch gcc_mmss_gpll0_clk = {

	.halt_check = BRANCH_HALT_DELAY,

	.clkr = {
@@ -1395,6 +1414,38 @@ static struct clk_branch gcc_mss_gpll0_div_clk_src = { 
	},

};



static struct clk_branch gcc_gpu_gpll0_div_clk = {

	.halt_check = BRANCH_HALT_DELAY,

	.clkr = {

		.enable_reg = 0x5200c,

		.enable_mask = BIT(3),

		.hw.init = &(struct clk_init_data){

			.name = "gcc_gpu_gpll0_div_clk",

			.parent_hws = (const struct clk_hw *[]) {

				&gpll0_out_main.clkr.hw,

			},

			.num_parents = 1,

			.ops = &clk_branch2_ops,

		},

	},

};



static struct clk_branch gcc_gpu_gpll0_clk = {

	.halt_check = BRANCH_HALT_DELAY,

	.clkr = {

		.enable_reg = 0x5200c,

		.enable_mask = BIT(4),

		.hw.init = &(struct clk_init_data){

			.name = "gcc_gpu_gpll0_clk",

			.parent_hws = (const struct clk_hw *[]) {

				&gpll0_out_main.clkr.hw,

			},

			.num_parents = 1,

			.ops = &clk_branch2_ops,

		},

	},

};



static struct clk_branch gcc_blsp1_ahb_clk = {

	.halt_reg = 0x17004,

	.halt_check = BRANCH_HALT_VOTED,
@@ -3080,6 +3131,9 @@ static struct clk_regmap *gcc_msm8998_clocks[] = { 
	[AGGRE2_SNOC_NORTH_AXI] = &aggre2_snoc_north_axi_clk.clkr,

	[SSC_XO] = &ssc_xo_clk.clkr,

	[SSC_CNOC_AHBS_CLK] = &ssc_cnoc_ahbs_clk.clkr,

	[GCC_MMSS_GPLL0_DIV_CLK] = &gcc_mmss_gpll0_div_clk.clkr,

	[GCC_GPU_GPLL0_DIV_CLK] = &gcc_gpu_gpll0_div_clk.clkr,

	[GCC_GPU_GPLL0_CLK] = &gcc_gpu_gpll0_clk.clkr,

};



static struct gdsc *gcc_msm8998_gdscs[] = {
@@ -3235,6 +3289,10 @@ static int gcc_msm8998_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	/* Disable the GPLL0 active input to MMSS and GPU via MISC registers */

	regmap_write(regmap, GCC_MMSS_MISC, 0x10003);

	regmap_write(regmap, GCC_GPU_MISC, 0x10003);



	return qcom_cc_really_probe(pdev, &gcc_msm8998_desc, regmap);

}