Commit 74419b88 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson
Browse files

clk: qcom: smd-rpm: rename SMD_RPM_BRANCH clock symbols 



To ease distinguishing between branch and non-branch clocks (e.g.
aggre1_noc, aggre2_noc and qdss) add '_branch' to all SMD_RPM_BRANCH*
clocks. The system (and userspace) name of these clocks remains intact.

Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221209164855.128798-17-dmitry.baryshkov@linaro.org
parent e3c88f23

drivers/clk/qcom/clk-smd-rpm.c

+54 −48
Original line number Diff line number Diff line
@@ -61,15 +61,15 @@ 
		},							      \

	}



#define __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, r_id,    \

				    r, key)				      \

	static struct clk_smd_rpm _platform##_##_active;		      \

	static struct clk_smd_rpm _platform##_##_name = {		      \

#define __DEFINE_CLK_SMD_RPM_BRANCH_PREFIX(_platform, _prefix, _name, _active,\

					   type, r_id, r, key)		      \

	static struct clk_smd_rpm _platform##_##_prefix##_active;	      \

	static struct clk_smd_rpm _platform##_##_prefix##_name = {	      \

		.rpm_res_type = (type),					      \

		.rpm_clk_id = (r_id),					      \

		.rpm_key = (key),					      \

		.branch = true,						      \

		.peer = &_platform##_##_active,				      \

		.peer = &_platform##_##_prefix##_active,		      \

		.rate = (r),						      \

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

			.ops = &clk_smd_rpm_branch_ops,			      \
@@ -81,13 +81,13 @@ 
			.num_parents = 1,				      \

		},							      \

	};								      \

	static struct clk_smd_rpm _platform##_##_active = {		      \

	static struct clk_smd_rpm _platform##_##_prefix##_active = {	      \

		.rpm_res_type = (type),					      \

		.rpm_clk_id = (r_id),					      \

		.active_only = true,					      \

		.rpm_key = (key),					      \

		.branch = true,						      \

		.peer = &_platform##_##_name,				      \

		.peer = &_platform##_##_prefix##_name,			      \

		.rate = (r),						      \

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

			.ops = &clk_smd_rpm_branch_ops,			      \
@@ -100,6 +100,11 @@ 
		},							      \

	}



#define __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, r_id,    \

				    r, key)				      \

		__DEFINE_CLK_SMD_RPM_BRANCH_PREFIX(_platform, /* empty */,    \

		_name, _active, type, r_id, r, key)



#define DEFINE_CLK_SMD_RPM(_platform, _name, type, r_id)		      \

		__DEFINE_CLK_SMD_RPM(_platform, _name##_clk, _name##_a_clk,   \

		type, r_id, QCOM_RPM_SMD_KEY_RATE)
@@ -110,12 +115,13 @@ 
		type, r_id, QCOM_RPM_SMD_KEY_RATE)



