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

Commit 50e118c3 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: Rename sdmnobelium to sdm712"

parents 2f15673d ea66878e

drivers/soc/qcom/socinfo.c

+4 −4
Original line number Diff line number Diff line
@@ -602,8 +602,8 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* SDM710 ID */

	[360] = {MSM_CPU_SDM710, "SDM710"},



	/* SDMNOBELIUM ID */

	[393] = {MSM_CPU_SDMNOBELIUM, "SDMNOBELIUM"},

	/* SDM712 ID */

	[393] = {MSM_CPU_SDM712, "SDM712"},



	/* SXR1120 ID */

	[370] = {MSM_CPU_SXR1120, "SXR1120"},
@@ -1560,9 +1560,9 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 360;

		strlcpy(dummy_socinfo.build_id, "sdm710 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdmnobelium()) {

	} else if (early_machine_is_sdm712()) {

		dummy_socinfo.id = 393;

		strlcpy(dummy_socinfo.build_id, "sdmnobelium - ",

		strlcpy(dummy_socinfo.build_id, "sdm712 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sda670()) {

		dummy_socinfo.id = 337;

include/soc/qcom/socinfo.h

+4 −4
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2009-2019, 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
@@ -114,7 +114,7 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sxr1120")

#define early_machine_is_msm8953()	\

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

#define early_machine_is_sdmnobelium()	\

#define early_machine_is_sdm712()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm670")

#define early_machine_is_msm8937()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8937")
@@ -201,7 +201,7 @@ 
#define early_machine_is_sda429()	0

#define early_machine_is_mdm9650()     0

#define early_machine_is_qm215()	0

#define early_machine_is_sdmnobelium()	0

#define early_machine_is_sdm712()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -279,7 +279,7 @@ enum msm_cpu { 
	MSM_CPU_8940,

	MSM_CPU_9607,

	MSM_CPU_SDM439,

	MSM_CPU_SDMNOBELIUM,

	MSM_CPU_SDM712,

	MSM_CPU_SDM429,

	MSM_CPU_SDA439,

	MSM_CPU_SDA429,