Merge "ARM: msm: Add board config support for 32 bit qcm2150"

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 <linux/kernel.h>
@@ -10,6 +11,7 @@
 
 static const char *qm215_dt_match[] __initconst = {
 	"qcom,qm215",
+	"qcom,qcm2150",
 	NULL
 };
 

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 - ",

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 {