Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0695bf1d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add scc plls as fixed clocks for sm6150/sm8150"

parents 5906eec4 2ea871ff

arch/arm64/boot/dts/qcom/sm6150.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -802,6 +802,22 @@ 
			clock-output-names = "chip_sleep_clk";

			#clock-cells = <1>;

		};



		scc_pll_out_aux2: scc_pll_out_aux2 {

			compatible = "fixed-clock";

			clock-frequency = <600000000>;

			clock-output-names = "scc_pll_out_aux2";

			#clock-cells = <0>;

		};



		scc_pll_out_aux: scc_pll_out_aux {

			compatible = "fixed-factor-clock";

			clock-output-names = "scc_pll_out_aux";

			clocks = <&scc_pll_out_aux2>;

			clock-mult = <1>;

			clock-div = <2>;

			#clock-cells = <0>;

		};

	};



	clock_rpmh: qcom,rpmhclk {

arch/arm64/boot/dts/qcom/sm8150-v2.dtsi

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -86,6 +86,10 @@ 
	compatible = "qcom,npucc-sm8150-v2", "syscon";

};



&scc_pll {

	clock-frequency = <576000000>;

};



&clock_scc {

	compatible = "qcom,scc-sm8150-v2";

};

arch/arm64/boot/dts/qcom/sm8150.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,24 @@ 
		};

	};



	clocks {

		scc_pll: scc_pll {

			compatible = "fixed-clock";

			clock-frequency = <600000000>;

			clock-output-names = "scc_pll";

			#clock-cells = <0>;

		};



		scc_pll_out_even: scc_pll_out_even {

			compatible = "fixed-factor-clock";

			clock-output-names = "scc_pll_out_even";

			clocks = <&scc_pll>;

			clock-mult = <1>;

			clock-div = <2>;

			#clock-cells = <0>;

		};

	};



	llcc_pmu: llcc-pmu@90cc000 {

		compatible = "qcom,qcom-llcc-pmu";

		reg = <0x090cc000 0x300>;

drivers/clk/qcom/scc-sm6150.c

+1 −82
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -69,66 +69,6 @@ static const char * const scc_parent_names_0[] = { 
	"ssc_bi_pll_test_se",

};



static struct pll_vco scc_pll_vco[] = {

	{ 500000000, 1000000000, 2 },

};



/* 600MHz configuration */

static struct alpha_pll_config scc_pll_config = {

	.l = 0x1F,

	.alpha_u = 0x40,

	.alpha_en_mask = BIT(24),

	.vco_val = 0x2 << 20,

	.vco_mask = 0x3 << 20,

	.post_div_val = 0x3 << 15,

	.post_div_mask = 0x7 << 15,

	.aux_output_mask = BIT(1),

	.aux2_output_mask = BIT(2),

	.config_ctl_val = 0x4001055b,

	.test_ctl_hi_val = 0x1,

	.test_ctl_hi_mask = 0x1,

};



static struct clk_alpha_pll scc_pll_out_aux2 = {

	.offset = 0x0,

	.vco_table = scc_pll_vco,

	.num_vco = ARRAY_SIZE(scc_pll_vco),

	.config = &scc_pll_config,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "scc_pll_out_aux2",

		.parent_names = (const char *[]){ "bi_tcxo" },

		.num_parents = 1,

		.ops = &clk_alpha_pll_ops,

		.vdd_class = &vdd_scc_cx,

		.num_rate_max = VDD_NUM,

		.rate_max = (unsigned long[VDD_NUM]) {

			[VDD_MIN] = 1000000000,

			[VDD_NOMINAL] = 2000000000},

	},

};



static const struct clk_div_table post_div_table[] = {

	{ 0x0, 1 },

	{ 0x3, 3 },

	{ 0x5, 5 },

	{ 0x7, 7 },

	{ }

};



static struct clk_alpha_pll_postdiv scc_pll_out_aux = {

	.offset = 0x0,

	.width = 2,

	.post_div_table = post_div_table,

	.num_post_div = ARRAY_SIZE(post_div_table),

	.postdiv = POSTDIV_ODD,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "scc_pll_out_aux",

