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

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

Merge "soc: qcom: socinfo: Add soc information for bengal"

parents 32037afc 98256569

drivers/soc/qcom/socinfo.c

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

/*

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

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

 */



#define pr_fmt(fmt) "%s: " fmt, __func__
@@ -318,6 +318,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* Lito ID */

	[400] = {MSM_CPU_LITO, "LITO"},



	/* Bengal ID */

	[417] = {MSM_CPU_BENGAL, "BENGAL"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1185,6 +1188,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 400;

		strlcpy(dummy_socinfo.build_id, "lito - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_bengal()) {

		dummy_socinfo.id = 417;

		strlcpy(dummy_socinfo.build_id, "bengal - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdmshrike()) {

		dummy_socinfo.id = 340;

		strlcpy(dummy_socinfo.build_id, "sdmshrike - ",

include/soc/qcom/socinfo.h

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

/*

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

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

 */



#ifndef _ARCH_ARM_MACH_MSM_SOCINFO_H_
@@ -56,6 +56,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,kona")

#define early_machine_is_lito()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,lito")

#define early_machine_is_bengal()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,bengal")

#define early_machine_is_sdmshrike()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmshrike")

#define early_machine_is_sm6150()	\
@@ -88,6 +90,7 @@ 
#define early_machine_is_sa8150()	0

#define early_machine_is_kona()		0

#define early_machine_is_lito()		0

#define early_machine_is_bengal()	0

#define early_machine_is_sdmshrike()	0

#define early_machine_is_sm6150()	0

#define early_machine_is_qcs405()	0
@@ -117,6 +120,7 @@ enum msm_cpu { 
	MSM_CPU_SA8150,

	MSM_CPU_KONA,

	MSM_CPU_LITO,

	MSM_CPU_BENGAL,

	MSM_CPU_SDMSHRIKE,

	MSM_CPU_SM6150,

	MSM_CPU_QCS405,