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

Commit 61956696 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 sdmdolphin"

parents 946bd474 8647da80

drivers/soc/qcom/socinfo.c

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

	/* SDM710 ID */

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

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





	/* SDMDOLPHIN ID */

	/* SDMNOBELIUM ID */

	[393] = {MSM_CPU_SDMDOLPHIN, "SDMDOLPHIN"},

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





	/* SXR1120 ID */

	/* SXR1120 ID */

	[370] = {MSM_CPU_SXR1120, "SXR1120"},

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

		dummy_socinfo.id = 360;

		strlcpy(dummy_socinfo.build_id, "sdm710 - ",

		strlcpy(dummy_socinfo.build_id, "sdm710 - ",

			sizeof(dummy_socinfo.build_id));

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdmdolphin()) {

	} else if (early_machine_is_sdmnobelium()) {

		dummy_socinfo.id = 393;

		dummy_socinfo.id = 393;

		strlcpy(dummy_socinfo.build_id, "sdmdolphin - ",

		strlcpy(dummy_socinfo.build_id, "sdmnobelium - ",

			sizeof(dummy_socinfo.build_id));

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sda670()) {

	} else if (early_machine_is_sda670()) {

		dummy_socinfo.id = 337;

		dummy_socinfo.id = 337;

include/soc/qcom/socinfo.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sxr1120")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sxr1120")

#define early_machine_is_msm8953()	\

#define early_machine_is_msm8953()	\

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

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

#define early_machine_is_sdmdolphin()	\

#define early_machine_is_sdmnobelium()	\

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

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

#define early_machine_is_msm8937()	\

#define early_machine_is_msm8937()	\

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

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

#define early_machine_is_sda429()	0

#define early_machine_is_mdm9650()     0

#define early_machine_is_mdm9650()     0

#define early_machine_is_qm215()	0

#define early_machine_is_qm215()	0

#define early_machine_is_sdmdolphin()	0

#define early_machine_is_sdmnobelium()	0

#endif

#endif





#define PLATFORM_SUBTYPE_MDM	1

#define PLATFORM_SUBTYPE_MDM	1
@@ -275,7 +275,7 @@ enum msm_cpu { 
	MSM_CPU_8917,

	MSM_CPU_8917,

	MSM_CPU_9607,

	MSM_CPU_9607,

	MSM_CPU_SDM439,

	MSM_CPU_SDM439,

	MSM_CPU_SDMDOLPHIN,

	MSM_CPU_SDMNOBELIUM,

	MSM_CPU_SDM429,

	MSM_CPU_SDM429,

	MSM_CPU_SDA439,

	MSM_CPU_SDA439,

	MSM_CPU_SDA429,

	MSM_CPU_SDA429,