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

Commit bb2f0520 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: socinfo: Introduce soc string"

parents 35505168 72b7feb9

drivers/soc/qcom/socinfo.c

+175 −175
Original line number Diff line number Diff line
@@ -197,270 +197,270 @@ static union { 
	struct socinfo_v9 v9;

} *socinfo;



static enum msm_cpu cpu_of_id[] = {

static struct msm_soc_info cpu_of_id[] = {



	/* 7x01 IDs */

	[1]  = MSM_CPU_7X01,

	[16] = MSM_CPU_7X01,

	[17] = MSM_CPU_7X01,

	[18] = MSM_CPU_7X01,

	[19] = MSM_CPU_7X01,

	[23] = MSM_CPU_7X01,

	[25] = MSM_CPU_7X01,

	[26] = MSM_CPU_7X01,

	[32] = MSM_CPU_7X01,

	[33] = MSM_CPU_7X01,

	[34] = MSM_CPU_7X01,

	[35] = MSM_CPU_7X01,

	[0]  = {MSM_CPU_UNKNOWN, "Unknown CPU"},

	[1]  = {MSM_CPU_7X01, "MSM7X01"},

	[16] = {MSM_CPU_7X01, "MSM7X01"},

	[17] = {MSM_CPU_7X01, "MSM7X01"},

	[18] = {MSM_CPU_7X01, "MSM7X01"},

	[19] = {MSM_CPU_7X01, "MSM7X01"},

	[23] = {MSM_CPU_7X01, "MSM7X01"},

	[25] = {MSM_CPU_7X01, "MSM7X01"},

	[26] = {MSM_CPU_7X01, "MSM7X01"},

	[32] = {MSM_CPU_7X01, "MSM7X01"},

	[33] = {MSM_CPU_7X01, "MSM7X01"},

	[34] = {MSM_CPU_7X01, "MSM7X01"},

	[35] = {MSM_CPU_7X01, "MSM7X01"},



	/* 7x25 IDs */

	[20] = MSM_CPU_7X25,

	[21] = MSM_CPU_7X25, /* 7225 */

	[24] = MSM_CPU_7X25, /* 7525 */

	[27] = MSM_CPU_7X25, /* 7625 */

	[39] = MSM_CPU_7X25,

	[40] = MSM_CPU_7X25,

	[41] = MSM_CPU_7X25,

	[42] = MSM_CPU_7X25,

	[62] = MSM_CPU_7X25, /* 7625-1 */

	[63] = MSM_CPU_7X25, /* 7225-1 */

	[66] = MSM_CPU_7X25, /* 7225-2 */

	[20] = {MSM_CPU_7X25, "MSM7X25"},

	[21] = {MSM_CPU_7X25, "MSM7X25"},

	[24] = {MSM_CPU_7X25, "MSM7X25"},

	[27] = {MSM_CPU_7X25, "MSM7X25"},

	[39] = {MSM_CPU_7X25, "MSM7X25"},

	[40] = {MSM_CPU_7X25, "MSM7X25"},

	[41] = {MSM_CPU_7X25, "MSM7X25"},

	[42] = {MSM_CPU_7X25, "MSM7X25"},

	[62] = {MSM_CPU_7X25, "MSM7X25"},

	[63] = {MSM_CPU_7X25, "MSM7X25"},

	[66] = {MSM_CPU_7X25, "MSM7X25"},





	/* 7x27 IDs */

	[43] = MSM_CPU_7X27,

	[44] = MSM_CPU_7X27,

	[61] = MSM_CPU_7X27,

	[67] = MSM_CPU_7X27, /* 7227-1 */

	[68] = MSM_CPU_7X27, /* 7627-1 */

	[69] = MSM_CPU_7X27, /* 7627-2 */

	[43] = {MSM_CPU_7X27, "MSM7X27"},

	[44] = {MSM_CPU_7X27, "MSM7X27"},

