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

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

Merge "qpnp-revid: Add subtypes for PM855/PM855B/PM855L"

parents 4dc8968f c3d22c42

drivers/platform/msm/qpnp-revid.c

+4 −1
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -61,6 +61,9 @@ static const char *const pmic_names[] = { 
	[PM660_SUBTYPE] = "PM660",

	[PM660_SUBTYPE] = "PM660",

	[PMI632_SUBTYPE] = "PMI632",

	[PMI632_SUBTYPE] = "PMI632",

	[PMI8937_SUBTYPE] = "PMI8937",

	[PMI8937_SUBTYPE] = "PMI8937",

	[PM855_SUBTYPE] = "PM855",

	[PM855B_SUBTYPE] = "PM855B",

	[PM855L_SUBTYPE] = "PM855L",

};

};





struct revid_chip {

struct revid_chip {

include/linux/qpnp/qpnp-revid.h

+6 −1
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -184,6 +184,11 @@ 
/* PMI632 */

/* PMI632 */

#define PMI632_SUBTYPE	0x25

#define PMI632_SUBTYPE	0x25





/* PM855 */

#define PM855_SUBTYPE		0x1E

#define PM855L_SUBTYPE		0x1F

#define PM855B_SUBTYPE		0x20



/* PMI8998 REV_ID */

/* PMI8998 REV_ID */

#define PMI8998_V1P0_REV1	0x00

#define PMI8998_V1P0_REV1	0x00

#define PMI8998_V1P0_REV2	0x00

#define PMI8998_V1P0_REV2	0x00