qpnp: revid: fix the use of TYPE and SUBTYPE

The TYPE for a PMIC chip is always 0x51. There is no need to define it
for each PMIC chip.

Also the SUBTYPE of a PMIC chip doesn't change with versions. Have a
single definition of the SUBTYPE per PMIC chip.

Also, the driver uses integer indexes to get to the pmic name, instead
use the SUBTYPE to index in the pmic names array.

Change-Id: Ie1c43f3db0d4a395307253aad347ad93624a1203
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>

1 files changed, 97 insertions, 68 deletions

diff --git a/include/linux/qpnp/qpnp-revid.h b/include/linux/qpnp/qpnp-revid.h
index d67efaf678e4..4998d93eb094 100644
--- a/include/linux/qpnp/qpnp-revid.h
+++ b/include/linux/qpnp/qpnp-revid.h
@@ -13,146 +13,175 @@
 #ifndef __QPNP_REVID
 #define __QPNP_REVID
 
-#define PM8226_V2P2_REV1	0x00
-#define PM8226_V2P2_REV2	0x00
-#define PM8226_V2P2_REV3	0x02
-#define PM8226_V2P2_REV4	0x02
-#define PM8226_V2P2_TYPE	0x51
-#define PM8226_V2P2_SUBTYPE	0x04
+/* Common TYPE for all PMICs */
+#define PMIC_TYPE		0x51
 
-#define PM8226_V2P1_REV1	0x00
-#define PM8226_V2P1_REV2	0x00
-#define PM8226_V2P1_REV3	0x01
-#define PM8226_V2P1_REV4	0x02
-#define PM8226_V2P1_TYPE	0x51
-#define PM8226_V2P1_SUBTYPE	0x04
-
-#define PM8226_V2P0_REV1	0x00
-#define PM8226_V2P0_REV2	0x00
-#define PM8226_V2P0_REV3	0x00
-#define PM8226_V2P0_REV4	0x02
-#define PM8226_V2P0_TYPE	0x51
-#define PM8226_V2P0_SUBTYPE	0x04
-
-#define PM8226_V1P0_REV1	0x00
-#define PM8226_V1P0_REV2	0x00
-#define PM8226_V1P0_REV3	0x00
-#define PM8226_V1P0_REV4	0x00
-#define PM8226_V1P0_TYPE	0x51
-#define PM8226_V1P0_SUBTYPE	0x04
+/* PM8994 */
+#define PM8941_SUBTYPE		0x01
 
 #define PM8941_V1P0_REV1	0x00
 #define PM8941_V1P0_REV2	0x00
 #define PM8941_V1P0_REV3	0x00
 #define PM8941_V1P0_REV4	0x01
-#define PM8941_V1P0_TYPE	0x51
-#define PM8941_V1P0_SUBTYPE	0x01
 
 #define PM8941_V2P0_REV1	0x00
 #define PM8941_V2P0_REV2	0x00
 #define PM8941_V2P0_REV3	0x00
 #define PM8941_V2P0_REV4	0x01
-#define PM8941_V2P0_TYPE	0x51
-#define PM8941_V2P0_SUBTYPE	0x01
 
 #define PM8941_V3P0_REV1	0x00
 #define PM8941_V3P0_REV2	0x00
 #define PM8941_V3P0_REV3	0x00
 #define PM8941_V3P0_REV4	0x03
-#define PM8941_V3P0_TYPE	0x51
-#define PM8941_V3P0_SUBTYPE	0x01
 
 #define PM8941_V3P1_REV1	0x00
 #define PM8941_V3P1_REV2	0x00
 #define PM8941_V3P1_REV3	0x01
 #define PM8941_V3P1_REV4	0x03
-#define PM8941_V3P1_TYPE	0x51
-#define PM8941_V3P1_SUBTYPE	0x01
+
+/* PM8841 */
+#define PM8841_SUBTYPE		0x02
+
+/* PM8019 */
+#define PM8019_SUBTYPE		0x03
+
+/* PM8226 */
+#define PM8226_SUBTYPE		0x04
+
+#define PM8226_V2P2_REV1	0x00
+#define PM8226_V2P2_REV2	0x00
+#define PM8226_V2P2_REV3	0x02
+#define PM8226_V2P2_REV4	0x02
+
+#define PM8226_V2P1_REV1	0x00
+#define PM8226_V2P1_REV2	0x00
+#define PM8226_V2P1_REV3	0x01
+#define PM8226_V2P1_REV4	0x02
+
+#define PM8226_V2P0_REV1	0x00
+#define PM8226_V2P0_REV2	0x00
+#define PM8226_V2P0_REV3	0x00
+#define PM8226_V2P0_REV4	0x02
+
+#define PM8226_V1P0_REV1	0x00
+#define PM8226_V1P0_REV2	0x00
+#define PM8226_V1P0_REV3	0x00
+#define PM8226_V1P0_REV4	0x00
+
+/* PM8110 */
+#define PM8110_SUBTYPE		0x05
 
 #define PM8110_V1P0_REV1	0x00
 #define PM8110_V1P0_REV2	0x00
 #define PM8110_V1P0_REV3	0x00
 #define PM8110_V1P0_REV4	0x01
-#define PM8110_V1P0_TYPE	0x51
-#define PM8110_V1P0_SUBTYPE	0x05
 
 #define PM8110_V1P1_REV1	0x00
 #define PM8110_V1P1_REV2	0x01
 #define PM8110_V1P1_REV3	0x00
 #define PM8110_V1P1_REV4	0x01