#define DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, type, r_id, r)	      \

		__DEFINE_CLK_SMD_RPM_BRANCH(_platform,			      \

		__DEFINE_CLK_SMD_RPM_BRANCH_PREFIX(_platform, branch_,	      \

		_name##_clk, _name##_a_clk,				      \

		type, r_id, r, QCOM_RPM_SMD_KEY_ENABLE)



#define DEFINE_CLK_SMD_RPM_BRANCH_A(_platform, _name, type, r_id, r)	      \

		__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _name##_a, type,\

		__DEFINE_CLK_SMD_RPM_BRANCH_PREFIX(_platform, branch_,	      \

		_name, _name##_a, type,					      \

		r_id, r, QCOM_RPM_SMD_KEY_ENABLE)



#define DEFINE_CLK_SMD_RPM_QDSS(_platform, _name, type, r_id)		      \
@@ -638,8 +644,8 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8974 = { 
};



static struct clk_smd_rpm *msm8976_clks[] = {

	[RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC] = &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_PCNOC_CLK] = &msm8916_pcnoc_clk,

	[RPM_SMD_PCNOC_A_CLK] = &msm8916_pcnoc_a_clk,

	[RPM_SMD_SNOC_CLK] = &msm8916_snoc_clk,
@@ -672,8 +678,8 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8976 = { 
};



static struct clk_smd_rpm *msm8992_clks[] = {

	[RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC] = &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_PNOC_CLK] = &msm8916_pcnoc_clk,

	[RPM_SMD_PNOC_A_CLK] = &msm8916_pcnoc_a_clk,

	[RPM_SMD_OCMEMGX_CLK] = &msm8974_ocmemgx_clk,
@@ -706,8 +712,8 @@ static struct clk_smd_rpm *msm8992_clks[] = { 
	[RPM_SMD_LN_BB_A_CLK] = &qcs404_ln_bb_clk_a,

	[RPM_SMD_MMSSNOC_AHB_CLK] = &msm8974_mmssnoc_ahb_clk,

	[RPM_SMD_MMSSNOC_AHB_A_CLK] = &msm8974_mmssnoc_ahb_a_clk,

	[RPM_SMD_MSS_CFG_AHB_CLK] = &msm8992_mss_cfg_ahb_clk,

	[RPM_SMD_MSS_CFG_AHB_A_CLK] = &msm8992_mss_cfg_ahb_a_clk,

	[RPM_SMD_MSS_CFG_AHB_CLK] = &msm8992_branch_mss_cfg_ahb_clk,

	[RPM_SMD_MSS_CFG_AHB_A_CLK] = &msm8992_branch_mss_cfg_ahb_a_clk,

	[RPM_SMD_QDSS_CLK] = &msm8916_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &msm8916_qdss_a_clk,

	[RPM_SMD_RF_CLK1] = &msm8916_rf_clk1,
@@ -730,8 +736,8 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8992 = { 
};



static struct clk_smd_rpm *msm8994_clks[] = {

	[RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC] = &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_PNOC_CLK] = &msm8916_pcnoc_clk,

	[RPM_SMD_PNOC_A_CLK] = &msm8916_pcnoc_a_clk,

	[RPM_SMD_OCMEMGX_CLK] = &msm8974_ocmemgx_clk,
@@ -764,8 +770,8 @@ static struct clk_smd_rpm *msm8994_clks[] = { 
	[RPM_SMD_LN_BB_A_CLK] = &qcs404_ln_bb_clk_a,

	[RPM_SMD_MMSSNOC_AHB_CLK] = &msm8974_mmssnoc_ahb_clk,

	[RPM_SMD_MMSSNOC_AHB_A_CLK] = &msm8974_mmssnoc_ahb_a_clk,

	[RPM_SMD_MSS_CFG_AHB_CLK] = &msm8992_mss_cfg_ahb_clk,

	[RPM_SMD_MSS_CFG_AHB_A_CLK] = &msm8992_mss_cfg_ahb_a_clk,

	[RPM_SMD_MSS_CFG_AHB_CLK] = &msm8992_branch_mss_cfg_ahb_clk,

	[RPM_SMD_MSS_CFG_AHB_A_CLK] = &msm8992_branch_mss_cfg_ahb_a_clk,

	[RPM_SMD_QDSS_CLK] = &msm8916_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &msm8916_qdss_a_clk,

	[RPM_SMD_RF_CLK1] = &msm8916_rf_clk1,
@@ -804,10 +810,10 @@ static struct clk_smd_rpm *msm8996_clks[] = { 
	[RPM_SMD_IPA_A_CLK] = &msm8976_ipa_a_clk,

	[RPM_SMD_CE1_CLK] = &msm8992_ce1_clk,

	[RPM_SMD_CE1_A_CLK] = &msm8992_ce1_a_clk,

	[RPM_SMD_AGGR1_NOC_CLK] = &msm8996_aggre1_noc_clk,

	[RPM_SMD_AGGR1_NOC_A_CLK] = &msm8996_aggre1_noc_a_clk,

	[RPM_SMD_AGGR2_NOC_CLK] = &msm8996_aggre2_noc_clk,

	[RPM_SMD_AGGR2_NOC_A_CLK] = &msm8996_aggre2_noc_a_clk,

	[RPM_SMD_AGGR1_NOC_CLK] = &msm8996_branch_aggre1_noc_clk,

	[RPM_SMD_AGGR1_NOC_A_CLK] = &msm8996_branch_aggre1_noc_a_clk,

	[RPM_SMD_AGGR2_NOC_CLK] = &msm8996_branch_aggre2_noc_clk,

	[RPM_SMD_AGGR2_NOC_A_CLK] = &msm8996_branch_aggre2_noc_a_clk,

	[RPM_SMD_QDSS_CLK] = &msm8916_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &msm8916_qdss_a_clk,

	[RPM_SMD_BB_CLK1] = &msm8916_bb_clk1,
@@ -870,8 +876,8 @@ static const struct rpm_smd_clk_desc rpm_clk_qcs404 = { 
};



static struct clk_smd_rpm *msm8998_clks[] = {

	[RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC] = &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_BIMC_CLK] = &msm8916_bimc_clk,

	[RPM_SMD_BIMC_A_CLK] = &msm8916_bimc_a_clk,

	[RPM_SMD_PCNOC_CLK] = &msm8916_pcnoc_clk,
@@ -930,8 +936,8 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8998 = { 
};



static struct clk_smd_rpm *sdm660_clks[] = {

	[RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC] = &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_SNOC_CLK] = &msm8916_snoc_clk,

	[RPM_SMD_SNOC_A_CLK] = &msm8916_snoc_a_clk,

	[RPM_SMD_CNOC_CLK] = &msm8974_cnoc_clk,
@@ -976,8 +982,8 @@ static const struct rpm_smd_clk_desc rpm_clk_sdm660 = { 
};



static struct clk_smd_rpm *mdm9607_clks[] = {

	[RPM_SMD_XO_CLK_SRC]		= &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC]		= &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC]		= &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC]		= &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_PCNOC_CLK]		= &msm8916_pcnoc_clk,

	[RPM_SMD_PCNOC_A_CLK]		= &msm8916_pcnoc_a_clk,

	[RPM_SMD_BIMC_CLK]		= &msm8916_bimc_clk,
@@ -998,8 +1004,8 @@ static const struct rpm_smd_clk_desc rpm_clk_mdm9607 = { 
};



static struct clk_smd_rpm *msm8953_clks[] = {

	[RPM_SMD_XO_CLK_SRC]		= &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC]		= &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC]		= &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC]		= &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_PCNOC_CLK]		= &msm8916_pcnoc_clk,

	[RPM_SMD_PCNOC_A_CLK]		= &msm8916_pcnoc_a_clk,

	[RPM_SMD_SNOC_CLK]		= &msm8916_snoc_clk,
