mfd: Add ab8500 version detection and enforcing

There are currently four different versions of the AB8500
around: AB8500, AB8505, AB9540 and AB8540. Unfortunately:

- Some of the chips (AB8500, AB8505, AB9540) cannot read
  the AB8500_REV_REG register but return errors

- Some of them have the same ID value in the hardware
  register AB8500_REV_REV, for example the first versions
  of AB8505 and AB9540 have 0xFF in this register -
  just like the AB8500.

So we need to be able to enforce a certain version from
the platform. We do this by using the id of the platform
device that provides the read/write functions.

Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@stericsson.com>
Signed-off-by: Alex Macro <alex.macro@stericsson.com>
Signed-off-by: Michel Jaouen <michel.jaouen@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/mfd/ab8500-i2c.c b/drivers/mfd/ab8500-i2c.c
index 087fecd71ce0..70a16ae856a2 100644
--- a/drivers/mfd/ab8500-i2c.c
+++ b/drivers/mfd/ab8500-i2c.c
@@ -38,6 +38,7 @@ static int ab8500_i2c_read(struct ab8500 *ab8500, u16 addr)
 
 static int __devinit ab8500_i2c_probe(struct platform_device *plf)
 {
+        const struct platform_device_id *platid = platform_get_device_id(plf);
         struct ab8500 *ab8500;
         struct resource *resource;
         int ret;
@@ -61,10 +62,11 @@ static int __devinit ab8500_i2c_probe(struct platform_device *plf)
 
         platform_set_drvdata(plf, ab8500);
 
-        ret = ab8500_init(ab8500);
+        ret = ab8500_init(ab8500, platid->driver_data);
         if (ret)
                 kfree(ab8500);
 
+
         return ret;
 }
 
@@ -78,13 +80,22 @@ static int __devexit ab8500_i2c_remove(struct platform_device *plf)
         return 0;
 }
 
+static const struct platform_device_id ab8500_id[] = {
+        { "ab8500-i2c", AB8500_VERSION_AB8500 },
+        { "ab8505-i2c", AB8500_VERSION_AB8505 },
+        { "ab9540-i2c", AB8500_VERSION_AB9540 },
+        { "ab8540-i2c", AB8500_VERSION_AB8540 },
+        { }
+};
+
 static struct platform_driver ab8500_i2c_driver = {
         .driver = {
                 .name = "ab8500-i2c",
                 .owner = THIS_MODULE,
         },
         .probe  = ab8500_i2c_probe,
-        .remove = __devexit_p(ab8500_i2c_remove)
+        .remove = __devexit_p(ab8500_i2c_remove),
+        .id_table = ab8500_id,
 };
 
 static int __init ab8500_i2c_init(void)