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

Commit 5cf60f84 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-gcc-8974: Allow measurement of clocks in the WCNSS"

parents d0e566bf 9a2d687c

arch/arm/mach-msm/clock-gcc-8974.c

+7 −0
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ DEFINE_EXT_CLK(mmss_debug_clk, NULL); 
DEFINE_EXT_CLK(kpss_debug_clk, NULL);

DEFINE_EXT_CLK(rpm_debug_clk, NULL);



DEFINE_CLK_DUMMY(wcnss_m_clk, 0);



static unsigned int soft_vote_gpll0;



static struct pll_vote_clk gpll0_ao_clk_src = {
@@ -2350,6 +2352,7 @@ static struct mux_clk gcc_debug_mux = { 
		{&gcc_ce1_clk.c,		 0x0138},

		{&gcc_lpass_q6_axi_clk.c,	 0x0160},

		{&gcc_mss_q6_bimc_axi_clk.c,	 0x0031},

		{&wcnss_m_clk.c,		 0x0198},

	),

	.c = {

		.dbg_name = "gcc_debug_mux",
@@ -2509,6 +2512,9 @@ static struct clk_lookup msm_clocks_gcc_8974[] = { 
	CLK_LOOKUP_OF("iface_clk", gcc_blsp1_ahb_clk, "f9928000.i2c"),

	CLK_LOOKUP_OF("core_clk",

			gcc_blsp1_qup6_i2c_apps_clk, "f9928000.i2c"),



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



};



static struct clk_lookup msm_clocks_gcc_8974_only[] = {
@@ -2698,6 +2704,7 @@ arch_initcall(msm_gcc_8974_init); 


static struct clk_lookup msm_clocks_measure_8974[] = {

	CLK_LOOKUP_OF("measure", gcc_debug_mux, "debug"),

	CLK_LOOKUP_OF("measure", gcc_debug_mux, "fb000000.qcom,wcnss-wlan"),

};



static struct of_device_id msm_clock_debug_match_table[] = {

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

+1 −0
Original line number Diff line number Diff line
@@ -283,5 +283,6 @@ 
#define clk_venus0_vcodec0_clk 0xaf0dbde4

#define clk_vfe0_clk_src 0xa0c2bd8f

#define clk_vfe1_clk_src 0x4e357366

#define clk_wcnss_m_clk 0x709f430b



#endif