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

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

Merge "soc: qcom: socinfo: Add support for SDA450 soc-id"

parents 4636954c b0676906

drivers/soc/qcom/socinfo.c

+4 −0
Original line number Diff line number Diff line
@@ -1597,6 +1597,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 338;

		strlcpy(dummy_socinfo.build_id, "sdm450 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sda450()) {

		dummy_socinfo.id = 351;

		strlcpy(dummy_socinfo.build_id, "sda450 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm632()) {

		dummy_socinfo.id = 349;

		strlcpy(dummy_socinfo.build_id, "sdm632 - ",

include/soc/qcom/socinfo.h

+4 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdm9607")

#define early_machine_is_sdm450()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm450")

#define early_machine_is_sda450()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda450")

#define early_machine_is_sdm632()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm632")

#define early_machine_is_sdm439()	\
@@ -188,6 +190,7 @@ 
#define early_machine_is_msm8937()	0

#define early_machine_is_msm8917()	0

#define early_machine_is_sdm450()	0

#define early_machine_is_sda450()	0

#define early_machine_is_sdm632()	0

#define early_machine_is_sdm439()	0

#define early_machine_is_sdm429()	0
@@ -265,6 +268,7 @@ enum msm_cpu { 
	MSM_CPU_SXR1120,

	MSM_CPU_8953,

	MSM_CPU_SDM450,

	MSM_CPU_SDA450,

	MSM_CPU_SDM632,

	MSM_CPU_SDA632,

	MSM_CPU_8937,