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

Commit 76979788 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

soc: qcom: add support for the socinfo v0.11 format 



The v0.11 format adds two new fields:
	uint32_t num_pmics;
	uint32_t pmic_array_offset;

where num_pmics is the number of PMICs in the system and
pmic_array_offset is the offset from the start of the socinfo
struct, in bytes, to the start of an array of size 'num_pmics'
with pmic struct members:
	struct pmic {
 		uint32_t pmic_model;
	        uint32_t pmic_die_revision;
	};

The legacy PMIC model and revision fields defined in previous
versions of socinfo will continue to be populated with the
first three PMICs, however the full list (including those
three) can be found at pmic_array_offset.

Change-Id: I554f70f8b3ac1cf82eb1fed1180dd9c5dcbe39e6
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parent 20c4ae1f

drivers/soc/qcom/socinfo.c

+23 −1
Original line number Diff line number Diff line
@@ -198,6 +198,14 @@ struct socinfo_v0_10 { 
	uint32_t serial_number;

};



struct socinfo_v0_11 {

	struct socinfo_v0_10 v0_10;



	/* only valid when format==11*/

	uint32_t num_pmics;

	uint32_t pmic_array_offset;

};



static union {

	struct socinfo_v0_1 v0_1;

	struct socinfo_v0_2 v0_2;
@@ -209,6 +217,7 @@ static union { 
	struct socinfo_v0_8 v0_8;

	struct socinfo_v0_9 v0_9;

	struct socinfo_v0_10 v0_10;

	struct socinfo_v0_11 v0_11;

} *socinfo;



static struct msm_soc_info cpu_of_id[] = {
@@ -1271,7 +1280,20 @@ static void socinfo_print(void) 
			socinfo->v0_9.foundry_id,

			socinfo->v0_10.serial_number);

		break;



	case SOCINFO_VERSION(0, 11):

		pr_info("v%u.%u, id=%u, ver=%u.%u, raw_id=%u, raw_ver=%u, hw_plat=%u, hw_plat_ver=%u\n accessory_chip=%u, hw_plat_subtype=%u, pmic_model=%u, pmic_die_revision=%u foundry_id=%u serial_number=%u num_pmics=%u\n",

			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,

			socinfo->v0_2.raw_id, socinfo->v0_2.raw_version,

			socinfo->v0_3.hw_platform,

			socinfo->v0_4.platform_version,

			socinfo->v0_5.accessory_chip,

			socinfo->v0_6.hw_platform_subtype,

			socinfo->v0_7.pmic_model,

			socinfo->v0_7.pmic_die_revision,

			socinfo->v0_9.foundry_id,

			socinfo->v0_10.serial_number,

			socinfo->v0_11.num_pmics);

		break;

	default:

		pr_err("Unknown format found: v%u.%u\n", f_maj, f_min);

		break;