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

Commit 523d1874 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 clock debug support for GFX3D clocks for SDM855" into msm-4.14

parents d4d83da1 869b4190

drivers/clk/qcom/debugcc-sdm855.c

+9 −0
Original line number Diff line number Diff line
@@ -282,6 +282,9 @@ static const char *const debug_mux_parent_names[] = { 
	"gpu_cc_gx_qdss_tsctr_clk",

	"gpu_cc_gx_vsense_clk",

	"gpu_cc_sleep_clk",

	"measure_only_gpu_cc_cx_gfx3d_clk",

	"measure_only_gpu_cc_cx_gfx3d_slv_clk",

	"measure_only_gpu_cc_gx_gfx3d_clk",

	"npu_cc_armwic_core_clk",

	"npu_cc_bto_core_clk",

	"npu_cc_bwmon_clk",
@@ -814,6 +817,12 @@ static struct clk_debug_mux gcc_debug_mux = { 
			0xC, 0xFF, 0, 0x3, 0, 2, 0x1568, 0x10FC, 0x1100 },

		{ "gpu_cc_sleep_clk", 0x162, 1, GPU_CC,

			0x16, 0xFF, 0, 0x3, 0, 2, 0x1568, 0x10FC, 0x1100 },

		{ "measure_only_gpu_cc_cx_gfx3d_clk", 0x162, 1, GPU_CC,

			0x1A, 0xFF, 0, 0x3, 0, 2, 0x1568, 0x10FC, 0x1100 },

		{ "measure_only_gpu_cc_cx_gfx3d_slv_clk", 0x162, 1, GPU_CC,

			0x1B, 0xFF, 0, 0x3, 0, 2, 0x1568, 0x10FC, 0x1100 },

		{ "measure_only_gpu_cc_gx_gfx3d_clk", 0x162, 1, GPU_CC,

			0xB, 0xFF, 0, 0x3, 0, 2, 0x1568, 0x10FC, 0x1100 },

		{ "npu_cc_armwic_core_clk", 0x180, 1, NPU_CC,

			0x4, 0xFF, 0, 0x3, 0, 2, 0x4000, 0x3004, 0x3008 },

		{ "npu_cc_bto_core_clk", 0x180, 1, NPU_CC,