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

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

Merge "clk: msm: clock-gcc: Add support for cpu clock debug mux"

parents cbf75ee8 06906c8d

arch/arm/boot/dts/qcom/msmtitanium.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -713,6 +713,8 @@ 
		compatible = "qcom,cc-debug-titanium";

		reg = <0x1874000 0x4>;

		reg-names = "cc_base";

		clocks = <&clock_cpu clk_cpu_debug_pri_mux>;

		clock-names = "debug_cpu_clk";

		#clock-cells = <1>;

	};

drivers/clk/msm/clock-gcc-titanium.c

+12 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ DEFINE_CLK_RPM_SMD_XO_BUFFER_PINCTRL(bb_clk1_pin, bb_clk1_a_pin, BB_CLK1_ID); 
DEFINE_CLK_RPM_SMD_XO_BUFFER_PINCTRL(bb_clk2_pin, bb_clk2_a_pin, BB_CLK2_ID);



DEFINE_CLK_DUMMY(wcnss_m_clk, 0);

DEFINE_EXT_CLK(debug_cpu_clk, NULL);



static struct pll_vote_clk gpll0_clk_src = {

	.en_reg = (void __iomem *)APCS_GPLL_ENA_VOTE,
@@ -3266,7 +3267,11 @@ static struct mux_clk gcc_debug_mux = { 
	.en_offset = GCC_DEBUG_CLK_CTL,

	.en_mask = BIT(16),

	.base = &virt_bases[GCC_BASE],

	MUX_REC_SRC_LIST(

		&debug_cpu_clk.c,

	),

	MUX_SRC_LIST(

		{ &debug_cpu_clk.c, 0x016A },

		{ &snoc_clk.c, 0x0000 },

		{ &sysmmnoc_clk.c, 0x0001 },

		{ &pcnoc_clk.c, 0x0008 },
@@ -3741,6 +3746,7 @@ arch_initcall(msm_gcc_init); 


static struct clk_lookup msm_clocks_measure[] = {

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

	CLK_LIST(debug_cpu_clk),

};



static int msm_clock_debug_probe(struct platform_device *pdev)
@@ -3750,6 +3756,12 @@ static int msm_clock_debug_probe(struct platform_device *pdev) 
	clk_ops_debug_mux = clk_ops_gen_mux;

	clk_ops_debug_mux.get_rate = measure_get_rate;



	debug_cpu_clk.c.parent = devm_clk_get(&pdev->dev, "debug_cpu_clk");

	if (IS_ERR(debug_cpu_clk.c.parent)) {

		dev_err(&pdev->dev, "Failed to get CPU debug Mux\n");

		return PTR_ERR(debug_cpu_clk.c.parent);

	}



	ret =  of_msm_clock_register(pdev->dev.of_node, msm_clocks_measure,

					ARRAY_SIZE(msm_clocks_measure));

	if (ret) {

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

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ 
#define clk_cci_m_clk					 0xec7e8afc

#define clk_apss_debug_pri_mux				 0xc691ff55

#define clk_cpu_debug_pri_mux				 0x61a2945f

#define clk_debug_cpu_clk                                0x0e696b2b



#define clk_audio_ap_clk				 0x312ac429

#define clk_audio_pmi_clk				 0xb7ba2274