mfd: tps65218: add version check to the PMIC probe

Version information will be needed to handle some error cases under the
regulator driver, so store the information once during MFD probe.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Keerthy <j-keerthy@ti.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/mfd/tps65218.c b/drivers/mfd/tps65218.c
index 80b9dc363cd8..ba610adbdbff 100644
--- a/drivers/mfd/tps65218.c
+++ b/drivers/mfd/tps65218.c
@@ -219,6 +219,7 @@ static int tps65218_probe(struct i2c_client *client,
         struct tps65218 *tps;
         const struct of_device_id *match;
         int ret;
+        unsigned int chipid;
 
         match = of_match_device(of_tps65218_match_table, &client->dev);
         if (!match) {
@@ -250,6 +251,14 @@ static int tps65218_probe(struct i2c_client *client,
         if (ret < 0)
                 return ret;
 
+        ret = tps65218_reg_read(tps, TPS65218_REG_CHIPID, &chipid);
+        if (ret) {
+                dev_err(tps->dev, "Failed to read chipid: %d\n", ret);
+                return ret;
+        }
+
+        tps->rev = chipid & TPS65218_CHIPID_REV_MASK;
+
         ret = of_platform_populate(client->dev.of_node, NULL, NULL,
                                    &client->dev);
         if (ret < 0)
diff --git a/include/linux/mfd/tps65218.h b/include/linux/mfd/tps65218.h
index 7fdf5326f34e..85e464e32c43 100644
--- a/include/linux/mfd/tps65218.h
+++ b/include/linux/mfd/tps65218.h
@@ -267,6 +267,7 @@ struct tps_info {
 struct tps65218 {
         struct device *dev;
         unsigned int id;
+        u8 rev;
 
         struct mutex tps_lock;          /* lock guarding the data structure */
         /* IRQ Data */