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

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

Merge "soc: qcom: socinfo: Add soc information for Lito"

parents ce3e4665 4605e4ff

arch/arm64/configs/vendor/lito_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ CONFIG_SPI=y 
CONFIG_SPI_SPIDEV=y

CONFIG_SPMI=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_LITO=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

drivers/soc/qcom/socinfo.c

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

	[356] = {MSM_CPU_KONA, "KONA"},



	/* Lito ID */

	[400] = {MSM_CPU_LITO, "LITO"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1178,6 +1181,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 356;

		strlcpy(dummy_socinfo.build_id, "kona - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_lito()) {

		dummy_socinfo.id = 400;

		strlcpy(dummy_socinfo.build_id, "lito - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdmshrike()) {

		dummy_socinfo.id = 340;

		strlcpy(dummy_socinfo.build_id, "sdmshrike - ",

include/soc/qcom/socinfo.h

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

#define early_machine_is_kona()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,kona")

#define early_machine_is_lito()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,lito")

#define early_machine_is_sdmshrike()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmshrike")

#define early_machine_is_sm6150()	\
@@ -85,6 +87,7 @@ 
#define early_machine_is_sm8150()	0

#define early_machine_is_sa8150()	0

#define early_machine_is_kona()		0

#define early_machine_is_lito()		0

#define early_machine_is_sdmshrike()	0

#define early_machine_is_sm6150()	0

#define early_machine_is_qcs405()	0
@@ -113,6 +116,7 @@ enum msm_cpu { 
	MSM_CPU_SM8150,

	MSM_CPU_SA8150,

	MSM_CPU_KONA,

	MSM_CPU_LITO,

	MSM_CPU_SDMSHRIKE,

	MSM_CPU_SM6150,

	MSM_CPU_QCS405,