rubenslte/android_kernel_samsung_msm8226
1
Fork 1
mirror of https://github.com/LineageOS/android_kernel_samsung_msm8226.git synced 2026-09-29 00:00:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge "msm: qpnp-revid: Add exception for PM8226 v1"

Browse Source
This commit is contained in:
Linux Build Service Account
2013-06-11 01:45:36 -07:00
committed by Gerrit - the friendly Code Review server
parent 5007cde3e7 1afce1ccb8
commit 36232cedd3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/platform/msm/qpnp-revid.c
+7 -4
View File
@@ -52,17 +52,20 @@ static u8 qpnp_read_byte(struct spmi_device *spmi, u16 addr)
}
#define PM8941_PERIPHERAL_SUBTYPE 0x01
#define PM8226_PERIPHERAL_SUBTYPE 0x04
static size_t build_pmic_string(char *buf, size_t n, int sid,
u8 subtype, u8 rev1, u8 rev2, u8 rev3, u8 rev4)
{
size_t pos = 0;
/*
* In early versions of PM8941, the major revision number started
* incrementing from 0 (eg 0 = v1.0, 1 = v2.0).
* In early versions of PM8941 and PM8226, the major revision number
* started incrementing from 0 (eg 0 = v1.0, 1 = v2.0).
* Increment the major revision number here if the chip is an early
* version of PM8941.
* version of PM8941 or PM8226.
*/
if ((int)subtype == PM8941_PERIPHERAL_SUBTYPE && rev4 < 0x02)
if (((int)subtype == PM8941_PERIPHERAL_SUBTYPE
|| (int)subtype == PM8226_PERIPHERAL_SUBTYPE)
&& rev4 < 0x02)
rev4++;
pos += snprintf(buf + pos, n - pos, "PMIC@SID%d", sid);