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

Commit 975602b7 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: smd: Add rpm voter clocks for TRINKET"

parents 96dd3d04 a2ff4acb

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

+77 −0
Original line number Diff line number Diff line
@@ -739,6 +739,50 @@ static DEFINE_CLK_VOTER(cnoc_msmbus_clk, cnoc_clk, LONG_MAX); 
static DEFINE_CLK_VOTER(cnoc_msmbus_a_clk, cnoc_a_clk, LONG_MAX);

static DEFINE_CLK_VOTER(cnoc_keepalive_a_clk, cnoc_a_clk, LONG_MAX);

static DEFINE_CLK_VOTER(snoc_keepalive_a_clk, snoc_a_clk, LONG_MAX);

static DEFINE_CLK_VOTER(vfe_mmrt_msmbus_clk, mmrt_clk, LONG_MAX);

static DEFINE_CLK_VOTER(vfe_mmrt_msmbus_a_clk, mmrt_a_clk, LONG_MAX);

static DEFINE_CLK_VOTER(mdp_mmrt_msmbus_clk, mmrt_clk, LONG_MAX);

static DEFINE_CLK_VOTER(mdp_mmrt_msmbus_a_clk, mmrt_a_clk, LONG_MAX);

static DEFINE_CLK_VOTER(cpp_mmnrt_msmbus_clk, mmnrt_clk, LONG_MAX);

static DEFINE_CLK_VOTER(cpp_mmnrt_msmbus_a_clk, mmnrt_a_clk, LONG_MAX);

static DEFINE_CLK_VOTER(jpeg_mmnrt_msmbus_clk, mmnrt_clk, LONG_MAX);

static DEFINE_CLK_VOTER(jpeg_mmnrt_msmbus_a_clk, mmnrt_a_clk, LONG_MAX);

static DEFINE_CLK_VOTER(venus_mmnrt_msmbus_clk, mmnrt_clk, LONG_MAX);

static DEFINE_CLK_VOTER(venus_mmnrt_msmbus_a_clk, mmnrt_a_clk, LONG_MAX);

static DEFINE_CLK_VOTER(arm9_mmnrt_msmbus_clk, mmnrt_clk, LONG_MAX);

static DEFINE_CLK_VOTER(arm9_mmnrt_msmbus_a_clk, mmnrt_a_clk, LONG_MAX);