		.parent_names = (const char *[]){ "scc_pll_out_aux2" },

		.num_parents = 1,

		.ops = &clk_alpha_pll_postdiv_ops,

	},

};



static const struct freq_tbl ftbl_scc_main_rcg_clk_src[] = {

	F(100000000, P_SCC_PLL_OUT_AUX, 2, 0, 0),

	F(200000000, P_SCC_PLL_OUT_AUX, 1, 0, 0),
@@ -485,8 +425,6 @@ static struct clk_branch scc_qupv3_se5_clk = { 
};



static struct clk_regmap *scc_sm6150_clocks[] = {

	[SCC_PLL_OUT_AUX2] = &scc_pll_out_aux2.clkr,

	[SCC_PLL_OUT_AUX] = &scc_pll_out_aux.clkr,

	[SCC_MAIN_RCG_CLK_SRC] = &scc_main_rcg_clk_src.clkr,

	[SCC_QUPV3_2XCORE_CLK] = &scc_qupv3_2xcore_clk.clkr,

	[SCC_QUPV3_CORE_CLK] = &scc_qupv3_core_clk.clkr,
@@ -541,26 +479,10 @@ static const struct of_device_id scc_sm6150_match_table[] = { 
};

MODULE_DEVICE_TABLE(of, scc_sm6150_match_table);



static int scc_sa6150_resume(struct device *dev)

{

	struct regmap *regmap = dev_get_drvdata(dev);



	clk_alpha_pll_configure(&scc_pll_out_aux2, regmap,

			scc_pll_out_aux2.config);



	return 0;

}



static const struct dev_pm_ops scc_sa6150_pm_ops = {

	.restore_early = scc_sa6150_resume,

};



static void scc_sm6150_fixup_sa6155(struct platform_device *pdev)

{

	vdd_scc_cx.num_levels = VDD_NUM_SA6155;

	vdd_scc_cx.cur_level = VDD_NUM_SA6155;



	pdev->dev.driver->pm =  &scc_sa6150_pm_ops;

}



static int scc_sm6150_probe(struct platform_device *pdev)
@@ -588,9 +510,6 @@ static int scc_sm6150_probe(struct platform_device *pdev) 
		return PTR_ERR(regmap);

	}



	clk_alpha_pll_configure(&scc_pll_out_aux2, regmap,

			scc_pll_out_aux2.config);



	ret = qcom_cc_really_probe(pdev, &scc_sm6150_desc, regmap);

	if (ret) {

		dev_err(&pdev->dev, "Failed to register SCC clocks\n");

drivers/clk/qcom/scc-sm8150.c

+1 −102
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -71,80 +71,6 @@ static const char * const scc_parent_names_0[] = { 
	"ssc_bi_pll_test_se",

};



static struct pll_vco trion_vco[] = {

	{ 249600000, 2000000000, 0 },

};



static struct alpha_pll_config scc_pll_config = {

	.l = 0x1F,

	.alpha = 0x4000,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.test_ctl_val = 0x00000000,

	.test_ctl_hi_val = 0x00000002,

	.test_ctl_hi1_val = 0x00000000,

	.user_ctl_val = 0x00000100,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};



static struct alpha_pll_config scc_pll_config_sm8150_v2 = {

	.l = 0x1E,

	.alpha = 0x0,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.user_ctl_val = 0x00000100,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};



static struct clk_alpha_pll scc_pll = {

	.offset = 0x0,

	.vco_table = trion_vco,

	.num_vco = ARRAY_SIZE(trion_vco),

	.type = TRION_PLL,

	.config = &scc_pll_config,

	.clkr = {

		.hw.init = &(struct clk_init_data){

			.name = "scc_pll",

			.parent_names = (const char *[]){ "bi_tcxo" },

			.num_parents = 1,

			.ops = &clk_trion_pll_ops,

			.vdd_class = &vdd_scc_cx,

			.num_rate_max = VDD_NUM,

			.rate_max = (unsigned long[VDD_NUM]) {

				[VDD_MIN] = 615000000,

				[VDD_LOW] = 1066000000,

				[VDD_LOW_L1] = 1600000000,

				[VDD_NOMINAL] = 2000000000},

		},

	},

};



static const struct clk_div_table post_div_table_trion_even[] = {

	{ 0x0, 1 },

	{ 0x1, 2 },

	{ 0x3, 4 },

	{ 0x7, 8 },

	{ }

};



static struct clk_alpha_pll_postdiv scc_pll_out_even = {

	.offset = 0x0,

	.post_div_shift = 8,

	.post_div_table = post_div_table_trion_even,

	.num_post_div = ARRAY_SIZE(post_div_table_trion_even),

	.width = 4,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "scc_pll_out_even",

		.parent_names = (const char *[]){ "scc_pll" },

		.num_parents = 1,

		.ops = &clk_trion_pll_postdiv_ops,

	},

};



static const struct freq_tbl ftbl_scc_main_rcg_clk_src[] = {

	F(100000000, P_SCC_PLL_OUT_EVEN, 3, 0, 0),

	{ }
@@ -525,8 +451,6 @@ static struct clk_branch scc_qupv3_se5_clk = { 


static struct clk_regmap *scc_sm8150_clocks[] = {

	[SCC_MAIN_RCG_CLK_SRC] = &scc_main_rcg_clk_src.clkr,

	[SCC_PLL] = &scc_pll.clkr,

	[SCC_PLL_OUT_EVEN] = &scc_pll_out_even.clkr,

	[SCC_QUPV3_2XCORE_CLK] = &scc_qupv3_2xcore_clk.clkr,

	[SCC_QUPV3_CORE_CLK] = &scc_qupv3_core_clk.clkr,

	[SCC_QUPV3_M_HCLK_CLK] = &scc_qupv3_m_hclk_clk.clkr,
@@ -583,21 +507,6 @@ static const struct of_device_id scc_sm8150_match_table[] = { 
};

MODULE_DEVICE_TABLE(of, scc_sm8150_match_table);



static int scc_sa8155_resume(struct device *dev)

{

	struct regmap *regmap = dev_get_drvdata(dev);



	/* Reconfigure the scc pll */

	scc_pll.inited = false;

	clk_trion_pll_configure(&scc_pll, regmap, scc_pll.config);



	return 0;

}



static const struct dev_pm_ops scc_sa8155_pm_ops = {

	.restore_early = scc_sa8155_resume,

};



static void scc_sa8195_fixup(struct platform_device *pdev)

{

	if (of_device_is_compatible(pdev->dev.of_node, "qcom,scc-sa8195")) {
@@ -608,8 +517,6 @@ static void scc_sa8195_fixup(struct platform_device *pdev) 


static void scc_sm8150_fixup_sm8150v2(struct regmap *regmap)

{

	scc_pll.config = &scc_pll_config_sm8150_v2;



	scc_main_rcg_clk_src.freq_tbl = ftbl_scc_main_rcg_clk_src_sm8150_v2;

	scc_main_rcg_clk_src.clkr.hw.init->rate_max[VDD_MIN] = 96000000;

	scc_main_rcg_clk_src.clkr.hw.init->rate_max[VDD_LOW] = 576000000;
@@ -666,12 +573,6 @@ static int scc_sm8150_fixup(struct platform_device *pdev, struct regmap *regmap) 
			!strcmp(compat, "qcom,scc-sa8155-v2"))

		scc_sm8150_fixup_sm8150v2(regmap);



	if (!strcmp(compat, "qcom,scc-sa8155") ||

			!strcmp(compat, "qcom,scc-sa8155-v2")) {

		pdev->dev.driver->pm = &scc_sa8155_pm_ops;

		dev_set_drvdata(&pdev->dev, regmap);

	}



	return 0;

}
@@ -701,8 +602,6 @@ static int scc_sm8150_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	clk_trion_pll_configure(&scc_pll, regmap, scc_pll.config);



	ret = qcom_cc_really_probe(pdev, &scc_sm8150_desc, regmap);

	if (ret) {

		dev_err(&pdev->dev, "Failed to register SCC clocks\n");