diff options
| author | Ajit Khare <ajitk@codeaurora.org> | 2016-01-12 14:46:33 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:20:05 -0700 |
| commit | c9b9abe22720d81cd005b3ef53f0bbecf01725b6 (patch) | |
| tree | cbd96b844fbc6a565b7c028dea47de766903522c | |
| parent | 01679e7bc1fe5140f84ea213dacc7c0c5b5a0f78 (diff) | |
socinfo: Add MSM8996AU automotive support
Add CPU IDs to the socinfo table needed to support MSM8996AU.
CRs-fixed: 971957
Change-Id: Ifaed6df0a99999566e6241fbf98f45ab92f8c0fe
Signed-off-by: Ajit Khare <ajitk@codeaurora.org>
Signed-off-by: Mathew Joseph Karimpanal <mkarim@codeaurora.org>
| -rw-r--r-- | drivers/soc/qcom/socinfo.c | 6 | ||||
| -rw-r--r-- | include/soc/qcom/socinfo.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c index 06d03ae459fe..5ebfc90c3918 100644 --- a/drivers/soc/qcom/socinfo.c +++ b/drivers/soc/qcom/socinfo.c @@ -503,6 +503,8 @@ static struct msm_soc_info cpu_of_id[] = { /* 8996 IDs */ [246] = {MSM_CPU_8996, "MSM8996"}, + [310] = {MSM_CPU_8996, "MSM8996"}, + [311] = {MSM_CPU_8996, "APQ8096"}, [291] = {MSM_CPU_8996, "APQ8096"}, /* 8976 ID */ @@ -1102,6 +1104,10 @@ static void * __init setup_dummy_socinfo(void) dummy_socinfo.id = 246; strlcpy(dummy_socinfo.build_id, "msm8996 - ", sizeof(dummy_socinfo.build_id)); + } else if (early_machine_is_msm8996_auto()) { + dummy_socinfo.id = 310; + strlcpy(dummy_socinfo.build_id, "msm8996-auto - ", + sizeof(dummy_socinfo.build_id)); } else if (early_machine_is_msm8929()) { dummy_socinfo.id = 268; strlcpy(dummy_socinfo.build_id, "msm8929 - ", diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h index 6b4c36c65c25..a836481a37c9 100644 --- a/include/soc/qcom/socinfo.h +++ b/include/soc/qcom/socinfo.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2009-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -84,6 +84,8 @@ of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmtellurium") #define early_machine_is_msm8996() \ of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996") +#define early_machine_is_msm8996_auto() \ + of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996-cdp") #define early_machine_is_msm8929() \ of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929") #define early_machine_is_msmcobalt() \ |