Merge "clk: qcom: debugcc: Remove clocks from measure support" (1757d4ee) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/clk/qcom/debugcc-lito.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -280,8 +280,6 @@ static const char *const gcc_debug_mux_parent_names[] = {
		"gcc_camera_ahb_clk",
		"gcc_camera_hf_axi_clk",
		"gcc_camera_sf_axi_clk",
		"gcc_camera_throttle_hf_axi_clk",
		"gcc_camera_throttle_sf_axi_clk",
		"gcc_camera_xo_clk",
		"gcc_cfg_noc_usb3_prim_axi_clk",
		"gcc_cpuss_ahb_clk",
		@@ -292,8 +290,6 @@ static const char *const gcc_debug_mux_parent_names[] = {
		"gcc_disp_gpll0_clk_src",
		"gcc_disp_hf_axi_clk",
		"gcc_disp_sf_axi_clk",
		"gcc_disp_throttle_hf_axi_clk",
		"gcc_disp_throttle_sf_axi_clk",
		"gcc_disp_xo_clk",
		"gcc_gp1_clk",
		"gcc_gp2_clk",
		@@ -365,8 +361,6 @@ static const char *const gcc_debug_mux_parent_names[] = {
		"gcc_usb3_prim_phy_pipe_clk",
		"gcc_video_ahb_clk",
		"gcc_video_axi_clk",
		"gcc_video_throttle1_axi_clk",
		"gcc_video_throttle_axi_clk",
		"gcc_video_xo_clk",
		"gpu_cc_debug_mux",
		"mc_cc_debug_mux",
		@@ -386,8 +380,6 @@ static int gcc_debug_mux_sels[] = {
		0x3F, /* gcc_camera_ahb_clk */
		0x47, /* gcc_camera_hf_axi_clk */
		0x48, /* gcc_camera_sf_axi_clk */
		0x57, /* gcc_camera_throttle_hf_axi_clk */
		0x58, /* gcc_camera_throttle_sf_axi_clk */
		0x4C, /* gcc_camera_xo_clk */
		0x1C, /* gcc_cfg_noc_usb3_prim_axi_clk */
		0xD5, /* gcc_cpuss_ahb_clk */
		@@ -398,8 +390,6 @@ static int gcc_debug_mux_sels[] = {
		0x5B, /* gcc_disp_gpll0_clk_src */
		0x49, /* gcc_disp_hf_axi_clk */
		0x4A, /* gcc_disp_sf_axi_clk */
		0x55, /* gcc_disp_throttle_hf_axi_clk */
		0x56, /* gcc_disp_throttle_sf_axi_clk */
		0x4D, /* gcc_disp_xo_clk */
		0xE4, /* gcc_gp1_clk */
		0xE5, /* gcc_gp2_clk */
		@@ -471,8 +461,6 @@ static int gcc_debug_mux_sels[] = {
		0x75, /* gcc_usb3_prim_phy_pipe_clk */
		0x3E, /* gcc_video_ahb_clk */
		0x5A, /* gcc_video_axi_clk */
		0x5C, /* gcc_video_throttle1_axi_clk */
		0x46, /* gcc_video_throttle_axi_clk */
		0x4B, /* gcc_video_xo_clk */
		0x129, /* gpu_cc_debug_mux */
		0xC5, /* mc_cc_debug_mux */
		@@ -513,7 +501,6 @@ static const char *const gpu_cc_debug_mux_parent_names[] = {
		"gpu_cc_cxo_clk",
		"gpu_cc_gx_gmu_clk",
		"gpu_cc_gx_vsense_clk",
		"gpu_cc_rbcpr_clk",
		"gpu_cc_sleep_clk",
		"measure_only_gpu_cc_cx_gfx3d_clk",
		"measure_only_gpu_cc_cx_gfx3d_slv_clk",
		@@ -530,7 +517,6 @@ static int gpu_cc_debug_mux_sels[] = {
		0x19, /* gpu_cc_cxo_clk */
		0xF, /* gpu_cc_gx_gmu_clk */
		0xC, /* gpu_cc_gx_vsense_clk */
		0x1C, /* gpu_cc_rbcpr_clk */
		0x16, /* gpu_cc_sleep_clk */
		0x1A, /* measure_only_gpu_cc_cx_gfx3d_clk */
		0x1B, /* measure_only_gpu_cc_cx_gfx3d_slv_clk */
		@@ -558,8 +544,6 @@ static struct clk_debug_mux gpu_cc_debug_mux = {
		};

		static const char *const npu_cc_debug_mux_parent_names[] = {
		"npu_cc_aon_clk",
		"npu_cc_atb_clk",
		"npu_cc_bto_core_clk",
		"npu_cc_bwmon_clk",
		"npu_cc_cal_hm0_cdc_clk",
		@@ -591,8 +575,6 @@ static const char *const npu_cc_debug_mux_parent_names[] = {
		};

		static int npu_cc_debug_mux_sels[] = {
		0x5, /* npu_cc_aon_clk */
		0x17, /* npu_cc_atb_clk */
		0x19, /* npu_cc_bto_core_clk */
		0x18, /* npu_cc_bwmon_clk */
		0xB, /* npu_cc_cal_hm0_cdc_clk */
		@@ -645,7 +627,6 @@ static struct clk_debug_mux npu_cc_debug_mux = {

		static const char *const video_cc_debug_mux_parent_names[] = {
		"video_cc_apb_clk",
		"video_cc_at_clk",
		"video_cc_mvs0_axi_clk",
		"video_cc_mvs0_core_clk",
		"video_cc_mvs1_axi_clk",
		@@ -659,7 +640,6 @@ static const char *const video_cc_debug_mux_parent_names[] = {

		static int video_cc_debug_mux_sels[] = {
		0xD, /* video_cc_apb_clk */
		0x10, /* video_cc_at_clk */
		0xA, /* video_cc_mvs0_axi_clk */
		0x3, /* video_cc_mvs0_core_clk */
		0xB, /* video_cc_mvs1_axi_clk */