@@ -1034,14 +1040,14 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8953 = { 
};



static struct clk_smd_rpm *sm6125_clks[] = {

	[RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC] = &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_SNOC_CLK] = &sm6125_snoc_clk,

	[RPM_SMD_SNOC_A_CLK] = &sm6125_snoc_a_clk,

	[RPM_SMD_BIMC_CLK] = &msm8916_bimc_clk,

	[RPM_SMD_BIMC_A_CLK] = &msm8916_bimc_a_clk,

	[RPM_SMD_QDSS_CLK] = &sm6125_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &sm6125_qdss_a_clk,

	[RPM_SMD_QDSS_CLK] = &sm6125_branch_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &sm6125_branch_qdss_a_clk,

	[RPM_SMD_RF_CLK1] = &msm8916_rf_clk1,

	[RPM_SMD_RF_CLK1_A] = &msm8916_rf_clk1_a,

	[RPM_SMD_RF_CLK2] = &msm8916_rf_clk2,
@@ -1077,14 +1083,14 @@ static const struct rpm_smd_clk_desc rpm_clk_sm6125 = { 


/* SM6115 */

static struct clk_smd_rpm *sm6115_clks[] = {

	[RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC] = &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_SNOC_CLK] = &sm6125_snoc_clk,

	[RPM_SMD_SNOC_A_CLK] = &sm6125_snoc_a_clk,

	[RPM_SMD_BIMC_CLK] = &msm8916_bimc_clk,

	[RPM_SMD_BIMC_A_CLK] = &msm8916_bimc_a_clk,

	[RPM_SMD_QDSS_CLK] = &sm6125_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &sm6125_qdss_a_clk,

	[RPM_SMD_QDSS_CLK] = &sm6125_branch_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &sm6125_branch_qdss_a_clk,

	[RPM_SMD_RF_CLK1] = &msm8916_rf_clk1,

	[RPM_SMD_RF_CLK1_A] = &msm8916_rf_clk1_a,

	[RPM_SMD_RF_CLK2] = &msm8916_rf_clk2,
@@ -1117,14 +1123,14 @@ static const struct rpm_smd_clk_desc rpm_clk_sm6115 = { 
};



static struct clk_smd_rpm *sm6375_clks[] = {

	[RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC] = &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_SNOC_CLK] = &sm6125_snoc_clk,

	[RPM_SMD_SNOC_A_CLK] = &sm6125_snoc_a_clk,

	[RPM_SMD_BIMC_CLK] = &msm8916_bimc_clk,

	[RPM_SMD_BIMC_A_CLK] = &msm8916_bimc_a_clk,

	[RPM_SMD_QDSS_CLK] = &sm6125_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &sm6125_qdss_a_clk,

	[RPM_SMD_QDSS_CLK] = &sm6125_branch_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &sm6125_branch_qdss_a_clk,

	[RPM_SMD_CNOC_CLK] = &sm6125_cnoc_clk,

	[RPM_SMD_CNOC_A_CLK] = &sm6125_cnoc_a_clk,

	[RPM_SMD_IPA_CLK] = &msm8976_ipa_clk,
@@ -1145,7 +1151,7 @@ static struct clk_smd_rpm *sm6375_clks[] = { 
	[RPM_SMD_HWKM_A_CLK] = &qcm2290_hwkm_a_clk,

	[RPM_SMD_PKA_CLK] = &qcm2290_pka_clk,

	[RPM_SMD_PKA_A_CLK] = &qcm2290_pka_a_clk,

	[RPM_SMD_BIMC_FREQ_LOG] = &sm6375_bimc_freq_log,

	[RPM_SMD_BIMC_FREQ_LOG] = &sm6375_branch_bimc_freq_log,

};



static const struct rpm_smd_clk_desc rpm_clk_sm6375 = {
@@ -1154,14 +1160,14 @@ static const struct rpm_smd_clk_desc rpm_clk_sm6375 = { 
};



static struct clk_smd_rpm *qcm2290_clks[] = {

	[RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,

	[RPM_SMD_XO_CLK_SRC] = &sdm660_branch_bi_tcxo,

	[RPM_SMD_XO_A_CLK_SRC] = &sdm660_branch_bi_tcxo_a,

	[RPM_SMD_SNOC_CLK] = &sm6125_snoc_clk,

	[RPM_SMD_SNOC_A_CLK] = &sm6125_snoc_a_clk,

	[RPM_SMD_BIMC_CLK] = &msm8916_bimc_clk,

	[RPM_SMD_BIMC_A_CLK] = &msm8916_bimc_a_clk,

	[RPM_SMD_QDSS_CLK] = &sm6125_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &sm6125_qdss_a_clk,

	[RPM_SMD_QDSS_CLK] = &sm6125_branch_qdss_clk,

	[RPM_SMD_QDSS_A_CLK] = &sm6125_branch_qdss_a_clk,

	[RPM_SMD_LN_BB_CLK2] = &msm8998_ln_bb_clk2,

	[RPM_SMD_LN_BB_CLK2_A] = &msm8998_ln_bb_clk2_a,

	[RPM_SMD_RF_CLK3] = &qcm2290_rf_clk3,