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

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

Merge "soc: qcom: socinfo: Add support for msm8917 soc-id"

parents 5c205e81 c34c1587

arch/arm/mach-qcom/Kconfig

+27 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,20 @@ config ARCH_MDM9615 
	select CLKSRC_OF

	select CLKSRC_OF

	select COMMON_CLK

	select COMMON_CLK





config ARCH_QM215

	bool "Enable support for QM215"

	select CPU_V7

	select HAVE_ARM_ARCH_TIMER

	select PINCTRL

	select QCOM_SCM if SMP

	select PM_DEVFREQ

	select CLKDEV_LOOKUP

	select HAVE_CLK

	select HAVE_CLK_PREPARE

	select COMMON_CLK

	select COMMON_CLK_QCOM

	select ARM_GIC



config ARCH_SDM660

config ARCH_SDM660

	bool "Enable Support for Qualcomm Technologies, Inc. SDM660"

	bool "Enable Support for Qualcomm Technologies, Inc. SDM660"

	select CLKDEV_LOOKUP

	select CLKDEV_LOOKUP
@@ -103,6 +117,19 @@ config ARCH_BENGAL 
	  This enables support for the BENGAL chipset. If you do not

	  This enables support for the BENGAL chipset. If you do not

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

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





config ARCH_MSM8917

	bool "Enable support for MSM8917"

	select CPU_V7

	select HAVE_ARM_ARCH_TIMER

	select PINCTRL

	select QCOM_SCM if SMP

	select PM_DEVFREQ

	select CLKDEV_LOOKUP

	select HAVE_CLK

	select HAVE_CLK_PREPARE

	select COMMON_CLK

	select COMMON_CLK_QCOM



config ARCH_SCUBA

config ARCH_SCUBA

	bool "Enable Support for Qualcomm Technologies, Inc. SCUBA"

	bool "Enable Support for Qualcomm Technologies, Inc. SCUBA"

	select COMMON_CLK_QCOM

	select COMMON_CLK_QCOM

arch/arm/mach-qcom/Makefile

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

obj-$(CONFIG_ARCH_BENGAL) += board-bengal.o

obj-$(CONFIG_ARCH_SCUBA) += board-scuba.o

obj-$(CONFIG_ARCH_SCUBA) += board-scuba.o

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

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

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

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

0 → 100644
+26 −0
Original line number Original line 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 *msm8917_dt_match[] __initconst = {

	"qcom,msm8917",

	"qcom,apq8017",

	NULL

};



static void __init msm8917_init(void)

{

	board_dt_populate(NULL);

}



DT_MACHINE_START(MSM8917_DT,

	"Qualcomm Technologies, Inc. MSM8917-PMI8950 MTP")

	.init_machine		= msm8917_init,

	.dt_compat		= msm8917_dt_match,

MACHINE_END

arch/arm64/Kconfig.platforms

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

	  This enables support for the SCUBA chipset. If you do not

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

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





config ARCH_QM215

	bool "Enable Support for Qualcomm Technologies Inc. QM215"

	depends on ARCH_QCOM

	select CPU_FREQ_QCOM

	select COMMON_CLK

	select COMMON_CLK_QCOM

	help

	  This enables support for the QM215 chipset. If you do not

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



config ARCH_MSM8937

	bool "Enable Support for Qualcomm Technologies Inc. MSM8937"

	depends on ARCH_QCOM

	select CPU_FREQ_QCOM

	select COMMON_CLK

	select COMMON_CLK_QCOM

	help

	  This enables support for the MSM8937 chipset. If you do not

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





config ARCH_SDM660

config ARCH_SDM660

	bool "Enable Support for Qualcomm Technologies, Inc. SDM660"

	bool "Enable Support for Qualcomm Technologies, Inc. SDM660"

	depends on ARCH_QCOM

	depends on ARCH_QCOM
@@ -207,6 +228,26 @@ config ARCH_REALTEK 
	  This enables support for the ARMv8 based Realtek chipsets,

	  This enables support for the ARMv8 based Realtek chipsets,

	  like the RTD1295.

	  like the RTD1295.





config ARCH_SDM429

	bool "Enable Support for Qualcomm Technologies Inc. SDM429"

	depends on ARCH_QCOM

	select CPU_FREQ_QCOM

	select COMMON_CLK

	select COMMON_CLK_QCOM

	help

	  This enables support for the sdm429 chipset. If you do not

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



config ARCH_SDM439

	bool "Enable Support for Qualcomm Technologies Inc. SDM439"

	depends on ARCH_QCOM

	select CPU_FREQ_QCOM

	select COMMON_CLK

	select COMMON_CLK_QCOM

	help

	  This enables support for the sdm439 chipset. If you do not

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



config ARCH_ROCKCHIP

config ARCH_ROCKCHIP

	bool "Rockchip Platforms"

	bool "Rockchip Platforms"

	select ARCH_HAS_RESET_CONTROLLER

	select ARCH_HAS_RESET_CONTROLLER

drivers/soc/qcom/socinfo.c

+32 −1
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// SPDX-License-Identifier: GPL-2.0-only

/*

/*

 * Copyright (c) 2009-2020, The Linux Foundation. All rights reserved.

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

 */

 */





#define pr_fmt(fmt) "%s: " fmt, __func__

#define pr_fmt(fmt) "%s: " fmt, __func__
@@ -356,6 +356,21 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* BENGALP-IOT ID */

	/* BENGALP-IOT ID */

	[470] = {MSM_CPU_BENGALP_IOT, "BENGALP-IOT"},

	[470] = {MSM_CPU_BENGALP_IOT, "BENGALP-IOT"},





	/* MSM8937 ID */

	[294] = {MSM_CPU_8937, "MSM8937"},

	[295] = {MSM_CPU_8937, "APQ8937"},



	/* MSM8917 IDs */

	[303] = {MSM_CPU_8917, "MSM8917"},

	[307] = {MSM_CPU_8917, "APQ8017"},

	[308] = {MSM_CPU_8917, "MSM8217"},

	[309] = {MSM_CPU_8917, "MSM8617"},



	/* SDM429 and SDM439 ID */

	[353] = {MSM_CPU_SDM439, "SDM439"},

	[354] = {MSM_CPU_SDM429, "SDM429"},





	/* Uninitialized IDs are not known to run Linux.

	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.

	 * considered as unknown CPU.
@@ -1283,6 +1298,22 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 470;

		dummy_socinfo.id = 470;

		strlcpy(dummy_socinfo.build_id, "bengalp-iot - ",

		strlcpy(dummy_socinfo.build_id, "bengalp-iot - ",

		sizeof(dummy_socinfo.build_id));

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8937()) {

		dummy_socinfo.id = 294;

		strlcpy(dummy_socinfo.build_id, "msm8937 - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8917()) {

		dummy_socinfo.id = 303;

		strlcpy(dummy_socinfo.build_id, "msm8917 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm439()) {

		dummy_socinfo.id = 353;

		strlcpy(dummy_socinfo.build_id, "sdm439 - ",

				sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm429()) {

		dummy_socinfo.id = 354;

		strlcpy(dummy_socinfo.build_id, "sdm429 - ",

				sizeof(dummy_socinfo.build_id));

	} else

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

			sizeof(dummy_socinfo.build_id));