Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mirror_ubuntu-zesty-kernel.git] / drivers / mfd / tps65218.c

diff --git a/drivers/mfd/tps65218.c b/drivers/mfd/tps65218.c
index 80b9dc363cd855c38a7779d8b52d5018c4e74b77..ba610adbdbff33503f65cea2ceda2273f95fc2fb 100644 (file)
--- 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)