From f16dab2e9649d368882d2886276dc091b96bdbaa Mon Sep 17 00:00:00 2001 From: Saranya R Date: Tue, 17 Oct 2023 13:02:31 +0530 Subject: [PATCH 1/2] soc: qcom: socinfo: Add supprot for QCM2150 QRD soc-id Add socinfo support for QCM2150 QRD Soc and update the bindings for the same. Change-Id: I5b7ee61bf9410844de42d8351400619e0d768ac1 Signed-off-by: Vishwanath Raju K Signed-off-by: Saranya R --- drivers/soc/qcom/socinfo.c | 7 +++++++ include/soc/qcom/socinfo.h | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c index 3f240b52dfc2..d1b52f7e548a 100644 --- a/drivers/soc/qcom/socinfo.c +++ b/drivers/soc/qcom/socinfo.c @@ -434,6 +434,9 @@ static struct msm_soc_info cpu_of_id[] = { /* QM215 ID */ [386] = {MSM_CPU_QM215, "QM215"}, + /* QCM2150 ID */ + [436] = {MSM_CPU_QCM2150, "QCM2150"}, + /* 8953 ID */ [293] = {MSM_CPU_8953, "MSM8953"}, [304] = {MSM_CPU_8953, "APQ8053"}, @@ -1651,6 +1654,10 @@ static void * __init setup_dummy_socinfo(void) dummy_socinfo.id = 386; strlcpy(dummy_socinfo.build_id, "qm215 - ", sizeof(dummy_socinfo.build_id)); + } else if (early_machine_is_qcm2150()) { + dummy_socinfo.id = 436; + strlcpy(dummy_socinfo.build_id, "qcm2150 - ", + sizeof(dummy_socinfo.build_id)); } else if (early_machine_is_msm8953()) { dummy_socinfo.id = 293; strlcpy(dummy_socinfo.build_id, "msm8953 - ", diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h index cddc2bd0f89b..70aa770f6da7 100644 --- a/include/soc/qcom/socinfo.h +++ b/include/soc/qcom/socinfo.h @@ -169,6 +169,8 @@ enum socinfo_parttype { of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8953") #define early_machine_is_sdm450() \ of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm450") +#define early_machine_is_qcm2150() \ + of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qcm2150") #else #define of_board_is_sim() 0 #define of_board_is_rumi() 0 @@ -217,6 +219,7 @@ enum socinfo_parttype { #define early_machine_is_qm215() 0 #define early_machine_is_msm8953() 0 #define early_machine_is_sdm450() 0 +#define early_machine_is_qcm2150() 0 #endif #define PLATFORM_SUBTYPE_MDM 1 @@ -268,6 +271,7 @@ enum msm_cpu { MSM_CPU_QM215, MSM_CPU_8953, MSM_CPU_SDM450, + MSM_CPU_QCM2150, }; struct msm_soc_info { From 1ddda93e6e2a5eb783f94398883b5ab7bff09201 Mon Sep 17 00:00:00 2001 From: Saranya R Date: Tue, 17 Oct 2023 14:11:36 +0530 Subject: [PATCH 2/2] ARM: msm: Add board config support for 32 bit qcm2150 This change add initial board config support to enable build 32 bit kernel for qcm2150. Change-Id: I3694549de8138feaf9cf912f963572422a86e1c2 Signed-off-by: Vishwanath Raju K Signed-off-by: Saranya R --- arch/arm/mach-qcom/board-qm215.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-qcom/board-qm215.c b/arch/arm/mach-qcom/board-qm215.c index 3cdeab98a7fc..884aa7101ddb 100644 --- a/arch/arm/mach-qcom/board-qm215.c +++ b/arch/arm/mach-qcom/board-qm215.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2018, 2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -10,6 +11,7 @@ static const char *qm215_dt_match[] __initconst = { "qcom,qm215", + "qcom,qcm2150", NULL };