asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
qctecmdr 2020-04-30 10:40:29 -07:00 committed by Gerrit - the friendly Code Review server
commit d94da193a9
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -295,6 +295,9 @@ static struct msm_soc_info cpu_of_id[] = {
[305] = {MSM_CPU_8996, "MSM8996pro"},
[312] = {MSM_CPU_8996, "APQ8096pro"},
/* SDM660 ID */
[317] = {MSM_CPU_SDM660, "SDM660"},
/* sm8150 ID */
[339] = {MSM_CPU_SM8150, "SM8150"},
@ -1188,6 +1191,10 @@ static void * __init setup_dummy_socinfo(void)
dummy_socinfo.id = 310;
strlcpy(dummy_socinfo.build_id, "msm8996-auto - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_sdm660()) {
dummy_socinfo.id = 317;
strlcpy(dummy_socinfo.build_id, "sdm660 - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_sm8150()) {
dummy_socinfo.id = 339;
strlcpy(dummy_socinfo.build_id, "sm8150 - ",

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

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2009-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2009-2020, The Linux Foundation. All rights reserved.
*/
#ifndef _ARCH_ARM_MACH_MSM_SOCINFO_H_
@ -74,6 +74,8 @@
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdxprairie")
#define early_machine_is_sdmmagpie() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmmagpie")
#define early_machine_is_sdm660() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm660")
#else
#define of_board_is_sim() 0
#define of_board_is_rumi() 0
@ -105,6 +107,7 @@
#define early_machine_is_qcs405() 0
#define early_machine_is_sdxprairie() 0
#define early_machine_is_sdmmagpie() 0
#define early_machine_is_sdm660() 0
#endif
#define PLATFORM_SUBTYPE_MDM 1
@ -125,6 +128,7 @@ enum msm_cpu {
MSM_CPU_8916,
MSM_CPU_8084,
MSM_CPU_8996,
MSM_CPU_SDM660,
MSM_CPU_SM8150,
MSM_CPU_SA8150,
MSM_CPU_KONA,