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

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

Merge "socinfo: Add socinfo support for sdm450"

parents e9318378 2e498ac6

arch/arm/mach-qcom/Kconfig

+22 −0
Original line number Diff line number Diff line
@@ -153,5 +153,27 @@ config ARCH_SCUBA 
	  This enables support for the SCUBA chipset. If you do not

	  wish to build a kernel that runs on this chipset, say 'N' here.



config ARCH_MSM8953

	bool "Enable support for MSM8953"

	select CPU_V7

	select HAVE_ARM_ARCH_TIMER

	select PINCTRL

	select QCOM_SCM if SMP

	select PM_DEVFREQ

	select COMMON_CLK

	select COMMON_CLK_QCOM

	select QCOM_GDSC



config ARCH_SDM450

	bool "Enable support for SDM450"

	select CPU_V7

	select HAVE_ARM_ARCH_TIMER

	select PINCTRL

	select QCOM_SCM if SMP

	select PM_DEVFREQ

	select COMMON_CLK

	select COMMON_CLK_QCOM

	select QCOM_GDSC



endmenu

endif

arch/arm/mach-qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -5,3 +5,5 @@ 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

obj-$(CONFIG_ARCH_MSM8953) += board-msm8953.o

obj-$(CONFIG_ARCH_SDM450) += board-sdm450.o

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

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

/*

 * Copyright (c) 2017,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 *msm8953_dt_match[] __initconst = {

	"qcom,msm8953",

	NULL

};



static void __init msm8953_init(void)

{

	board_dt_populate(NULL);

}



DT_MACHINE_START(MSM8953_DT,

	"Qualcomm Technologies, Inc. MSM8953 (Flattened Device Tree)")

	.init_machine		= msm8953_init,

	.dt_compat		= msm8953_dt_match,

MACHINE_END

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

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

/*

 * Copyright (c) 2017,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 *sdm450_dt_match[] __initconst = {

	"qcom,sdm450",

	NULL

};



static void __init sdm450_init(void)

{

	board_dt_populate(NULL);

}



DT_MACHINE_START(SDM450_DT,

	"Qualcomm Technologies, Inc. SDM450 (Flattened Device Tree)")

	.init_machine		= sdm450_init,

	.dt_compat		= sdm450_dt_match,

MACHINE_END

drivers/soc/qcom/socinfo.c

+16 −0
Original line number Diff line number Diff line
@@ -373,6 +373,14 @@ static struct msm_soc_info cpu_of_id[] = { 


	/* QM215 ID */

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



	/* 8953 ID */

	[293] = {MSM_CPU_8953, "MSM8953"},

	[304] = {MSM_CPU_8953, "APQ8053"},



	/* SDM450 ID */

	[338] = {MSM_CPU_SDM450, "SDM450"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1320,6 +1328,14 @@ 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_msm8953()) {

		dummy_socinfo.id = 293;

		strlcpy(dummy_socinfo.build_id, "msm8953 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm450()) {

		dummy_socinfo.id = 338;

		strlcpy(dummy_socinfo.build_id, "sdm450 - ",

			sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));