	[61] = {MSM_CPU_7X27, "MSM7X27"},

	[67] = {MSM_CPU_7X27, "MSM7X27"},

	[68] = {MSM_CPU_7X27, "MSM7X27"},

	[69] = {MSM_CPU_7X27, "MSM7X27"},





	/* 8x50 IDs */

	[30] = MSM_CPU_8X50,

	[36] = MSM_CPU_8X50,

	[37] = MSM_CPU_8X50,

	[38] = MSM_CPU_8X50,

	[30] = {MSM_CPU_8X50, "MSM8X50"},

	[36] = {MSM_CPU_8X50, "MSM8X50"},

	[37] = {MSM_CPU_8X50, "MSM8X50"},

	[38] = {MSM_CPU_8X50, "MSM8X50"},



	/* 7x30 IDs */

	[59] = MSM_CPU_7X30,

	[60] = MSM_CPU_7X30,

	[59] = {MSM_CPU_7X30, "MSM7X30"},

	[60] = {MSM_CPU_7X30, "MSM7X30"},



	/* 8x55 IDs */

	[74] = MSM_CPU_8X55,

	[75] = MSM_CPU_8X55,

	[85] = MSM_CPU_8X55,

	[74] = {MSM_CPU_8X55, "MSM8X55"},

	[75] = {MSM_CPU_8X55, "MSM8X55"},

	[85] = {MSM_CPU_8X55, "MSM8X55"},



	/* 8x60 IDs */

	[70] = MSM_CPU_8X60,

	[71] = MSM_CPU_8X60,

	[86] = MSM_CPU_8X60,

	[70] = {MSM_CPU_8X60, "MSM8X60"},

	[71] = {MSM_CPU_8X60, "MSM8X60"},

	[86] = {MSM_CPU_8X60, "MSM8X60"},



	/* 8960 IDs */

	[87] = MSM_CPU_8960,

	[87] = {MSM_CPU_8960, "MSM8960"},



	/* 7x25A IDs */

	[88] = MSM_CPU_7X25A,

	[89] = MSM_CPU_7X25A,

	[96] = MSM_CPU_7X25A,

	[88] = {MSM_CPU_7X25A, "MSM7X25A"},

	[89] = {MSM_CPU_7X25A, "MSM7X25A"},

	[96] = {MSM_CPU_7X25A, "MSM7X25A"},



	/* 7x27A IDs */

	[90] = MSM_CPU_7X27A,

	[91] = MSM_CPU_7X27A,

	[92] = MSM_CPU_7X27A,

	[97] = MSM_CPU_7X27A,

	[90] = {MSM_CPU_7X27A, "MSM7X27A"},

	[91] = {MSM_CPU_7X27A, "MSM7X27A"},

	[92] = {MSM_CPU_7X27A, "MSM7X27A"},

	[97] = {MSM_CPU_7X27A, "MSM7X27A"},



	/* FSM9xxx ID */

	[94] = FSM_CPU_9XXX,

	[95] = FSM_CPU_9XXX,

	[94] = {FSM_CPU_9XXX, "FSM9XXX"},

	[95] = {FSM_CPU_9XXX, "FSM9XXX"},



	/*  7x25AA ID */

	[98] = MSM_CPU_7X25AA,

	[99] = MSM_CPU_7X25AA,

	[100] = MSM_CPU_7X25AA,

	[98] = {MSM_CPU_7X25AA, "MSM7X25AA"},

	[99] = {MSM_CPU_7X25AA, "MSM7X25AA"},

	[100] = {MSM_CPU_7X25AA, "MSM7X25AA"},



	/*  7x27AA ID */

	[101] = MSM_CPU_7X27AA,

	[102] = MSM_CPU_7X27AA,

	[103] = MSM_CPU_7X27AA,

	[136] = MSM_CPU_7X27AA,

	[101] = {MSM_CPU_7X27AA, "MSM7X27AA"},

