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

Commit 2fc90df9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: Add support for more BIMC measurement on MSM8994"

parents a4e6dcf4 f47f7bed

drivers/clk/qcom/clock-rpm-8994.c

+6 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ static DEFINE_CLK_VOTER(qseecom_ce3_clk, &ce3_clk.c, 85710000); 
static DEFINE_CLK_VOTER(scm_ce3_clk, &ce3_clk.c, 85710000);

static DEFINE_CLK_VOTER(qcedev_ce3_clk, &ce3_clk.c, 85710000);

static DEFINE_CLK_VOTER(qcrypto_ce3_clk, &ce3_clk.c, 85710000);

DEFINE_CLK_DUMMY(gcc_bimc_kpss_axi_m_clk, 0);

DEFINE_CLK_DUMMY(gcc_mmss_bimc_gfx_m_clk, 0);



static struct mux_clk rpm_debug_mux = {

	.ops = &mux_reg_ops,
@@ -163,12 +165,14 @@ static struct mux_clk rpm_debug_mux = { 
		{ &pnoc_clk.c, 0x0010 },

		{ &snoc_clk.c, 0x0000 },

		{ &bimc_clk.c, 0x015c },

		{ &gcc_mmss_bimc_gfx_m_clk.c, 0x002c },

		{ &ce1_clk.c, 0x0138 },

		{ &gcc_ce1_axi_m_clk.c, 0x0139 },

		{ &gcc_ce1_ahb_m_clk.c, 0x013a },

		{ &ce2_clk.c, 0x0140 },

		{ &gcc_ce2_axi_m_clk.c, 0x0141 },

		{ &gcc_ce2_ahb_m_clk.c, 0x0142 },

		{ &gcc_bimc_kpss_axi_m_clk.c, 0x0155 },

		{ &ce3_clk.c, 0x0228 },

		{ &gcc_ce3_axi_m_clk.c, 0x0229 },

		{ &gcc_ce3_ahb_m_clk.c, 0x022a },
@@ -272,6 +276,8 @@ static struct clk_lookup msm_clocks_rpm_8994[] = { 
	CLK_LIST(ce3_clk),

	CLK_LIST(gcc_ce3_ahb_m_clk),

	CLK_LIST(gcc_ce3_axi_m_clk),

	CLK_LIST(gcc_bimc_kpss_axi_m_clk),

	CLK_LIST(gcc_mmss_bimc_gfx_m_clk),

	CLK_LIST(rpm_debug_mux),

};

include/dt-bindings/clock/msm-clocks-8994.h

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ 
#define clk_ce3_clk 0xb7c009b6

#define clk_gcc_ce3_ahb_m_clk 0x527880ff

#define clk_gcc_ce3_axi_m_clk 0xc8e9a915

#define clk_gcc_bimc_kpss_axi_m_clk 0x1e86d73e

#define clk_gcc_mmss_bimc_gfx_m_clk 0xcf06f534

#define clk_rpm_debug_mux 0x25cd1f3a



/* clock_gcc controlled clocks */