Merge "soc: qcom: rpmh_master_stat: Add island stats support" (11567338) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/soc/qcom/rpmh_master_stat.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only

	/*		/*
	* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.		* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
	*/		*/

	#define pr_fmt(fmt) "%s: " fmt, KBUILD_MODNAME		#define pr_fmt(fmt) "%s: " fmt, KBUILD_MODNAME
	@@ -34,6 +34,7 @@ enum master_smem_id {
	SLPI,		SLPI,
	GPU,		GPU,
	DISPLAY,		DISPLAY,
			SLPI_ISLAND = 613,
	};		};

	enum master_pid {		enum master_pid {
	@@ -63,8 +64,10 @@ struct msm_rpmh_master_data {
	static const struct msm_rpmh_master_data rpmh_masters[] = {		static const struct msm_rpmh_master_data rpmh_masters[] = {
	{"MPSS", MPSS, PID_MPSS},		{"MPSS", MPSS, PID_MPSS},
	{"ADSP", ADSP, PID_ADSP},		{"ADSP", ADSP, PID_ADSP},
			{"ADSP_ISLAND", SLPI_ISLAND, PID_ADSP},
	{"CDSP", CDSP, PID_CDSP},		{"CDSP", CDSP, PID_CDSP},
	{"SLPI", SLPI, PID_SLPI},		{"SLPI", SLPI, PID_SLPI},
			{"SLPI_ISLAND", SLPI_ISLAND, PID_SLPI},
	{"GPU", GPU, PID_GPU},		{"GPU", GPU, PID_GPU},
	{"DISPLAY", DISPLAY, PID_DISPLAY},		{"DISPLAY", DISPLAY, PID_DISPLAY},
	};		};