	[102] = {MSM_CPU_7X27AA, "MSM7X27AA"},

	[103] = {MSM_CPU_7X27AA, "MSM7X27AA"},

	[136] = {MSM_CPU_7X27AA, "MSM7X27AA"},



	/* 9x15 ID */

	[104] = MSM_CPU_9615,

	[105] = MSM_CPU_9615,

	[106] = MSM_CPU_9615,

	[107] = MSM_CPU_9615,

	[171] = MSM_CPU_9615,

	[104] = {MSM_CPU_9615, "MSM9615"},

	[105] = {MSM_CPU_9615, "MSM9615"},

	[106] = {MSM_CPU_9615, "MSM9615"},

	[107] = {MSM_CPU_9615, "MSM9615"},

	[171] = {MSM_CPU_9615, "MSM9615"},



	/* 8064 IDs */

	[109] = MSM_CPU_8064,

	[109] = {MSM_CPU_8064, "APQ8064"},



	/* 8930 IDs */

	[116] = MSM_CPU_8930,

	[117] = MSM_CPU_8930,

	[118] = MSM_CPU_8930,

	[119] = MSM_CPU_8930,

	[179] = MSM_CPU_8930,

	[116] = {MSM_CPU_8930, "MSM8930"},

	[117] = {MSM_CPU_8930, "MSM8930"},

	[118] = {MSM_CPU_8930, "MSM8930"},

	[119] = {MSM_CPU_8930, "MSM8930"},

	[179] = {MSM_CPU_8930, "MSM8930"},



	/* 8627 IDs */

	[120] = MSM_CPU_8627,

	[121] = MSM_CPU_8627,

	[120] = {MSM_CPU_8627, "MSM8627"},

	[121] = {MSM_CPU_8627, "MSM8627"},



	/* 8660A ID */

	[122] = MSM_CPU_8960,

	[122] = {MSM_CPU_8960, "MSM8960"},



	/* 8260A ID */

	[123] = MSM_CPU_8960,

	[123] = {MSM_CPU_8960, "MSM8960"},



	/* 8060A ID */

	[124] = MSM_CPU_8960,

	[124] = {MSM_CPU_8960, "MSM8960"},



	/* 8974 IDs */

	[126] = MSM_CPU_8974,

	[184] = MSM_CPU_8974,

	[185] = MSM_CPU_8974,

	[186] = MSM_CPU_8974,

	[126] = {MSM_CPU_8974, "MSM8974"},

	[184] = {MSM_CPU_8974, "MSM8974"},

	[185] = {MSM_CPU_8974, "MSM8974"},

	[186] = {MSM_CPU_8974, "MSM8974"},



	/* 8974AA IDs */

	[208] = MSM_CPU_8974PRO_AA,

	[211] = MSM_CPU_8974PRO_AA,

	[214] = MSM_CPU_8974PRO_AA,

	[217] = MSM_CPU_8974PRO_AA,

	[208] = {MSM_CPU_8974PRO_AA, "MSM8974PRO-AA"},

	[211] = {MSM_CPU_8974PRO_AA, "MSM8974PRO-AA"},

	[214] = {MSM_CPU_8974PRO_AA, "MSM8974PRO-AA"},

	[217] = {MSM_CPU_8974PRO_AA, "MSM8974PRO-AA"},



	/* 8974AB IDs */

	[209] = MSM_CPU_8974PRO_AB,

	[212] = MSM_CPU_8974PRO_AB,

	[215] = MSM_CPU_8974PRO_AB,

	[218] = MSM_CPU_8974PRO_AB,

	[209] = {MSM_CPU_8974PRO_AB, "MSM8974PRO-AB"},

	[212] = {MSM_CPU_8974PRO_AB, "MSM8974PRO-AB"},

	[215] = {MSM_CPU_8974PRO_AB, "MSM8974PRO-AB"},

