Merge "soc: qcom: socinfo: Rename sdmdolphin"
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index 3b551c5..f829eaa 100644
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -602,8 +602,8 @@
/* SDM710 ID */
[360] = {MSM_CPU_SDM710, "SDM710"},
- /* SDMDOLPHIN ID */
- [393] = {MSM_CPU_SDMDOLPHIN, "SDMDOLPHIN"},
+ /* SDMNOBELIUM ID */
+ [393] = {MSM_CPU_SDMNOBELIUM, "SDMNOBELIUM"},
/* SXR1120 ID */
[370] = {MSM_CPU_SXR1120, "SXR1120"},
@@ -1557,9 +1557,9 @@
dummy_socinfo.id = 360;
strlcpy(dummy_socinfo.build_id, "sdm710 - ",
sizeof(dummy_socinfo.build_id));
- } else if (early_machine_is_sdmdolphin()) {
+ } else if (early_machine_is_sdmnobelium()) {
dummy_socinfo.id = 393;
- strlcpy(dummy_socinfo.build_id, "sdmdolphin - ",
+ strlcpy(dummy_socinfo.build_id, "sdmnobelium - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_sda670()) {
dummy_socinfo.id = 337;
diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h
index 606a107f9..e6259bc 100644
--- a/include/soc/qcom/socinfo.h
+++ b/include/soc/qcom/socinfo.h
@@ -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_sdmdolphin() \
+#define early_machine_is_sdmnobelium() \
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")
@@ -198,7 +198,7 @@
#define early_machine_is_sda429() 0
#define early_machine_is_mdm9650() 0
#define early_machine_is_qm215() 0
-#define early_machine_is_sdmdolphin() 0
+#define early_machine_is_sdmnobelium() 0
#endif
#define PLATFORM_SUBTYPE_MDM 1
@@ -275,7 +275,7 @@
MSM_CPU_8917,
MSM_CPU_9607,
MSM_CPU_SDM439,
- MSM_CPU_SDMDOLPHIN,
+ MSM_CPU_SDMNOBELIUM,
MSM_CPU_SDM429,
MSM_CPU_SDA439,
MSM_CPU_SDA429,