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

Commit 0727d775 authored by Mathew Joseph Karimpanal's avatar Mathew Joseph Karimpanal Committed by Gerrit - the friendly Code Review server
Browse files

socinfo: Add support for MSM8996proAU SoC 



Add CPU IDs to the socinfo table needed to support MSM8996pro
Automotive SoC.

CRs-Fixed: 991575
Change-Id: I6efaf4574a5f563b0ee3edd8545e0acd027ad59b
Signed-off-by: default avatarMathew Joseph Karimpanal <mkarim@codeaurora.org>
parent e33dc066

drivers/soc/qcom/socinfo.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -514,11 +514,12 @@ static struct msm_soc_info cpu_of_id[] = { 




	/* 8996 IDs */

	/* 8996 IDs */

	[246] = {MSM_CPU_8996, "MSM8996"},

	[246] = {MSM_CPU_8996, "MSM8996"},

	[310] = {MSM_CPU_8996, "MSM8996"},

	[311] = {MSM_CPU_8996, "APQ8096"},

	[291] = {MSM_CPU_8996, "APQ8096"},

	[291] = {MSM_CPU_8996, "APQ8096"},

	[305] = {MSM_CPU_8996, "MSM8996pro"},

	[305] = {MSM_CPU_8996, "MSM8996pro"},

	[310] = {MSM_CPU_8996, "MSM8996"},

	[311] = {MSM_CPU_8996, "APQ8096"},

	[312] = {MSM_CPU_8996, "APQ8096pro"},

	[312] = {MSM_CPU_8996, "APQ8096pro"},

	[315] = {MSM_CPU_8996, "MSM8996pro"},





	/* 8976 ID */

	/* 8976 ID */

	[266] = {MSM_CPU_8976, "MSM8976"},

	[266] = {MSM_CPU_8976, "MSM8976"},
@@ -1215,10 +1216,6 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 246;

		dummy_socinfo.id = 246;

		strlcpy(dummy_socinfo.build_id, "msm8996 - ",

		strlcpy(dummy_socinfo.build_id, "msm8996 - ",

			sizeof(dummy_socinfo.build_id));

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8996_auto()) {

		dummy_socinfo.id = 310;

		strlcpy(dummy_socinfo.build_id, "msm8996-auto - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8929()) {

	} else if (early_machine_is_msm8929()) {

		dummy_socinfo.id = 268;

		dummy_socinfo.id = 268;

		strlcpy(dummy_socinfo.build_id, "msm8929 - ",

		strlcpy(dummy_socinfo.build_id, "msm8929 - ",

include/soc/qcom/socinfo.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -94,8 +94,6 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8937")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8937")

#define early_machine_is_msm8996()	\

#define early_machine_is_msm8996()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996")

#define early_machine_is_msm8996_auto()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996-cdp")

#define early_machine_is_msm8929()	\

#define early_machine_is_msm8929()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929")

#define early_machine_is_mdm9607()	\

#define early_machine_is_mdm9607()	\