Commit f5790382 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: qcom: rpmh: Reuse sdm845 clks for sm8150 



The SM8150 list of clks is almost the same as the list for SDM845,
except there isn't an IPA clk. Just point to the SDM845 clks from the
SM8150 list for now so we can reduce the amount of struct bloat in this
driver.

Suggested-by: default avatarVinod Koul <vkoul@kernel.org>
Cc: Taniya Das <tdas@codeaurora.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Link: https://lkml.kernel.org/r/20191107214018.184105-1-sboyd@kernel.org


Reviewed-by: default avatarVinod Koul <vkoul@kernel.org>
parent 3f7df5ba

drivers/clk/qcom/clk-rpmh.c

+14 −20
Original line number Original line Diff line number Diff line
@@ -334,13 +334,14 @@ static const struct clk_ops clk_rpmh_bcm_ops = { 
	.recalc_rate	= clk_rpmh_bcm_recalc_rate,

	.recalc_rate	= clk_rpmh_bcm_recalc_rate,

};

};





/* Resource name must match resource id present in cmd-db. */

/* Resource name must match resource id present in cmd-db */

DEFINE_CLK_RPMH_ARC(sdm845, bi_tcxo, bi_tcxo_ao, "xo.lvl", 0x3, 2);

DEFINE_CLK_RPMH_ARC(sdm845, bi_tcxo, bi_tcxo_ao, "xo.lvl", 0x3, 2);

DEFINE_CLK_RPMH_VRM(sdm845, ln_bb_clk2, ln_bb_clk2_ao, "lnbclka2", 2);

DEFINE_CLK_RPMH_VRM(sdm845, ln_bb_clk2, ln_bb_clk2_ao, "lnbclka2", 2);

DEFINE_CLK_RPMH_VRM(sdm845, ln_bb_clk3, ln_bb_clk3_ao, "lnbclka3", 2);

DEFINE_CLK_RPMH_VRM(sdm845, ln_bb_clk3, ln_bb_clk3_ao, "lnbclka3", 2);

DEFINE_CLK_RPMH_VRM(sdm845, rf_clk1, rf_clk1_ao, "rfclka1", 1);

DEFINE_CLK_RPMH_VRM(sdm845, rf_clk1, rf_clk1_ao, "rfclka1", 1);

DEFINE_CLK_RPMH_VRM(sdm845, rf_clk2, rf_clk2_ao, "rfclka2", 1);

DEFINE_CLK_RPMH_VRM(sdm845, rf_clk2, rf_clk2_ao, "rfclka2", 1);

DEFINE_CLK_RPMH_VRM(sdm845, rf_clk3, rf_clk3_ao, "rfclka3", 1);

DEFINE_CLK_RPMH_VRM(sdm845, rf_clk3, rf_clk3_ao, "rfclka3", 1);

DEFINE_CLK_RPMH_VRM(sm8150, rf_clk3, rf_clk3_ao, "rfclka3", 1);

DEFINE_CLK_RPMH_BCM(sdm845, ipa, "IP0");

DEFINE_CLK_RPMH_BCM(sdm845, ipa, "IP0");





static struct clk_hw *sdm845_rpmh_clocks[] = {

static struct clk_hw *sdm845_rpmh_clocks[] = {
@@ -364,26 +365,19 @@ static const struct clk_rpmh_desc clk_rpmh_sdm845 = { 
	.num_clks = ARRAY_SIZE(sdm845_rpmh_clocks),

	.num_clks = ARRAY_SIZE(sdm845_rpmh_clocks),

};

};





DEFINE_CLK_RPMH_ARC(sm8150, bi_tcxo, bi_tcxo_ao, "xo.lvl", 0x3, 2);

DEFINE_CLK_RPMH_VRM(sm8150, ln_bb_clk2, ln_bb_clk2_ao, "lnbclka2", 2);

DEFINE_CLK_RPMH_VRM(sm8150, ln_bb_clk3, ln_bb_clk3_ao, "lnbclka3", 2);

DEFINE_CLK_RPMH_VRM(sm8150, rf_clk1, rf_clk1_ao, "rfclka1", 1);

DEFINE_CLK_RPMH_VRM(sm8150, rf_clk2, rf_clk2_ao, "rfclka2", 1);

DEFINE_CLK_RPMH_VRM(sm8150, rf_clk3, rf_clk3_ao, "rfclka3", 1);



static struct clk_hw *sm8150_rpmh_clocks[] = {

static struct clk_hw *sm8150_rpmh_clocks[] = {

	[RPMH_CXO_CLK]		= &sm8150_bi_tcxo.hw,

	[RPMH_CXO_CLK]		= &sdm845_bi_tcxo.hw,

	[RPMH_CXO_CLK_A]	= &sm8150_bi_tcxo_ao.hw,

	[RPMH_CXO_CLK_A]	= &sdm845_bi_tcxo_ao.hw,

	[RPMH_LN_BB_CLK2]	= &sm8150_ln_bb_clk2.hw,

	[RPMH_LN_BB_CLK2]	= &sdm845_ln_bb_clk2.hw,

	[RPMH_LN_BB_CLK2_A]	= &sm8150_ln_bb_clk2_ao.hw,

	[RPMH_LN_BB_CLK2_A]	= &sdm845_ln_bb_clk2_ao.hw,

	[RPMH_LN_BB_CLK3]	= &sm8150_ln_bb_clk3.hw,

	[RPMH_LN_BB_CLK3]	= &sdm845_ln_bb_clk3.hw,

	[RPMH_LN_BB_CLK3_A]	= &sm8150_ln_bb_clk3_ao.hw,

	[RPMH_LN_BB_CLK3_A]	= &sdm845_ln_bb_clk3_ao.hw,

	[RPMH_RF_CLK1]		= &sm8150_rf_clk1.hw,

	[RPMH_RF_CLK1]		= &sdm845_rf_clk1.hw,

	[RPMH_RF_CLK1_A]	= &sm8150_rf_clk1_ao.hw,

	[RPMH_RF_CLK1_A]	= &sdm845_rf_clk1_ao.hw,

	[RPMH_RF_CLK2]		= &sm8150_rf_clk2.hw,

	[RPMH_RF_CLK2]		= &sdm845_rf_clk2.hw,

	[RPMH_RF_CLK2_A]	= &sm8150_rf_clk2_ao.hw,

	[RPMH_RF_CLK2_A]	= &sdm845_rf_clk2_ao.hw,

	[RPMH_RF_CLK3]		= &sm8150_rf_clk3.hw,

	[RPMH_RF_CLK3]		= &sdm845_rf_clk3.hw,

	[RPMH_RF_CLK3_A]	= &sm8150_rf_clk3_ao.hw,

	[RPMH_RF_CLK3_A]	= &sdm845_rf_clk3_ao.hw,

};

};





static const struct clk_rpmh_desc clk_rpmh_sm8150 = {

static const struct clk_rpmh_desc clk_rpmh_sm8150 = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE