evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "socinfo: Add support for ADP platform" into dev/msm-4.4-8996au

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-19 21:37:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit e206db34cb
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/soc/qcom/socinfo.c
View file

@ -64,6 +64,7 @@ enum {
HW_PLATFORM_RCM = 21,
HW_PLATFORM_STP = 23,
HW_PLATFORM_SBC = 24,
HW_PLATFORM_ADP = 25,
HW_PLATFORM_INVALID
};
@ -84,6 +85,7 @@ const char *hw_platform[] = {
[HW_PLATFORM_DTV] = "DTV",
[HW_PLATFORM_STP] = "STP",
[HW_PLATFORM_SBC] = "SBC",
[HW_PLATFORM_ADP] = "ADP",
};
enum {
@ -109,6 +111,22 @@ const char *qrd_hw_platform_subtype[] = {
[PLATFORM_SUBTYPE_QRD_INVALID] = "INVALID",
};
enum {
PLATFORM_SUBTYPE_MOJAVE_V1 = 0x0,
PLATFORM_SUBTYPE_MMX = 0x1,
PLATFORM_SUBTYPE_MOJAVE_FULL_V2 = 0x2,
PLATFORM_SUBTYPE_MOJAVE_BARE_V2 = 0x3,
PLATFORM_SUBTYPE_ADP_INVALID,
};
const char *adp_hw_platform_subtype[] = {
[PLATFORM_SUBTYPE_MOJAVE_V1] = "MOJAVE_V1",
[PLATFORM_SUBTYPE_MMX] = "MMX",
[PLATFORM_SUBTYPE_MOJAVE_FULL_V2] = "_MOJAVE_V2_FULL",
[PLATFORM_SUBTYPE_MOJAVE_BARE_V2] = "_MOJAVE_V2_BARE",
[PLATFORM_SUBTYPE_ADP_INVALID] = "INVALID",
};
enum {
PLATFORM_SUBTYPE_UNKNOWN = 0x0,
PLATFORM_SUBTYPE_CHARM = 0x1,
@ -805,6 +823,14 @@ msm_get_platform_subtype(struct device *dev,
}
return snprintf(buf, PAGE_SIZE, "%-.32s\n",
qrd_hw_platform_subtype[hw_subtype]);
}
if (socinfo_get_platform_type() == HW_PLATFORM_ADP) {
if (hw_subtype >= PLATFORM_SUBTYPE_ADP_INVALID) {
pr_err("Invalid hardware platform sub type for adp found\n");
hw_subtype = PLATFORM_SUBTYPE_ADP_INVALID;
}
return snprintf(buf, PAGE_SIZE, "%-.32s\n",
adp_hw_platform_subtype[hw_subtype]);
} else {
if (hw_subtype >= PLATFORM_SUBTYPE_INVALID) {
pr_err("Invalid hardware platform subtype\n");