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

Commit c46e6447 authored by Prasad Sodagudi's avatar Prasad Sodagudi
Browse files

msm: socinfo: Rename msmtellurium to msm8952 



msm8952 is the official name for msmtellurium,
so rename msmtellurium with msm8952.

1) Add msm8952 board variants to the documentation
   and replace instances of msmtellurium with msm8952.
2) Update socinfo driver to reflect msm8952 chip ID
   and rename msmtellurium with msm8952.
3) Update diag driver to reflect msm8952.

Change-Id: I9f579d55b8bf7e340420aaf57f7e0537691fc170
Signed-off-by: default avatarPrasad Sodagudi <psodagud@codeaurora.org>
parent 6f524acc

Documentation/devicetree/bindings/arm/msm/msm.txt

+13 −4
Original line number Diff line number Diff line
@@ -74,8 +74,11 @@ SoCs: 
- MSMCOBALT

  compatible = "qcom,msmcobalt"



- MSMTELLURIUM

  compatible = "qcom,msmtellurium"

- MSM8952

  compatible = "qcom,msm8952"



- APQ8052

  compatible = "qcom,apq8052"



- MSMZIRC

  compatible = "qcom,msmzirc"
@@ -198,8 +201,14 @@ compatible = "qcom,msm8996-fluid" 
compatible = "qcom,msm8996-liquid"

compatible = "qcom,msm8996-mtp"

compatible = "qcom,msmcobalt-sim"

compatible = "qcom,msmtellurium-rumi"

compatible = "qcom,msmtellurium-sim"

compatible = "qcom,msm8952-rumi"

compatible = "qcom,msm8952-sim"

compatible = "qcom,msm8952-qrd"

compatible = "qcom,msm8952-qrd-skum"

compatible = "qcom,msm8952-cdp"

compatible = "qcom,msm8952-mtp"

compatible = "qcom,apq8052-cdp"

compatible = "qcom,apq8052-mtp"

compatible = "qcom,msmzirc-cdp"

compatible = "qcom,msmzirc-mtp"

compatible = "qcom,msmzirc-rumi"

drivers/char/diag/diagfwd.c

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ int chk_config_get_id(void) 
		return MSM8992_TOOLS_ID;

	case MSM_CPU_8996:

		return MSM_8996_TOOLS_ID;

	case MSM_CPU_TELLURIUM:

		return MSMTELLURIUM_TOOLS_ID;

	case MSM_CPU_8952:

		return MSM8952_TOOLS_ID;

	default:

		if (driver->use_device_tree) {

			if (machine_is_msm8974())

drivers/soc/qcom/socinfo.c

+5 −4
Original line number Diff line number Diff line
@@ -495,8 +495,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	[256] = {FSM_CPU_9010, "FSM9010"},

	[257] = {FSM_CPU_9010, "FSM9010"},



	/* Tellurium ID */

	[264] = {MSM_CPU_TELLURIUM, "MSMTELLURIUM"},

	/* 8952 ID */

	[264] = {MSM_CPU_8952, "MSM8952"},

	[289] = {MSM_CPU_8952, "APQ8952"},



	/* 8996 IDs */

	[246] = {MSM_CPU_8996, "MSM8996"},
@@ -1048,9 +1049,9 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 266;

		strlcpy(dummy_socinfo.build_id, "msm8976 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msmtellurium()) {

	} else if (early_machine_is_msm8952()) {

		dummy_socinfo.id = 264;

		strlcpy(dummy_socinfo.build_id, "msmtellurium - ",

		strlcpy(dummy_socinfo.build_id, "msm8952 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8996()) {

		dummy_socinfo.id = 246;

include/linux/diagchar.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
#define APQ8026_TOOLS_ID	4104

#define MSM8909_TOOLS_ID	4108

#define MSM8992_TOOLS_ID	4111

#define MSMTELLURIUM_TOOLS_ID	4110

#define MSM8952_TOOLS_ID	4110

#define MSM_8996_TOOLS_ID	4112



#define MSG_MASK_0			(0x00000001)

include/soc/qcom/socinfo.h

+4 −4
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,fsm9010")

#define early_machine_is_msm8976()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8976")

#define early_machine_is_msmtellurium()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmtellurium")

#define early_machine_is_msm8952()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8952")

#define early_machine_is_msm8996()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996")

#define early_machine_is_msm8929()	\
@@ -115,7 +115,7 @@ 
#define early_machine_is_mdm9630()	0

#define early_machine_is_fsm9900()	0

#define early_machine_is_fsm9010()	0

#define early_machine_is_msmtellurium()	0

#define early_machine_is_msm8952()	0

#define early_machine_is_msm8996()	0

#define early_machine_is_msm8976() 0

#define early_machine_is_msm8929()	0
@@ -171,7 +171,7 @@ enum msm_cpu { 
	MSM_CPU_8994,

	MSM_CPU_8992,

	FSM_CPU_9010,

	MSM_CPU_TELLURIUM,

	MSM_CPU_8952,

	MSM_CPU_8996,

	MSM_CPU_8976,

	MSM_CPU_8929,