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

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

Merge "socinfo: Add support for SDM/A 636 SOCs"

parents 5b5cdced d165678d

drivers/soc/qcom/socinfo.c

+12 −0
Original line number Diff line number Diff line
@@ -566,6 +566,10 @@ static struct msm_soc_info cpu_of_id[] = { 
	[318] = {MSM_CPU_630, "SDM630"},

	[327] = {MSM_CPU_630, "SDA630"},



	/* 636 ID */

	[345] = {MSM_CPU_636, "SDM636"},

	[346] = {MSM_CPU_636, "SDA636"},



	/* Uninitialized IDs are not known to run Linux.

	   MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	   considered as unknown CPU. */
@@ -1289,6 +1293,14 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 327;

		strlcpy(dummy_socinfo.build_id, "sda630 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm636()) {

		dummy_socinfo.id = 345;

		strlcpy(dummy_socinfo.build_id, "sdm636 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sda636()) {

		dummy_socinfo.id = 346;

		strlcpy(dummy_socinfo.build_id, "sda636 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_apq8098()) {

		dummy_socinfo.id = 319;

		strlcpy(dummy_socinfo.build_id, "apq8098 - ",

include/soc/qcom/socinfo.h

+7 −0
Original line number Diff line number Diff line
@@ -96,6 +96,10 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm660")

#define early_machine_is_sda660()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda660")

#define early_machine_is_sdm636()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm636")

#define early_machine_is_sda636()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda636")

#define early_machine_is_sdm658()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm658")

#define early_machine_is_sda658()	\
@@ -142,6 +146,8 @@ 
#define early_machine_is_msmhamster()	0

#define early_machine_is_sdm660()	0

#define early_machine_is_sda660()	0

#define early_machine_is_sdm636()	0

#define early_machine_is_sda636()	0

#define early_machine_is_sdm658()	0

#define early_machine_is_sda658()	0

#define early_machine_is_sdm630()	0
@@ -206,6 +212,7 @@ enum msm_cpu { 
	MSM_CPU_HAMSTER,

	MSM_CPU_660,

	MSM_CPU_630,

	MSM_CPU_636,

};



struct msm_soc_info {