	[218] = {MSM_CPU_8974PRO_AB, "MSM8974PRO-AB"},



	/* 8974AC IDs */

	[194] = MSM_CPU_8974PRO_AC,

	[210] = MSM_CPU_8974PRO_AC,

	[213] = MSM_CPU_8974PRO_AC,

	[216] = MSM_CPU_8974PRO_AC,

	[194] = {MSM_CPU_8974PRO_AC, "MSM8974PRO-AC"},

	[210] = {MSM_CPU_8974PRO_AC, "MSM8974PRO-AC"},

	[213] = {MSM_CPU_8974PRO_AC, "MSM8974PRO-AC"},

	[216] = {MSM_CPU_8974PRO_AC, "MSM8974PRO-AC"},



	/* 8625 IDs */

	[127] = MSM_CPU_8625,

	[128] = MSM_CPU_8625,

	[129] = MSM_CPU_8625,

	[137] = MSM_CPU_8625,

	[167] = MSM_CPU_8625,

	[127] = {MSM_CPU_8625, "MSM8625"},

	[128] = {MSM_CPU_8625, "MSM8625"},

	[129] = {MSM_CPU_8625, "MSM8625"},

	[137] = {MSM_CPU_8625, "MSM8625"},

	[167] = {MSM_CPU_8625, "MSM8625"},



	/* 8064 MPQ ID */

	[130] = MSM_CPU_8064,

	[130] = {MSM_CPU_8064, "APQ8064"},



	/* 7x25AB IDs */

	[131] = MSM_CPU_7X25AB,

	[132] = MSM_CPU_7X25AB,

	[133] = MSM_CPU_7X25AB,

	[135] = MSM_CPU_7X25AB,

	[131] = {MSM_CPU_7X25AB, "MSM7X25AB"},

	[132] = {MSM_CPU_7X25AB, "MSM7X25AB"},

	[133] = {MSM_CPU_7X25AB, "MSM7X25AB"},

	[135] = {MSM_CPU_7X25AB, "MSM7X25AB"},



	/* 9625 IDs */

	[134] = MSM_CPU_9625,

	[148] = MSM_CPU_9625,

	[149] = MSM_CPU_9625,

	[150] = MSM_CPU_9625,

	[151] = MSM_CPU_9625,

	[152] = MSM_CPU_9625,

	[173] = MSM_CPU_9625,

	[174] = MSM_CPU_9625,

	[175] = MSM_CPU_9625,

	[134] = {MSM_CPU_9625, "MSM9625"},

	[148] = {MSM_CPU_9625, "MSM9625"},

	[149] = {MSM_CPU_9625, "MSM9625"},

	[150] = {MSM_CPU_9625, "MSM9625"},

	[151] = {MSM_CPU_9625, "MSM9625"},

	[152] = {MSM_CPU_9625, "MSM9625"},

	[173] = {MSM_CPU_9625, "MSM9625"},

	[174] = {MSM_CPU_9625, "MSM9625"},

	[175] = {MSM_CPU_9625, "MSM9625"},



	/* 8960AB IDs */

	[138] = MSM_CPU_8960AB,

	[139] = MSM_CPU_8960AB,

	[140] = MSM_CPU_8960AB,

	[141] = MSM_CPU_8960AB,

	[138] = {MSM_CPU_8960AB, "MSM8960AB"},

	[139] = {MSM_CPU_8960AB, "MSM8960AB"},

	[140] = {MSM_CPU_8960AB, "MSM8960AB"},

	[141] = {MSM_CPU_8960AB, "MSM8960AB"},



	/* 8930AA IDs */

	[142] = MSM_CPU_8930AA,

	[143] = MSM_CPU_8930AA,

	[144] = MSM_CPU_8930AA,

	[160] = MSM_CPU_8930AA,

	[180] = MSM_CPU_8930AA,

	[142] = {MSM_CPU_8930AA, "MSM8930AA"},

