Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "soc: qcom: add support to append suffix to socinfo"

This commit is contained in:
Linux Build Service Account 2016-12-22 14:57:13 -08:00 committed by Gerrit - the friendly Code Review server
parent 8bfbcac55c c182ffa63a
commit 2dbdac226f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/soc/qcom/socinfo.c
View File

@ -509,11 +509,11 @@ static struct msm_soc_info cpu_of_id[] = {
[289] = {MSM_CPU_8952, "APQ8052"},
/* 8976 ID */
[278] = {MSM_CPU_8976, "MSM8976"},
[277] = {MSM_CPU_8976, "APQ8076"},
[278] = {MSM_CPU_8976, "MSM8976", "SG"},
[277] = {MSM_CPU_8976, "APQ8076", "SG"},
/* 8956 ID */
[266] = {MSM_CPU_8956, "MSM8956"},
[274] = {MSM_CPU_8956, "APQ8056"},
[266] = {MSM_CPU_8956, "MSM8956", "SG"},
[274] = {MSM_CPU_8956, "APQ8056", "SG"},
/* 8929 IDs */
[268] = {MSM_CPU_8929, "MSM8929"},
@ -577,6 +577,13 @@ static char *msm_read_hardware_id(void)
if (ret > sizeof(msm_soc_str))
goto err_path;
/* Add suffix if need to be */
if ((socinfo->v2.raw_version == 2) && strlen(cpu_of_id[socinfo->v1.id].suffix)) {
ret = strlcat(msm_soc_str, cpu_of_id[socinfo->v1.id].suffix,
sizeof(msm_soc_str));
if (ret > sizeof(msm_soc_str))
goto err_path;
}
string_generated = true;
return msm_soc_str;
err_path:

1
include/soc/qcom/socinfo.h
View File

@ -188,6 +188,7 @@ enum msm_cpu {
struct msm_soc_info {
enum msm_cpu generic_soc_type;
char *soc_id_string;
char *suffix;
};
enum pmic_model {