evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "soc: qcom: socinfo: Add support for APQCOBALT"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-03 04:58:28 -07:00 • committed by Gerrit - the friendly Code Review server
commit a1307ec818
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/soc/qcom/socinfo.c
View file

@ -528,10 +528,11 @@ static struct msm_soc_info cpu_of_id[] = {
[270] = {MSM_CPU_8929, "MSM8229"}, [270] = {MSM_CPU_8929, "MSM8229"},
[271] = {MSM_CPU_8929, "APQ8029"}, [271] = {MSM_CPU_8929, "APQ8029"},
/* Cobalt ID */ /* Cobalt IDs */
[292] = {MSM_CPU_COBALT, "MSMCOBALT"}, [292] = {MSM_CPU_COBALT, "MSMCOBALT"},
[319] = {MSM_CPU_COBALT, "APQCOBALT"},
/* Cobalt ID */ /* Hamster ID */
[306] = {MSM_CPU_HAMSTER, "MSMHAMSTER"}, [306] = {MSM_CPU_HAMSTER, "MSMHAMSTER"},
/* falcon ID */ /* falcon ID */
@ -1205,6 +1206,10 @@ static void * __init setup_dummy_socinfo(void)
dummy_socinfo.id = 317; dummy_socinfo.id = 317;
strlcpy(dummy_socinfo.build_id, "msmfalcon - ", strlcpy(dummy_socinfo.build_id, "msmfalcon - ",
sizeof(dummy_socinfo.build_id)); 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", strlcat(dummy_socinfo.build_id, "Dummy socinfo",

3
include/soc/qcom/socinfo.h
View file

@ -90,6 +90,8 @@
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929") of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929")
#define early_machine_is_msmcobalt() \ #define early_machine_is_msmcobalt() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmcobalt") of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmcobalt")
#define early_machine_is_apqcobalt() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apqcobalt")
#define early_machine_is_msmhamster() \ #define early_machine_is_msmhamster() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmhamster") of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmhamster")
#define early_machine_is_msmfalcon() \ #define early_machine_is_msmfalcon() \
@ -128,6 +130,7 @@
#define early_machine_is_msm8976() 0 #define early_machine_is_msm8976() 0
#define early_machine_is_msm8929() 0 #define early_machine_is_msm8929() 0
#define early_machine_is_msmcobalt() 0 #define early_machine_is_msmcobalt() 0
#define early_machine_is_apqcobalt() 0
#define early_machine_is_msmhamster() 0 #define early_machine_is_msmhamster() 0
#define early_machine_is_msmfalcon() 0 #define early_machine_is_msmfalcon() 0
#endif #endif