Merge "soc: qcom: socinfo: Add soc information for khaje"

This commit is contained in:
qctecmdr 2021-05-17 08:06:58 -07:00 committed by Gerrit - the friendly Code Review server
commit af01df03d4
2 changed files with 11 additions and 0 deletions

View file

@ -334,6 +334,9 @@ static struct msm_soc_info cpu_of_id[] = {
[417] = {MSM_CPU_BENGAL, "BENGAL"},
[444] = {MSM_CPU_BENGAL, "BENGAL"},
/* Khaje ID */
[518] = {MSM_CPU_KHAJE, "KHAJE"},
/* Lagoon ID */
[434] = {MSM_CPU_LAGOON, "LAGOON"},
[459] = {MSM_CPU_LAGOON, "LAGOON"},
@ -1260,6 +1263,10 @@ static void * __init setup_dummy_socinfo(void)
dummy_socinfo.id = 417;
strlcpy(dummy_socinfo.build_id, "bengal - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_khaje()) {
dummy_socinfo.id = 518;
strlcpy(dummy_socinfo.build_id, "khaje - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_bengalp()) {
dummy_socinfo.id = 445;
strlcpy(dummy_socinfo.build_id, "bengalp - ",

View file

@ -62,6 +62,8 @@
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,bengal")
#define early_machine_is_bengalp() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,bengalp")
#define early_machine_is_khaje() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,khaje")
#define early_machine_is_lagoon() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,lagoon")
#define early_machine_is_scuba() \
@ -125,6 +127,7 @@
#define early_machine_is_orchid() 0
#define early_machine_is_bengal() 0
#define early_machine_is_bengalp() 0
#define early_machine_is_khaje() 0
#define early_machine_is_lagoon() 0
#define early_machine_is_scuba() 0
#define early_machine_is_scubaiot() 0
@ -172,6 +175,7 @@ enum msm_cpu {
MSM_CPU_ORCHID,
MSM_CPU_BENGAL,
MSM_CPU_BENGALP,
MSM_CPU_KHAJE,
MSM_CPU_LAGOON,
MSM_CPU_SCUBA,
MSM_CPU_SCUBAIOT,