	[143] = {MSM_CPU_8930AA, "MSM8930AA"},

	[144] = {MSM_CPU_8930AA, "MSM8930AA"},

	[160] = {MSM_CPU_8930AA, "MSM8930AA"},

	[180] = {MSM_CPU_8930AA, "MSM8930AA"},



	/* 8226 IDs */

	[145] = MSM_CPU_8226,

	[158] = MSM_CPU_8226,

	[159] = MSM_CPU_8226,

	[198] = MSM_CPU_8226,

	[199] = MSM_CPU_8226,

	[200] = MSM_CPU_8226,

	[205] = MSM_CPU_8226,

	[219] = MSM_CPU_8226,

	[220] = MSM_CPU_8226,

	[221] = MSM_CPU_8226,

	[222] = MSM_CPU_8226,

	[223] = MSM_CPU_8226,

	[224] = MSM_CPU_8226,

	[145] = {MSM_CPU_8226, "MSM8626"},

	[158] = {MSM_CPU_8226, "MSM8226"},

	[159] = {MSM_CPU_8226, "MSM8526"},

	[198] = {MSM_CPU_8226, "MSM8126"},

	[199] = {MSM_CPU_8226, "APQ8026"},

	[200] = {MSM_CPU_8226, "MSM8926"},

	[205] = {MSM_CPU_8226, "MSM8326"},

	[219] = {MSM_CPU_8226, "APQ8028"},

	[220] = {MSM_CPU_8226, "MSM8128"},

	[221] = {MSM_CPU_8226, "MSM8228"},

	[222] = {MSM_CPU_8226, "MSM8528"},

	[223] = {MSM_CPU_8226, "MSM8628"},

	[224] = {MSM_CPU_8226, "MSM8928"},



	/* 8610 IDs */

	[147] = MSM_CPU_8610,

	[161] = MSM_CPU_8610,

	[162] = MSM_CPU_8610,

	[163] = MSM_CPU_8610,

	[164] = MSM_CPU_8610,

	[165] = MSM_CPU_8610,

	[166] = MSM_CPU_8610,

	[225] = MSM_CPU_8610,

	[226] = MSM_CPU_8610,

	[147] = {MSM_CPU_8610, "MSM8610"},

	[161] = {MSM_CPU_8610, "MSM8110"},

	[162] = {MSM_CPU_8610, "MSM8210"},

	[163] = {MSM_CPU_8610, "MSM8810"},

	[164] = {MSM_CPU_8610, "MSM8212"},

	[165] = {MSM_CPU_8610, "MSM8612"},

	[166] = {MSM_CPU_8610, "MSM8112"},

	[225] = {MSM_CPU_8610, "MSM8510"},

	[226] = {MSM_CPU_8610, "MSM8512"},



	/* 8064AB IDs */

	[153] = MSM_CPU_8064AB,

	[153] = {MSM_CPU_8064AB, "APQ8064AB"},



	/* 8930AB IDs */

	[154] = MSM_CPU_8930AB,

	[155] = MSM_CPU_8930AB,

	[156] = MSM_CPU_8930AB,

	[157] = MSM_CPU_8930AB,

	[181] = MSM_CPU_8930AB,

	[154] = {MSM_CPU_8930AB, "MSM8930AB"},

	[155] = {MSM_CPU_8930AB, "MSM8930AB"},

	[156] = {MSM_CPU_8930AB, "MSM8930AB"},

	[157] = {MSM_CPU_8930AB, "MSM8930AB"},

	[181] = {MSM_CPU_8930AB, "MSM8930AB"},



	/* 8625Q IDs */

	[168] = MSM_CPU_8625Q,

	[169] = MSM_CPU_8625Q,

	[170] = MSM_CPU_8625Q,

	[168] = {MSM_CPU_8625Q, "MSM8225Q"},

	[169] = {MSM_CPU_8625Q, "MSM8625Q"},

