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

Commit 0aa4771a 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 SA4155P"

parents d4ced502 d6458232

drivers/soc/qcom/socinfo.c

+8 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2009-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2009-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -363,6 +363,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* sa6155P ID */

	[377] = {MSM_CPU_SA6155P, "SA6155P"},



	/* sa4155P ID */

	[380] = {MSM_CPU_SA4155P, "SA4155P"},



	/* sa6155 ID */

	[384] = {MSM_CPU_SA6155, "SA6155"},
@@ -1277,6 +1280,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 377;

		strlcpy(dummy_socinfo.build_id, "sa6155p - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sa4155p()) {

		dummy_socinfo.id = 380;

		strlcpy(dummy_socinfo.build_id, "sa4155p - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sa6155()) {

		dummy_socinfo.id = 384;

		strlcpy(dummy_socinfo.build_id, "sa6155 - ",

include/soc/qcom/socinfo.h

+5 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2009-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2009-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -81,6 +81,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmmagpie")

#define early_machine_is_sa6155p()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sa6155p")

#define early_machine_is_sa4155p()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sa4155p")

#define early_machine_is_sa6155()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sa6155")

#define early_machine_is_trinket()	\
@@ -115,6 +117,7 @@ 
#define early_machine_is_sdxprairie()	0

#define early_machine_is_sdmmagpie()	0

#define early_machine_is_sa6155p()	0

#define early_machine_is_sa4155p()	0

#define early_machine_is_sa6155()	0

#define early_machine_is_trinket()	0

#endif
@@ -149,6 +152,7 @@ enum msm_cpu { 
	SDX_CPU_SDXPRAIRIE,

	MSM_CPU_SDMMAGPIE,

	MSM_CPU_SA6155P,

	MSM_CPU_SA4155P,

	MSM_CPU_SA6155,

	MSM_CPU_TRINKET,

};