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

This commit is contained in:
qctecmdr 2020-04-16 12:29:22 -07:00 committed by Gerrit - the friendly Code Review server
commit 6ca22ffdfe
2 changed files with 20 additions and 0 deletions

View File

@ -445,6 +445,10 @@ static struct msm_soc_info cpu_of_id[] = {
[317] = {MSM_CPU_SDM660, "SDM660"},
[324] = {MSM_CPU_SDA660, "SDA660"},
/* SDM429W IDs*/
[416] = {MSM_CPU_SDM429W, "SDM429W"},
[437] = {MSM_CPU_SDA429W, "SDA429W"},
/* Uninitialized IDs are not known to run Linux.
* MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
* considered as unknown CPU.
@ -1449,6 +1453,14 @@ static void * __init setup_dummy_socinfo(void)
dummy_socinfo.id = 324;
strlcpy(dummy_socinfo.build_id, "sda660 - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_sdm429w()) {
dummy_socinfo.id = 416;
strlcpy(dummy_socinfo.build_id, "sdm429w - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_sda429w()) {
dummy_socinfo.id = 437;
strlcpy(dummy_socinfo.build_id, "sda429w - ",
sizeof(dummy_socinfo.build_id));
} else
strlcat(dummy_socinfo.build_id, "Dummy socinfo",
sizeof(dummy_socinfo.build_id));

View File

@ -113,6 +113,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_sdm429w() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm429w")
#define early_machine_is_sda429w() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda429w")
#else
#define of_board_is_sim() 0
#define of_board_is_rumi() 0
@ -158,6 +162,8 @@
#define early_machine_is_atollp() 0
#define early_machine_is_sdm660() 0
#define early_machine_is_sda660() 0
#define early_machine_is_sdm429w() 0
#define early_machine_is_sda429w() 0
#endif
#define PLATFORM_SUBTYPE_MDM 1
@ -206,6 +212,8 @@ enum msm_cpu {
MSM_CPU_ATOLL_AB,
MSM_CPU_SDM660,
MSM_CPU_SDA660,
MSM_CPU_SDM429W,
MSM_CPU_SDA429W,
};
struct msm_soc_info {