	[170] = {MSM_CPU_8625Q, "MSM8125Q"},



	/* 8064AA IDs */

	[172] = MSM_CPU_8064AA,

	[172] = {MSM_CPU_8064AA, "APQ8064AA"},



	/* 8084 IDs */

	[178] = MSM_CPU_8084,

	[178] = {MSM_CPU_8084, "APQ8084"},



	/* 9630 IDs */

	[187] = MSM_CPU_9630,

	[227] = MSM_CPU_9630,

	[228] = MSM_CPU_9630,

	[229] = MSM_CPU_9630,

	[230] = MSM_CPU_9630,

	[231] = MSM_CPU_9630,

	[187] = {MSM_CPU_9630, "MDM9630"},

	[227] = {MSM_CPU_9630, "MDM9630"},

	[228] = {MSM_CPU_9630, "MDM9630"},

	[229] = {MSM_CPU_9630, "MDM9630"},

	[230] = {MSM_CPU_9630, "MDM9630"},

	[231] = {MSM_CPU_9630, "MDM9630"},



	/* FSM9900 ID */

	[188] = FSM_CPU_9900,

	[189] = FSM_CPU_9900,

	[190] = FSM_CPU_9900,

	[191] = FSM_CPU_9900,

	[192] = FSM_CPU_9900,

	[193] = FSM_CPU_9900,

	[188] = {FSM_CPU_9900, "FSM9900"},

	[189] = {FSM_CPU_9900, "FSM9900"},

	[190] = {FSM_CPU_9900, "FSM9900"},

	[191] = {FSM_CPU_9900, "FSM9900"},

	[192] = {FSM_CPU_9900, "FSM9900"},

	[193] = {FSM_CPU_9900, "FSM9900"},



	/* 8916 IDs */

	[206] = MSM_CPU_8916,

	[206] = {MSM_CPU_8916, "MSM8916"},



	/* 8936 IDs */

	[233] = MSM_CPU_8936,

	[233] = {MSM_CPU_8936, "MSM8936"},



	/* 8939 IDs */

	[239] = MSM_CPU_8939,

	[239] = {MSM_CPU_8939, "MSM8939"},



	/* ZIRC IDs */

	[234] = MSM_CPU_ZIRC,

	[235] = MSM_CPU_ZIRC,

	[236] = MSM_CPU_ZIRC,

	[237] = MSM_CPU_ZIRC,

	[238] = MSM_CPU_ZIRC,

	[234] = {MSM_CPU_ZIRC, "MSMZIRC"},

	[235] = {MSM_CPU_ZIRC, "MSMZIRC"},

	[236] = {MSM_CPU_ZIRC, "MSMZIRC"},

	[237] = {MSM_CPU_ZIRC, "MSMZIRC"},

	[238] = {MSM_CPU_ZIRC, "MSMZIRC"},



	/* 8994 ID */

	[207] = MSM_CPU_8994,



	[207] = {MSM_CPU_8994, "MSM8994"},

	/* Uninitialized IDs are not known to run Linux.

	   MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	   considered as unknown CPU. */
@@ -1210,7 +1210,7 @@ int __init socinfo_init(void) 
		"New IDs added! ID => CPU mapping might need an update.\n");



	if (socinfo->v1.id < ARRAY_SIZE(cpu_of_id))

		cur_cpu = cpu_of_id[socinfo->v1.id];

		cur_cpu = cpu_of_id[socinfo->v1.id].generic_soc_type;



	boot_stats_init();

	socinfo_print();

include/soc/qcom/socinfo.h

+5 −0
Original line number Diff line number Diff line
@@ -148,6 +148,11 @@ enum msm_cpu { 
	MSM_CPU_8994,

};



struct msm_soc_info {

	enum msm_cpu generic_soc_type;

	char *soc_id_string;

};



enum pmic_model {

	PMIC_MODEL_PM8058	= 13,

	PMIC_MODEL_PM8028	= 14,