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

Commit cb0f6593 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 95ab0ebb 21074344

drivers/soc/qcom/socinfo.c

+10 −1
Original line number Diff line number Diff line 
/*

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

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -591,6 +591,11 @@ static struct msm_soc_info cpu_of_id[] = { 
	[349] = {MSM_CPU_SDM632, "SDM632"},

	[350] = {MSM_CPU_SDA632, "SDA632"},



	/*MSM8937 ID  */

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

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





	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1518,6 +1523,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 293;

		strlcpy(dummy_socinfo.build_id, "msm8953 - ",

			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_sdm450()) {

		dummy_socinfo.id = 338;

		strlcpy(dummy_socinfo.build_id, "sdm450 - ",

include/soc/qcom/socinfo.h

+5 −1
Original line number Diff line number Diff line 
/*

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

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -108,6 +108,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda670")

#define early_machine_is_msm8953()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8953")

#define early_machine_is_msm8937()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8937")

#define early_machine_is_sdm450()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm450")

#define early_machine_is_sdm632()	\
@@ -155,6 +157,7 @@ 
#define early_machine_is_qcs605()	0

#define early_machine_is_sda670()	0

#define early_machine_is_msm8953()	0

#define early_machine_is_msm8937()	0

#define early_machine_is_sdm450()	0

#define early_machine_is_sdm632()	0

#endif
@@ -225,6 +228,7 @@ enum msm_cpu { 
	MSM_CPU_SDM450,

	MSM_CPU_SDM632,

	MSM_CPU_SDA632,

	MSM_CPU_8937

};



struct msm_soc_info {