Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cee6dde6 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: qcom: Add board config support for qm215"

parents c391b620 a82fe8dc

arch/arm/mach-qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ obj-$(CONFIG_ARCH_BENGAL) += board-bengal.o 
obj-$(CONFIG_ARCH_SCUBA) += board-scuba.o

obj-$(CONFIG_ARCH_SDM660) += board-660.o

obj-$(CONFIG_ARCH_MSM8917) += board-msm8917.o

obj-$(CONFIG_ARCH_QM215) += board-qm215.o

arch/arm/mach-qcom/board-qm215.c

0 → 100644
+25 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2018, 2021, The Linux Foundation. All rights reserved.

 */



#include <linux/kernel.h>

#include "board-dt.h"

#include <asm/mach/map.h>

#include <asm/mach/arch.h>



static const char *qm215_dt_match[] __initconst = {

	"qcom,qm215",

	NULL

};



static void __init qm215_init(void)

{

	board_dt_populate(NULL);

}



DT_MACHINE_START(QM215_DT,

	"Qualcomm Technologies, Inc. QM215")

	.init_machine		= qm215_init,

	.dt_compat		= qm215_dt_match,

MACHINE_END

drivers/soc/qcom/socinfo.c

+6 −0
Original line number Diff line number Diff line
@@ -371,6 +371,8 @@ static struct msm_soc_info cpu_of_id[] = { 
	[354] = {MSM_CPU_SDM429, "SDM429"},





	/* QM215 ID */

	[386] = {MSM_CPU_QM215, "QM215"},

	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1314,6 +1316,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 354;

		strlcpy(dummy_socinfo.build_id, "sdm429 - ",

				sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_qm215()) {

		dummy_socinfo.id = 386;

		strlcpy(dummy_socinfo.build_id, "qm215 - ",

				sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

include/soc/qcom/socinfo.h

+5 −1
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm439")

#define early_machine_is_sdm429()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm429")

#define early_machine_is_qm215()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qm215")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -135,6 +137,7 @@ 
#define early_machine_is_msm8917()	0

#define early_machine_is_sdm439()	0

#define early_machine_is_sdm429()	0

#define early_machine_is_qm215()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -177,7 +180,8 @@ enum msm_cpu { 
	MSM_CPU_8937,

	MSM_CPU_8917,

	MSM_CPU_SDM439,

	MSM_CPU_SDM429

	MSM_CPU_SDM429,

	MSM_CPU_QM215

};



struct msm_soc_info {