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

Commit 136e89c9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: Add support for atollp into socinfo driver"

parents 729f2edf e43a155b

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

+4 −0
Original line number Diff line number Diff line
@@ -233,5 +233,9 @@ compatible = "qcom,atoll-rumi" 
compatible = "qcom,atoll-idp"

compatible = "qcom,atoll-atp"

compatible = "qcom,atoll-qrd"

compatible = "qcom,atollp"

compatible = "qcom,atollp-idp"

compatible = "qcom,atollp-atp"

compatible = "qcom,atollp-qrd"

compatible = "qcom,qcs610-iot"

compatible = "qcom,qcs410-iot"

drivers/soc/qcom/socinfo.c

+7 −0
Original line number Diff line number Diff line
@@ -425,6 +425,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* atoll ID */

	[407] = {MSM_CPU_ATOLL, "ATOLL"},



	/* atollp ID */

	[424] = {MSM_CPU_ATOLLP, "ATOLLP"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1409,6 +1412,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 407;

		strlcpy(dummy_socinfo.build_id, "atoll - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_atollp()) {

		dummy_socinfo.id = 424;

		strlcpy(dummy_socinfo.build_id, "atollp - ",

		sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

include/soc/qcom/socinfo.h

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qcs410")

#define early_machine_is_atoll()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,atoll")

#define early_machine_is_atollp()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,atollp")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -144,6 +146,7 @@ 
#define early_machine_is_qcs610()       0

#define early_machine_is_qcs410()       0

#define early_machine_is_atoll()	0

#define early_machine_is_atollp()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -187,6 +190,7 @@ enum msm_cpu { 
	MSM_CPU_QCS610,

	MSM_CPU_QCS410,

	MSM_CPU_ATOLL,

	MSM_CPU_ATOLLP,

};



struct msm_soc_info {