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

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

Merge "msm: clock-8610: Allow measurement of clocks in the WCNSS"

parents ea0e7087 e241f3c5

arch/arm/mach-msm/clock-8610.c

+5 −0
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ static DEFINE_CLK_MEASURE(apc1_m_clk); 
static DEFINE_CLK_MEASURE(apc2_m_clk);

static DEFINE_CLK_MEASURE(apc3_m_clk);

static DEFINE_CLK_MEASURE(l2_m_clk);

static DEFINE_CLK_MEASURE(wcnss_m_clk);



#define APCS_SH_PLL_MODE        0x000

#define APCS_SH_PLL_L_VAL       0x004
@@ -2509,6 +2510,7 @@ static struct measure_mux_entry measure_mux[] = { 
	{                   &bimc_clk.c, GCC_BASE, 0x0155},

	{          &gcc_bimc_smmu_clk.c, GCC_BASE, 0x015e},

	{       &gcc_lpass_q6_axi_clk.c, GCC_BASE, 0x0160},

	{                  &wcnss_m_clk, GCC_BASE, 0x0198},



	{     &mmssnoc_ahb_clk.c, MMSS_BASE, 0x0001},

	{   &mmss_misc_ahb_clk.c, MMSS_BASE, 0x0003},
@@ -3125,6 +3127,9 @@ static struct clk_lookup msm_clocks_8610[] = { 
	CLK_LOOKUP("measure_clk", apc3_m_clk, ""),

	CLK_LOOKUP("measure_clk",   l2_m_clk, ""),



	CLK_LOOKUP("measure",   measure_clk.c, "fb000000.qcom,wcnss-wlan"),

	CLK_LOOKUP("wcnss_debug", wcnss_m_clk, "fb000000.qcom,wcnss-wlan"),



	CLK_LOOKUP("xo",     cxo_wlan_clk.c, "fb000000.qcom,wcnss-wlan"),

	CLK_LOOKUP("rf_clk",       cxo_a1.c, "fb000000.qcom,wcnss-wlan"),