static DEFINE_CLK_VOTER(qup0_msmbus_snoc_periph_clk, snoc_periph_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(qup0_msmbus_snoc_periph_a_clk, snoc_periph_a_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(qup1_msmbus_snoc_periph_clk, snoc_periph_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(qup1_msmbus_snoc_periph_a_clk, snoc_periph_a_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(dap_msmbus_snoc_periph_clk, snoc_periph_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(dap_msmbus_snoc_periph_a_clk, snoc_periph_a_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(sdc1_msmbus_snoc_periph_clk, snoc_periph_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(sdc1_msmbus_snoc_periph_a_clk, snoc_periph_a_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(sdc2_msmbus_snoc_periph_clk, snoc_periph_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(sdc2_msmbus_snoc_periph_a_clk, snoc_periph_a_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(crypto_msmbus_snoc_periph_clk, snoc_periph_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(crypto_msmbus_snoc_periph_a_clk, snoc_periph_a_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(sdc1_slv_msmbus_snoc_periph_clk, snoc_periph_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(sdc1_slv_msmbus_snoc_periph_a_clk, snoc_periph_a_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(sdc2_slv_msmbus_snoc_periph_clk, snoc_periph_clk,

								LONG_MAX);

static DEFINE_CLK_VOTER(sdc2_slv_msmbus_snoc_periph_a_clk, snoc_periph_a_clk,

								LONG_MAX);



/* Branch Voter clocks */

static DEFINE_CLK_BRANCH_VOTER(bi_tcxo_otg_clk, bi_tcxo);
@@ -779,6 +823,39 @@ static struct clk_hw *trinket_clks[] = { 
	[SNOC_MSMBUS_A_CLK] = &snoc_msmbus_a_clk.hw,

	[BIMC_MSMBUS_CLK] = &bimc_msmbus_clk.hw,

	[BIMC_MSMBUS_A_CLK] = &bimc_msmbus_a_clk.hw,

	[CPP_MMNRT_MSMBUS_CLK] = &cpp_mmnrt_msmbus_clk.hw,

	[CPP_MMNRT_MSMBUS_A_CLK] = &cpp_mmnrt_msmbus_a_clk.hw,

	[JPEG_MMNRT_MSMBUS_CLK] = &jpeg_mmnrt_msmbus_clk.hw,

	[JPEG_MMNRT_MSMBUS_A_CLK] = &jpeg_mmnrt_msmbus_a_clk.hw,

	[VENUS_MMNRT_MSMBUS_CLK] = &venus_mmnrt_msmbus_clk.hw,

	[VENUS_MMNRT_MSMBUS_A_CLK] = &venus_mmnrt_msmbus_a_clk.hw,

	[ARM9_MMNRT_MSMBUS_CLK] = &arm9_mmnrt_msmbus_clk.hw,

	[ARM9_MMNRT_MSMBUS_A_CLK] = &arm9_mmnrt_msmbus_a_clk.hw,

	[VFE_MMRT_MSMBUS_CLK] = &vfe_mmrt_msmbus_clk.hw,

	[VFE_MMRT_MSMBUS_A_CLK] = &vfe_mmrt_msmbus_a_clk.hw,

	[MDP_MMRT_MSMBUS_CLK] = &mdp_mmrt_msmbus_clk.hw,

	[MDP_MMRT_MSMBUS_A_CLK] = &mdp_mmrt_msmbus_a_clk.hw,

	[QUP0_MSMBUS_SNOC_PERIPH_CLK] = &qup0_msmbus_snoc_periph_clk.hw,

	[QUP0_MSMBUS_SNOC_PERIPH_A_CLK] = &qup0_msmbus_snoc_periph_a_clk.hw,

	[QUP1_MSMBUS_SNOC_PERIPH_CLK] = &qup1_msmbus_snoc_periph_clk.hw,

	[QUP1_MSMBUS_SNOC_PERIPH_A_CLK] = &qup1_msmbus_snoc_periph_a_clk.hw,

	[DAP_MSMBUS_SNOC_PERIPH_CLK] = &dap_msmbus_snoc_periph_clk.hw,

	[DAP_MSMBUS_SNOC_PERIPH_A_CLK] = &dap_msmbus_snoc_periph_a_clk.hw,

	[SDC1_MSMBUS_SNOC_PERIPH_CLK] = &sdc1_msmbus_snoc_periph_clk.hw,

	[SDC1_MSMBUS_SNOC_PERIPH_A_CLK] = &sdc1_msmbus_snoc_periph_a_clk.hw,

	[SDC2_MSMBUS_SNOC_PERIPH_CLK] = &sdc2_msmbus_snoc_periph_clk.hw,

	[SDC2_MSMBUS_SNOC_PERIPH_A_CLK] = &sdc2_msmbus_snoc_periph_a_clk.hw,

	[CRYPTO_MSMBUS_SNOC_PERIPH_CLK] = &crypto_msmbus_snoc_periph_clk.hw,

	[CRYPTO_MSMBUS_SNOC_PERIPH_A_CLK] =

				&crypto_msmbus_snoc_periph_a_clk.hw,

	[SDC1_SLV_MSMBUS_SNOC_PERIPH_CLK] =

				&sdc1_slv_msmbus_snoc_periph_clk.hw,

	[SDC1_SLV_MSMBUS_SNOC_PERIPH_A_CLK] =

				&sdc1_slv_msmbus_snoc_periph_a_clk.hw,

	[SDC2_SLV_MSMBUS_SNOC_PERIPH_CLK] =

				&sdc2_slv_msmbus_snoc_periph_clk.hw,

	[SDC2_SLV_MSMBUS_SNOC_PERIPH_A_CLK] =

				&sdc2_slv_msmbus_snoc_periph_a_clk.hw,

	[MCD_CE1_CLK] = &mcd_ce1_clk.hw,

	[QCEDEV_CE1_CLK] = &qcedev_ce1_clk.hw,

	[QCRYPTO_CE1_CLK] = &qcrypto_ce1_clk.hw,

include/dt-bindings/clock/qcom,rpmcc.h

+30 −0
Original line number Diff line number Diff line
@@ -164,5 +164,35 @@ 
#define CNOC_MSMBUS_A_CLK				122

#define CNOC_KEEPALIVE_A_CLK				123

#define SNOC_KEEPALIVE_A_CLK				124

#define CPP_MMNRT_MSMBUS_CLK				125

#define CPP_MMNRT_MSMBUS_A_CLK				126

#define JPEG_MMNRT_MSMBUS_CLK				127

#define JPEG_MMNRT_MSMBUS_A_CLK				128

#define VENUS_MMNRT_MSMBUS_CLK				129

#define VENUS_MMNRT_MSMBUS_A_CLK			130

#define ARM9_MMNRT_MSMBUS_CLK				131

#define ARM9_MMNRT_MSMBUS_A_CLK				132

#define MDP_MMRT_MSMBUS_CLK				133

#define MDP_MMRT_MSMBUS_A_CLK				134

#define VFE_MMRT_MSMBUS_CLK				135

#define VFE_MMRT_MSMBUS_A_CLK				136

#define QUP0_MSMBUS_SNOC_PERIPH_CLK			137

#define QUP0_MSMBUS_SNOC_PERIPH_A_CLK			138

#define QUP1_MSMBUS_SNOC_PERIPH_CLK			139

#define QUP1_MSMBUS_SNOC_PERIPH_A_CLK			140

#define QUP2_MSMBUS_SNOC_PERIPH_CLK                     141

#define QUP2_MSMBUS_SNOC_PERIPH_A_CLK                   142

#define DAP_MSMBUS_SNOC_PERIPH_CLK			143

#define DAP_MSMBUS_SNOC_PERIPH_A_CLK			144

#define SDC1_MSMBUS_SNOC_PERIPH_CLK			145

#define SDC1_MSMBUS_SNOC_PERIPH_A_CLK			146

#define SDC2_MSMBUS_SNOC_PERIPH_CLK			147

#define SDC2_MSMBUS_SNOC_PERIPH_A_CLK			148

#define CRYPTO_MSMBUS_SNOC_PERIPH_CLK			149

#define CRYPTO_MSMBUS_SNOC_PERIPH_A_CLK			150

#define SDC1_SLV_MSMBUS_SNOC_PERIPH_CLK			151

#define SDC1_SLV_MSMBUS_SNOC_PERIPH_A_CLK		152

#define SDC2_SLV_MSMBUS_SNOC_PERIPH_CLK			153

#define SDC2_SLV_MSMBUS_SNOC_PERIPH_A_CLK		154



#endif