Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mfd: qcom-spmi-pmic: Add specific compatible strings for Qualcomm's SPMI PMIC's

Some of the PMIC's could have specific regmap configuration
tables in future, so add specific compatible strings for known
PMIC's. Also print runtime detected chip revision information.

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Ivan T. Ivanov and committed by
Lee Jones
dc716bbf c31e858b

+111 -11
+15 -4
Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
··· 15 15 16 16 Required properties: 17 17 - compatible: Should contain one of: 18 - "qcom,pm8941" 19 - "qcom,pm8841" 20 - "qcom,pma8084" 21 - or generalized "qcom,spmi-pmic". 18 + "qcom,pm8941", 19 + "qcom,pm8841", 20 + "qcom,pma8084", 21 + "qcom,pm8019", 22 + "qcom,pm8226", 23 + "qcom,pm8110", 24 + "qcom,pma8084", 25 + "qcom,pmi8962", 26 + "qcom,pmd9635", 27 + "qcom,pm8994", 28 + "qcom,pmi8994", 29 + "qcom,pm8916", 30 + "qcom,pm8004", 31 + "qcom,pm8909", 32 + or generalized "qcom,spmi-pmic". 22 33 - reg: Specifies the SPMI USID slave address for this device. 23 34 For more information see: 24 35 Documentation/devicetree/bindings/spmi/spmi.txt
+96 -7
drivers/mfd/qcom-spmi-pmic.c
··· 17 17 #include <linux/regmap.h> 18 18 #include <linux/of_platform.h> 19 19 20 + #define PMIC_REV2 0x101 21 + #define PMIC_REV3 0x102 22 + #define PMIC_REV4 0x103 23 + #define PMIC_TYPE 0x104 24 + #define PMIC_SUBTYPE 0x105 25 + 26 + #define PMIC_TYPE_VALUE 0x51 27 + 28 + #define COMMON_SUBTYPE 0x00 29 + #define PM8941_SUBTYPE 0x01 30 + #define PM8841_SUBTYPE 0x02 31 + #define PM8019_SUBTYPE 0x03 32 + #define PM8226_SUBTYPE 0x04 33 + #define PM8110_SUBTYPE 0x05 34 + #define PMA8084_SUBTYPE 0x06 35 + #define PMI8962_SUBTYPE 0x07 36 + #define PMD9635_SUBTYPE 0x08 37 + #define PM8994_SUBTYPE 0x09 38 + #define PMI8994_SUBTYPE 0x0a 39 + #define PM8916_SUBTYPE 0x0b 40 + #define PM8004_SUBTYPE 0x0c 41 + #define PM8909_SUBTYPE 0x0d 42 + 43 + static const struct of_device_id pmic_spmi_id_table[] = { 44 + { .compatible = "qcom,spmi-pmic", .data = (void *)COMMON_SUBTYPE }, 45 + { .compatible = "qcom,pm8941", .data = (void *)PM8941_SUBTYPE }, 46 + { .compatible = "qcom,pm8841", .data = (void *)PM8841_SUBTYPE }, 47 + { .compatible = "qcom,pm8019", .data = (void *)PM8019_SUBTYPE }, 48 + { .compatible = "qcom,pm8226", .data = (void *)PM8226_SUBTYPE }, 49 + { .compatible = "qcom,pm8110", .data = (void *)PM8110_SUBTYPE }, 50 + { .compatible = "qcom,pma8084", .data = (void *)PMA8084_SUBTYPE }, 51 + { .compatible = "qcom,pmi8962", .data = (void *)PMI8962_SUBTYPE }, 52 + { .compatible = "qcom,pmd9635", .data = (void *)PMD9635_SUBTYPE }, 53 + { .compatible = "qcom,pm8994", .data = (void *)PM8994_SUBTYPE }, 54 + { .compatible = "qcom,pmi8994", .data = (void *)PMI8994_SUBTYPE }, 55 + { .compatible = "qcom,pm8916", .data = (void *)PM8916_SUBTYPE }, 56 + { .compatible = "qcom,pm8004", .data = (void *)PM8004_SUBTYPE }, 57 + { .compatible = "qcom,pm8909", .data = (void *)PM8909_SUBTYPE }, 58 + { } 59 + }; 60 + 61 + static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) 62 + { 63 + unsigned int rev2, minor, major, type, subtype; 64 + const char *name = "unknown"; 65 + int ret, i; 66 + 67 + ret = regmap_read(map, PMIC_TYPE, &type); 68 + if (ret < 0) 69 + return; 70 + 71 + if (type != PMIC_TYPE_VALUE) 72 + return; 73 + 74 + ret = regmap_read(map, PMIC_SUBTYPE, &subtype); 75 + if (ret < 0) 76 + return; 77 + 78 + for (i = 0; i < ARRAY_SIZE(pmic_spmi_id_table); i++) { 79 + if (subtype == (unsigned long)pmic_spmi_id_table[i].data) 80 + break; 81 + } 82 + 83 + if (i != ARRAY_SIZE(pmic_spmi_id_table)) 84 + name = pmic_spmi_id_table[i].compatible; 85 + 86 + ret = regmap_read(map, PMIC_REV2, &rev2); 87 + if (ret < 0) 88 + return; 89 + 90 + ret = regmap_read(map, PMIC_REV3, &minor); 91 + if (ret < 0) 92 + return; 93 + 94 + ret = regmap_read(map, PMIC_REV4, &major); 95 + if (ret < 0) 96 + return; 97 + 98 + /* 99 + * In early versions of PM8941 and PM8226, the major revision number 100 + * started incrementing from 0 (eg 0 = v1.0, 1 = v2.0). 101 + * Increment the major revision number here if the chip is an early 102 + * version of PM8941 or PM8226. 103 + */ 104 + if ((subtype == PM8941_SUBTYPE || subtype == PM8226_SUBTYPE) && 105 + major < 0x02) 106 + major++; 107 + 108 + if (subtype == PM8110_SUBTYPE) 109 + minor = rev2; 110 + 111 + dev_dbg(dev, "%x: %s v%d.%d\n", subtype, name, major, minor); 112 + } 113 + 20 114 static const struct regmap_config spmi_regmap_config = { 21 115 .reg_bits = 16, 22 116 .val_bits = 8, ··· 127 33 if (IS_ERR(regmap)) 128 34 return PTR_ERR(regmap); 129 35 36 + pmic_spmi_show_revid(regmap, &sdev->dev); 37 + 130 38 return of_platform_populate(root, NULL, NULL, &sdev->dev); 131 39 } 132 40 ··· 137 41 of_platform_depopulate(&sdev->dev); 138 42 } 139 43 140 - static const struct of_device_id pmic_spmi_id_table[] = { 141 - { .compatible = "qcom,spmi-pmic" }, 142 - { .compatible = "qcom,pm8941" }, 143 - { .compatible = "qcom,pm8841" }, 144 - { .compatible = "qcom,pma8084" }, 145 - { } 146 - }; 147 44 MODULE_DEVICE_TABLE(of, pmic_spmi_id_table); 148 45 149 46 static struct spmi_driver pmic_spmi_driver = {