diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-03 04:58:28 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-03 04:58:27 -0700 |
| commit | a1307ec818916f90ffb9714a7b5010473ce1b172 (patch) | |
| tree | c159fc28ee6716ffc0c18634aec4377c4963a5f3 /drivers/soc | |
| parent | edca635472f7e785e8d982733c43779d59304b94 (diff) | |
| parent | 9791b32e85e1d972f37a14f2a9b345de1c5011a9 (diff) | |
Merge "soc: qcom: socinfo: Add support for APQCOBALT"
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/socinfo.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c index 4f29923e054c..b8cef11f4067 100644 --- a/drivers/soc/qcom/socinfo.c +++ b/drivers/soc/qcom/socinfo.c @@ -528,10 +528,11 @@ static struct msm_soc_info cpu_of_id[] = { [270] = {MSM_CPU_8929, "MSM8229"}, [271] = {MSM_CPU_8929, "APQ8029"}, - /* Cobalt ID */ + /* Cobalt IDs */ [292] = {MSM_CPU_COBALT, "MSMCOBALT"}, + [319] = {MSM_CPU_COBALT, "APQCOBALT"}, - /* Cobalt ID */ + /* Hamster ID */ [306] = {MSM_CPU_HAMSTER, "MSMHAMSTER"}, /* falcon ID */ @@ -1205,6 +1206,10 @@ static void * __init setup_dummy_socinfo(void) dummy_socinfo.id = 317; strlcpy(dummy_socinfo.build_id, "msmfalcon - ", sizeof(dummy_socinfo.build_id)); + } else if (early_machine_is_apqcobalt()) { + dummy_socinfo.id = 319; + strlcpy(dummy_socinfo.build_id, "apqcobalt - ", + sizeof(dummy_socinfo.build_id)); } strlcat(dummy_socinfo.build_id, "Dummy socinfo", |