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

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

Merge "soc: qcom: Add support for atoll-ab into socinfo driver"

parents baa4ed74 6d2ed2da

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

+4 −0
Original line number Diff line number Diff line
@@ -237,5 +237,9 @@ compatible = "qcom,atollp" 
compatible = "qcom,atollp-idp"

compatible = "qcom,atollp-atp"

compatible = "qcom,atollp-qrd"

compatible = "qcom,atoll-ab"

compatible = "qcom,atoll-ab-idp"

compatible = "qcom,atoll-ab-atp"

compatible = "qcom,atoll-ab-qrd"

compatible = "qcom,qcs610-iot"

compatible = "qcom,qcs410-iot"

drivers/soc/qcom/socinfo.c

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

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



	/* atollab ID */

	[443] = {MSM_CPU_ATOLL_AB, "ATOLL-AB"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1416,6 +1419,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 424;

		strlcpy(dummy_socinfo.build_id, "atollp - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_atoll_ab()) {

		dummy_socinfo.id = 443;

		strlcpy(dummy_socinfo.build_id, "atoll-ab - ",

		sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

include/soc/qcom/socinfo.h

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ 
	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")

#define early_machine_is_atoll_ab()	\

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

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -191,6 +193,7 @@ enum msm_cpu { 
	MSM_CPU_QCS410,

	MSM_CPU_ATOLL,

	MSM_CPU_ATOLLP,

	MSM_CPU_ATOLL_AB,

};



struct msm_soc_info {