-#define PM8110_V1P1_TYPE	0x51
-#define PM8110_V1P1_SUBTYPE	0x05
 
 #define PM8110_V1P3_REV1	0x00
 #define PM8110_V1P3_REV2	0x03
 #define PM8110_V1P3_REV3	0x00
 #define PM8110_V1P3_REV4	0x01
-#define PM8110_V1P3_TYPE	0x51
-#define PM8110_V1P3_SUBTYPE	0x05
 
 #define PM8110_V2P0_REV1	0x00
 #define PM8110_V2P0_REV2	0x00
 #define PM8110_V2P0_REV3	0x00
 #define PM8110_V2P0_REV4	0x02
-#define PM8110_V2P0_TYPE	0x51
-#define PM8110_V2P0_SUBTYPE	0x05
+
+/* PMA8084 */
+#define PMA8084_SUBTYPE		0x06
+
+/* PMI8962 */
+#define PMI8962_SUBTYPE		0x07
+
+/* PMD9635 */
+#define PMD9635_SUBTYPE		0x08
+/* PM8994 */
+#define PM8994_SUBTYPE		0x09
+
+/* PMI8994 */
+#define PMI8994_TYPE		0x51
+#define PMI8994_SUBTYPE		0x0A
+
+#define PMI8994_V1P0_REV1	0x00
+#define PMI8994_V1P0_REV2	0x00
+#define PMI8994_V1P0_REV3	0x00
+#define PMI8994_V1P0_REV4	0x01
+
+#define PMI8994_V2P0_REV1	0x00
+#define PMI8994_V2P0_REV2	0x00
+#define PMI8994_V2P0_REV3	0x00
+#define PMI8994_V2P0_REV4	0x02
+
+/* PM8916 */
+#define PM8916_SUBTYPE		0x0B
 
 #define PM8916_V1P0_REV1	0x00
 #define PM8916_V1P0_REV2	0x00
 #define PM8916_V1P0_REV3	0x00
 #define PM8916_V1P0_REV4	0x01
-#define PM8916_V1P0_TYPE	0x51
-#define PM8916_V1P0_SUBTYPE	0x0B
 
 #define PM8916_V1P1_REV1	0x00
 #define PM8916_V1P1_REV2	0x00
 #define PM8916_V1P1_REV3	0x01
 #define PM8916_V1P1_REV4	0x01
-#define PM8916_V1P1_TYPE	0x51
-#define PM8916_V1P1_SUBTYPE	0x0B
 
 #define PM8916_V2P0_REV1	0x00
 #define PM8916_V2P0_REV2	0x00
 #define PM8916_V2P0_REV3	0x00
 #define PM8916_V2P0_REV4	0x02
-#define PM8916_V2P0_TYPE	0x51
-#define PM8916_V2P0_SUBTYPE	0x0B
+
+/* PM8004 */
+#define PM8004_SUBTYPE		0x0C
+
+/* PM8909 */
+#define PM8909_SUBTYPE		0x0D
 
 #define PM8909_V1P0_REV1	0x00
 #define PM8909_V1P0_REV2	0x00
 #define PM8909_V1P0_REV3	0x00
 #define PM8909_V1P0_REV4	0x01
-#define PM8909_V1P0_TYPE	0x51
-#define PM8909_V1P0_SUBTYPE	0x0D
 
 #define PM8909_V1P1_REV1	0x00
 #define PM8909_V1P1_REV2	0x00
 #define PM8909_V1P1_REV3	0x01
 #define PM8909_V1P1_REV4	0x01
-#define PM8909_V1P1_TYPE	0x51
-#define PM8909_V1P1_SUBTYPE	0x0D
 
-#define PMI8994_V1P0_REV1	0x00
-#define PMI8994_V1P0_REV2	0x00
-#define PMI8994_V1P0_REV3	0x00
-#define PMI8994_V1P0_REV4	0x01
-#define PMI8994_V1P0_TYPE	0x51
-#define PMI8994_V1P0_SUBTYPE	0x0A
+/* PM2433 */
+#define PM2433_SUBTYPE		0x0E
 
-#define PMI8994_V2P0_REV1	0x00
-#define PMI8994_V2P0_REV2	0x00
-#define PMI8994_V2P0_REV3	0x00
-#define PMI8994_V2P0_REV4	0x02
-#define PMI8994_V2P0_TYPE	0x51
-#define PMI8994_V2P0_SUBTYPE	0x0A
+/* PMD9655 */
+#define PMD9655_SUBTYPE		0x0F
 
+/* PM8950 */
+#define PM8950_SUBTYPE		0x10
 #define PM8950_V1P0_REV4	0x01
-#define PM8950_V1P0_TYPE	0x51
-#define PM8950_V1P0_SUBTYPE	0x10
 
 #define PM8950_V2P0_REV4	0x02
-#define PM8950_V2P0_TYPE	0x51
-#define PM8950_V2P0_SUBTYPE	0x10
+
+/* PMI8950 */
+#define PMI8950_SUBTYPE		0x11
+
+/* PMK8001 */
+#define PMK8001_SUBTYPE		0x12
+
+/* PMI8996 */
+#define PMI8996_SUBTYPE		0x13
+
+/* PM8998 */
+#define PM8998_SUBTYPE		0x14
+
+/* PMI8998 */
+#define PMI8998_SUBTYPE		0x15
+
+/* PM8937 */
+#define PM8937_SUBTYPE		0x19
+
+/* PMI8937 */
+#define PMI8937_SUBTYPE		0x37
 
 struct pmic_revid_data {
 	u8		rev1;